691 files changed, 34213 insertions, 34889 deletions

diff --git a/src/gui/accessible/accessible.pri b/src/gui/accessible/accessible.pri
index 86ed4c3a71..b7f341d5b7 100644
--- a/src/gui/accessible/accessible.pri
+++ b/src/gui/accessible/accessible.pri
@@ -17,5 +17,9 @@ contains(QT_CONFIG, accessibility) {
     HEADERS += accessible/qaccessiblebridge.h
     SOURCES += accessible/qaccessiblebridge.cpp
 
-    OBJECTIVE_SOURCES += accessible/qaccessiblecache_mac.mm
+    mac {
+        OBJECTIVE_SOURCES += accessible/qaccessiblecache_mac.mm
+
+        LIBS_PRIVATE += -framework Foundation
+    }
 }
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 6d9ad2c160..874b99be4f 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -442,6 +448,8 @@ QT_BEGIN_NAMESPACE
     \sa QAccessibleInterface::interface_cast(), QAccessibleTextInterface, QAccessibleValueInterface, QAccessibleActionInterface, QAccessibleTableInterface, QAccessibleTableCellInterface
 */
 
+#ifndef QT_NO_ACCESSIBILITY
+
 /*!
     Destroys the QAccessibleInterface.
 */
@@ -455,15 +463,12 @@ QAccessibleInterface::~QAccessibleInterface()
     Synonym for unsigned, used by the QAccessibleInterface cache.
 */
 
-#ifndef QT_NO_ACCESSIBILITY
 
 /* accessible widgets plugin discovery stuff */
-#ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QAccessibleFactoryInterface_iid, QLatin1String("/accessible")))
 typedef QHash<QString, QAccessiblePlugin*> QAccessiblePluginsHash;
 Q_GLOBAL_STATIC(QAccessiblePluginsHash, qAccessiblePlugins)
-#endif
 
 // FIXME turn this into one global static struct
 Q_GLOBAL_STATIC(QList<QAccessible::InterfaceFactory>, qAccessibleFactories)
@@ -684,7 +689,6 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object)
                 return iface;
             }
         }
-#ifndef QT_NO_LIBRARY
         // Find a QAccessiblePlugin (factory) for the class name. If there's
         // no entry in the cache try to create it using the plugin loader.
         if (!qAccessiblePlugins()->contains(cn)) {
@@ -706,7 +710,6 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object)
             }
             return result;
         }
-#endif
         mo = mo->superClass();
     }
 
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index 63658260fc..7bc124f7d9 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/accessible/qaccessiblebridge.cpp b/src/gui/accessible/qaccessiblebridge.cpp
index 164dc73269..c6a417e063 100644
--- a/src/gui/accessible/qaccessiblebridge.cpp
+++ b/src/gui/accessible/qaccessiblebridge.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/accessible/qaccessiblebridge.h b/src/gui/accessible/qaccessiblebridge.h
index 277a8d201b..c161e01b0f 100644
--- a/src/gui/accessible/qaccessiblebridge.h
+++ b/src/gui/accessible/qaccessiblebridge.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/accessible/qaccessiblecache.cpp b/src/gui/accessible/qaccessiblecache.cpp
index 5fae442370..43c4b15cb0 100644
--- a/src/gui/accessible/qaccessiblecache.cpp
+++ b/src/gui/accessible/qaccessiblecache.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/accessible/qaccessiblecache_mac.mm b/src/gui/accessible/qaccessiblecache_mac.mm
index b0266ee25f..3f49eb98fd 100644
--- a/src/gui/accessible/qaccessiblecache_mac.mm
+++ b/src/gui/accessible/qaccessiblecache_mac.mm
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/accessible/qaccessiblecache_p.h b/src/gui/accessible/qaccessiblecache_p.h
index bb33ea2cd4..a9208702e4 100644
--- a/src/gui/accessible/qaccessiblecache_p.h
+++ b/src/gui/accessible/qaccessiblecache_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/gui/accessible/qaccessibleobject.cpp
index dcf46244e6..b67b8062ba 100644
--- a/src/gui/accessible/qaccessibleobject.cpp
+++ b/src/gui/accessible/qaccessibleobject.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/accessible/qaccessibleobject.h b/src/gui/accessible/qaccessibleobject.h
index 8a871adedb..5918e942bd 100644
--- a/src/gui/accessible/qaccessibleobject.h
+++ b/src/gui/accessible/qaccessibleobject.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/accessible/qaccessibleplugin.cpp b/src/gui/accessible/qaccessibleplugin.cpp
index 1755db5ec4..27497858b5 100644
--- a/src/gui/accessible/qaccessibleplugin.cpp
+++ b/src/gui/accessible/qaccessibleplugin.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/accessible/qaccessibleplugin.h b/src/gui/accessible/qaccessibleplugin.h
index 44261788c7..b0c28e5bf8 100644
--- a/src/gui/accessible/qaccessibleplugin.h
+++ b/src/gui/accessible/qaccessibleplugin.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/accessible/qplatformaccessibility.cpp b/src/gui/accessible/qplatformaccessibility.cpp
index b6b44c1c32..8c806d47b8 100644
--- a/src/gui/accessible/qplatformaccessibility.cpp
+++ b/src/gui/accessible/qplatformaccessibility.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -44,10 +50,8 @@ QT_BEGIN_NAMESPACE
 #ifndef QT_NO_ACCESSIBILITY
 
 /* accessiblebridge plugin discovery stuff */
-#ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, bridgeloader,
     (QAccessibleBridgeFactoryInterface_iid, QLatin1String("/accessiblebridge")))
-#endif
 
 Q_GLOBAL_STATIC(QVector<QAccessibleBridge *>, bridges)
 
@@ -106,7 +110,6 @@ void QPlatformAccessibility::initialize()
         return;
     isInit = true;      // ### not atomic
 
-#ifndef QT_NO_LIBRARY
     typedef QMultiMap<int, QString> PluginKeyMap;
     typedef PluginKeyMap::const_iterator PluginKeyMapConstIterator;
 
@@ -123,7 +126,6 @@ void QPlatformAccessibility::initialize()
             if (QAccessibleBridge *bridge = factory->create(it.value()))
                 bridges()->append(bridge);
     }
-#endif
 }
 
 void QPlatformAccessibility::cleanup()
diff --git a/src/gui/accessible/qplatformaccessibility.h b/src/gui/accessible/qplatformaccessibility.h
index c7002cbec2..5dc4781bb2 100644
--- a/src/gui/accessible/qplatformaccessibility.h
+++ b/src/gui/accessible/qplatformaccessibility.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp
index 2a87c814b8..e18340d302 100644
--- a/src/gui/animation/qguivariantanimation.cpp
+++ b/src/gui/animation/qguivariantanimation.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/doc/images/qcolor-saturation.png b/src/gui/doc/images/qcolor-saturation.png
index f28776aff5..9c104f7389 100644
--- a/src/gui/doc/images/qcolor-saturation.png
+++ b/src/gui/doc/images/qcolor-saturation.png
diff --git a/src/gui/doc/images/qcolor-saturation.svg b/src/gui/doc/images/qcolor-saturation.svg
new file mode 100644
index 0000000000..608c2555e8
--- /dev/null
+++ b/src/gui/doc/images/qcolor-saturation.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   id="svg2"
+   viewBox="0 0 186.82259 45.046909"
+   height="12.713239mm"
+   width="52.725487mm">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3346">
+      <stop
+         id="stop3348"
+         offset="0"
+         style="stop-color:#808080;stop-opacity:1" />
+      <stop
+         id="stop3350"
+         offset="1"
+         style="stop-color:#0000ff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(109.31384,222.16879)"
+       gradientUnits="userSpaceOnUse"
+       y2="16.118341"
+       x2="200.35715"
+       y1="16.118341"
+       x1="3.7246187"
+       id="linearGradient3352"
+       xlink:href="#linearGradient3346" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-109.31384,-222.16879)"
+     id="layer1">
+    <rect
+       y="225.7121"
+       x="112.85714"
+       height="25.221529"
+       width="179.73599"
+       id="rect3336"
+       style="opacity:1;fill:url(#linearGradient3352);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <text
+       id="text3338"
+       y="263.53079"
+       x="113.03048"
+       style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="263.53079"
+         x="113.03048"
+         id="tspan3340">0</tspan></text>
+    <text
+       id="text3342"
+       y="263.53079"
+       x="271.76645"
+       style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         y="263.53079"
+         x="271.76645"
+         id="tspan3344">255</tspan></text>
+  </g>
+</svg>
diff --git a/src/gui/doc/images/qcolor-value.png b/src/gui/doc/images/qcolor-value.png
index 0e069123a9..add9b7f83d 100644
--- a/src/gui/doc/images/qcolor-value.png
+++ b/src/gui/doc/images/qcolor-value.png
diff --git a/src/gui/doc/images/qcolor-value.svg b/src/gui/doc/images/qcolor-value.svg
new file mode 100644
index 0000000000..51c2de0338
--- /dev/null
+++ b/src/gui/doc/images/qcolor-value.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   width="52.725487mm"
+   height="12.713239mm"
+   viewBox="0 0 186.82259 45.046909"
+   id="svg2"
+   version="1.1">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3346">
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0"
+         id="stop3348" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3350" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3346"
+       id="linearGradient3352"
+       x1="3.7246187"
+       y1="16.118341"
+       x2="183.57143"
+       y2="15.761199"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(109.31384,222.16879)" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     transform="translate(-109.31384,-222.16879)">
+    <rect
+       style="opacity:1;fill:url(#linearGradient3352);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3336"
+       width="179.73599"
+       height="25.221529"
+       x="112.85714"
+       y="225.7121" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="113.03048"
+       y="263.53079"
+       id="text3338"><tspan
+         id="tspan3340"
+         x="113.03048"
+         y="263.53079">0</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="271.76645"
+       y="263.53079"
+       id="text3342"><tspan
+         id="tspan3344"
+         x="271.76645"
+         y="263.53079">255</tspan></text>
+  </g>
+</svg>
diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf
index 436e2e0b34..b07d39fa37 100644
--- a/src/gui/doc/qtgui.qdocconf
+++ b/src/gui/doc/qtgui.qdocconf
@@ -33,6 +33,7 @@ depends += \
     qtmultimedia \
     qtnetwork \
     qtopengl \
+    qtplatformheaders \
     qtsvg \
     qtqml \
     qtquick \
diff --git a/src/gui/doc/snippets/brush/brush.cpp b/src/gui/doc/snippets/brush/brush.cpp
index 449b86e1e2..505316e5e2 100644
--- a/src/gui/doc/snippets/brush/brush.cpp
+++ b/src/gui/doc/snippets/brush/brush.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/brush/gradientcreationsnippet.cpp b/src/gui/doc/snippets/brush/gradientcreationsnippet.cpp
index 0bfa6b8ed6..4bae7b755f 100644
--- a/src/gui/doc/snippets/brush/gradientcreationsnippet.cpp
+++ b/src/gui/doc/snippets/brush/gradientcreationsnippet.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/clipboard/clipwindow.cpp b/src/gui/doc/snippets/clipboard/clipwindow.cpp
index 90eed1786a..bf1b2d904b 100644
--- a/src/gui/doc/snippets/clipboard/clipwindow.cpp
+++ b/src/gui/doc/snippets/clipboard/clipwindow.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/clipboard/clipwindow.h b/src/gui/doc/snippets/clipboard/clipwindow.h
index 65b94d0cf7..81e50a3c89 100644
--- a/src/gui/doc/snippets/clipboard/clipwindow.h
+++ b/src/gui/doc/snippets/clipboard/clipwindow.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/clipboard/main.cpp b/src/gui/doc/snippets/clipboard/main.cpp
index f8bbeed8d1..08d41df483 100644
--- a/src/gui/doc/snippets/clipboard/main.cpp
+++ b/src/gui/doc/snippets/clipboard/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/doc_src_coordsys.cpp b/src/gui/doc/snippets/code/doc_src_coordsys.cpp
index a13c8d294f..7c53d9e731 100644
--- a/src/gui/doc/snippets/code/doc_src_coordsys.cpp
+++ b/src/gui/doc/snippets/code/doc_src_coordsys.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/doc_src_richtext.cpp b/src/gui/doc/snippets/code/doc_src_richtext.cpp
index b55e23cabb..fb7ab1b571 100644
--- a/src/gui/doc/snippets/code/doc_src_richtext.cpp
+++ b/src/gui/doc/snippets/code/doc_src_richtext.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/doc_src_richtext.qdoc b/src/gui/doc/snippets/code/doc_src_richtext.qdoc
index bfe1601aea..17faf1ac86 100644
--- a/src/gui/doc/snippets/code/doc_src_richtext.qdoc
+++ b/src/gui/doc/snippets/code/doc_src_richtext.qdoc
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_accessible_qaccessible.cpp b/src/gui/doc/snippets/code/src_gui_accessible_qaccessible.cpp
index a9666145a8..98d40c94f9 100644
--- a/src/gui/doc/snippets/code/src_gui_accessible_qaccessible.cpp
+++ b/src/gui/doc/snippets/code/src_gui_accessible_qaccessible.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_image_qicon.cpp b/src/gui/doc/snippets/code/src_gui_image_qicon.cpp
index 7294fdbc81..f472494e4a 100644
--- a/src/gui/doc/snippets/code/src_gui_image_qicon.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qicon.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_image_qimage.cpp b/src/gui/doc/snippets/code/src_gui_image_qimage.cpp
index f153de26ed..e4e641a5e0 100644
--- a/src/gui/doc/snippets/code/src_gui_image_qimage.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qimage.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_image_qimagereader.cpp b/src/gui/doc/snippets/code/src_gui_image_qimagereader.cpp
index aff9b1b41a..ac26126758 100644
--- a/src/gui/doc/snippets/code/src_gui_image_qimagereader.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qimagereader.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_image_qimagewriter.cpp b/src/gui/doc/snippets/code/src_gui_image_qimagewriter.cpp
index d6c3bd2929..c0b2544858 100644
--- a/src/gui/doc/snippets/code/src_gui_image_qimagewriter.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qimagewriter.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_image_qmovie.cpp b/src/gui/doc/snippets/code/src_gui_image_qmovie.cpp
index 35090a06dd..3ed458a3db 100644
--- a/src/gui/doc/snippets/code/src_gui_image_qmovie.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qmovie.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_image_qpixmap.cpp b/src/gui/doc/snippets/code/src_gui_image_qpixmap.cpp
index 73620b1560..b76e7b6e8d 100644
--- a/src/gui/doc/snippets/code/src_gui_image_qpixmap.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qpixmap.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp b/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp
index df654fcc71..3870237ac3 100644
--- a/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp b/src/gui/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
index 7cd3277534..40893fae87 100644
--- a/src/gui/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
+++ b/src/gui/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp
index 8177927a8b..f1f51c0582 100644
--- a/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
@@ -89,7 +99,8 @@ QSize MyWidget::sizeHint() const
 //! [4]
 void showAllHiddenTopLevelWidgets()
 {
-    foreach (QWidget *widget, QApplication::topLevelWidgets()) {
+    const auto topLevelWidgets = QApplication::topLevelWidgets();
+    for (QWidget *widget : topLevelWidgets) {
         if (widget->isHidden())
             widget->show();
     }
@@ -100,7 +111,8 @@ void showAllHiddenTopLevelWidgets()
 //! [5]
 void updateAllWidgets()
 {
-    foreach (QWidget *widget, QApplication::allWidgets())
+    const auto topLevelWidgets = QApplication::topLevelWidgets();
+    for (QWidget *widget : topLevelWidgets)
         widget->update();
 }
 //! [5]
diff --git a/src/gui/doc/snippets/code/src_gui_kernel_qclipboard.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qclipboard.cpp
index decfee26f6..8581510133 100644
--- a/src/gui/doc/snippets/code/src_gui_kernel_qclipboard.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qclipboard.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_kernel_qevent.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qevent.cpp
index c8934db152..44ce54a9bb 100644
--- a/src/gui/doc/snippets/code/src_gui_kernel_qevent.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qevent.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication.cpp
index 63fdb3bdd0..7c5c387a5a 100644
--- a/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication_x11.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication_x11.cpp
index b751f95c57..e91aa3d548 100644
--- a/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication_x11.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qguiapplication_x11.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_kernel_qkeysequence.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qkeysequence.cpp
index 8517bfcb9d..2c49dd2d3d 100644
--- a/src/gui/doc/snippets/code/src_gui_kernel_qkeysequence.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qkeysequence.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_kernel_qshortcutmap.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qshortcutmap.cpp
index f0c355f65d..8bb0726c77 100644
--- a/src/gui/doc/snippets/code/src_gui_kernel_qshortcutmap.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qshortcutmap.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_painting_qbrush.cpp b/src/gui/doc/snippets/code/src_gui_painting_qbrush.cpp
index aee6a9289c..786d6ca183 100644
--- a/src/gui/doc/snippets/code/src_gui_painting_qbrush.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qbrush.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_painting_qcolor.cpp b/src/gui/doc/snippets/code/src_gui_painting_qcolor.cpp
index 1ff6b9705e..5285a19a0a 100644
--- a/src/gui/doc/snippets/code/src_gui_painting_qcolor.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qcolor.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_painting_qmatrix.cpp b/src/gui/doc/snippets/code/src_gui_painting_qmatrix.cpp
index f7acdfda99..30beec799a 100644
--- a/src/gui/doc/snippets/code/src_gui_painting_qmatrix.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qmatrix.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp b/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp
index 6d0308b1e9..37fae52778 100644
--- a/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_painting_qpainterpath.cpp b/src/gui/doc/snippets/code/src_gui_painting_qpainterpath.cpp
index 378b98abaa..e6d72fce12 100644
--- a/src/gui/doc/snippets/code/src_gui_painting_qpainterpath.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qpainterpath.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_painting_qpen.cpp b/src/gui/doc/snippets/code/src_gui_painting_qpen.cpp
index c6aea733ae..d899418a3f 100644
--- a/src/gui/doc/snippets/code/src_gui_painting_qpen.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qpen.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_painting_qregion.cpp b/src/gui/doc/snippets/code/src_gui_painting_qregion.cpp
index 6979ab51a5..496791dc0f 100644
--- a/src/gui/doc/snippets/code/src_gui_painting_qregion.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qregion.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_painting_qregion_unix.cpp b/src/gui/doc/snippets/code/src_gui_painting_qregion_unix.cpp
index 401d9b6080..ab22507c4f 100644
--- a/src/gui/doc/snippets/code/src_gui_painting_qregion_unix.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qregion_unix.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_painting_qtransform.cpp b/src/gui/doc/snippets/code/src_gui_painting_qtransform.cpp
index 47c249532e..4acc2f12b7 100644
--- a/src/gui/doc/snippets/code/src_gui_painting_qtransform.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qtransform.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_qopenglshaderprogram.cpp b/src/gui/doc/snippets/code/src_gui_qopenglshaderprogram.cpp
index 368a5085d4..8e67a2270c 100644
--- a/src/gui/doc/snippets/code/src_gui_qopenglshaderprogram.cpp
+++ b/src/gui/doc/snippets/code/src_gui_qopenglshaderprogram.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_text_qfont.cpp b/src/gui/doc/snippets/code/src_gui_text_qfont.cpp
index ddb06af8e0..82d8525ded 100644
--- a/src/gui/doc/snippets/code/src_gui_text_qfont.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qfont.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_text_qfontmetrics.cpp b/src/gui/doc/snippets/code/src_gui_text_qfontmetrics.cpp
index 87c19ac9f6..6cffa4f611 100644
--- a/src/gui/doc/snippets/code/src_gui_text_qfontmetrics.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qfontmetrics.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_text_qsyntaxhighlighter.cpp b/src/gui/doc/snippets/code/src_gui_text_qsyntaxhighlighter.cpp
index 9aa5ac4c87..da960088b7 100644
--- a/src/gui/doc/snippets/code/src_gui_text_qsyntaxhighlighter.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qsyntaxhighlighter.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_text_qtextcursor.cpp b/src/gui/doc/snippets/code/src_gui_text_qtextcursor.cpp
index d52b7a5188..d66cc1407f 100644
--- a/src/gui/doc/snippets/code/src_gui_text_qtextcursor.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qtextcursor.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_text_qtextdocument.cpp b/src/gui/doc/snippets/code/src_gui_text_qtextdocument.cpp
index 7440a0b7f1..66a8bc7b5e 100644
--- a/src/gui/doc/snippets/code/src_gui_text_qtextdocument.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qtextdocument.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_text_qtextdocumentwriter.cpp b/src/gui/doc/snippets/code/src_gui_text_qtextdocumentwriter.cpp
index 3b9fd62dac..06aab74e10 100644
--- a/src/gui/doc/snippets/code/src_gui_text_qtextdocumentwriter.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qtextdocumentwriter.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_text_qtextlayout.cpp b/src/gui/doc/snippets/code/src_gui_text_qtextlayout.cpp
index 88bd66ce3e..4244f0ce6d 100644
--- a/src/gui/doc/snippets/code/src_gui_text_qtextlayout.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qtextlayout.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_util_qdesktopservices.cpp b/src/gui/doc/snippets/code/src_gui_util_qdesktopservices.cpp
index a360ab0d61..b48e9e8610 100644
--- a/src/gui/doc/snippets/code/src_gui_util_qdesktopservices.cpp
+++ b/src/gui/doc/snippets/code/src_gui_util_qdesktopservices.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/code/src_gui_util_qvalidator.cpp b/src/gui/doc/snippets/code/src_gui_util_qvalidator.cpp
index dd1438179b..cc73ad9a19 100644
--- a/src/gui/doc/snippets/code/src_gui_util_qvalidator.cpp
+++ b/src/gui/doc/snippets/code/src_gui_util_qvalidator.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/draganddrop/dragwidget.cpp b/src/gui/doc/snippets/draganddrop/dragwidget.cpp
index 8d1b418513..16a7efac6c 100644
--- a/src/gui/doc/snippets/draganddrop/dragwidget.cpp
+++ b/src/gui/doc/snippets/draganddrop/dragwidget.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/draganddrop/dragwidget.h b/src/gui/doc/snippets/draganddrop/dragwidget.h
index 45eb3cfe5d..424c0b334b 100644
--- a/src/gui/doc/snippets/draganddrop/dragwidget.h
+++ b/src/gui/doc/snippets/draganddrop/dragwidget.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/draganddrop/main.cpp b/src/gui/doc/snippets/draganddrop/main.cpp
index 21a4e9b4f4..95a6b3ff00 100644
--- a/src/gui/doc/snippets/draganddrop/main.cpp
+++ b/src/gui/doc/snippets/draganddrop/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/draganddrop/mainwindow.cpp b/src/gui/doc/snippets/draganddrop/mainwindow.cpp
index 5866a1caa3..551114856e 100644
--- a/src/gui/doc/snippets/draganddrop/mainwindow.cpp
+++ b/src/gui/doc/snippets/draganddrop/mainwindow.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/draganddrop/mainwindow.h b/src/gui/doc/snippets/draganddrop/mainwindow.h
index cba0bcda7d..784371d4af 100644
--- a/src/gui/doc/snippets/draganddrop/mainwindow.h
+++ b/src/gui/doc/snippets/draganddrop/mainwindow.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/dragging/main.cpp b/src/gui/doc/snippets/dragging/main.cpp
index 12324a3bcb..b08a18b894 100644
--- a/src/gui/doc/snippets/dragging/main.cpp
+++ b/src/gui/doc/snippets/dragging/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/dragging/mainwindow.cpp b/src/gui/doc/snippets/dragging/mainwindow.cpp
index b52dc86429..5614c9351b 100644
--- a/src/gui/doc/snippets/dragging/mainwindow.cpp
+++ b/src/gui/doc/snippets/dragging/mainwindow.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/dragging/mainwindow.h b/src/gui/doc/snippets/dragging/mainwindow.h
index c518d1b7ec..5e796d530f 100644
--- a/src/gui/doc/snippets/dragging/mainwindow.h
+++ b/src/gui/doc/snippets/dragging/mainwindow.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/droparea.cpp b/src/gui/doc/snippets/droparea.cpp
index 13cf540d5e..c0fdbf9617 100644
--- a/src/gui/doc/snippets/droparea.cpp
+++ b/src/gui/doc/snippets/droparea.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
@@ -127,10 +137,10 @@ void DropArea::clear()
 
 QPixmap DropArea::extractPixmap(const QByteArray &data, const QString &format)
 {
-    QList<QByteArray> imageFormats = QImageReader::supportedImageFormats();
+    const QList<QByteArray> imageFormats = QImageReader::supportedImageFormats();
     QPixmap pixmap;
 
-    foreach (const QByteArray &imageFormat, imageFormats) {
+    for (const QByteArray &imageFormat : imageFormats) {
         if (format.mid(6) == QString(imageFormat)) {
             pixmap.loadFromData(data, imageFormat);
             break;
diff --git a/src/gui/doc/snippets/dropevents/main.cpp b/src/gui/doc/snippets/dropevents/main.cpp
index 1a1e60345f..077df53c0f 100644
--- a/src/gui/doc/snippets/dropevents/main.cpp
+++ b/src/gui/doc/snippets/dropevents/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/dropevents/window.cpp b/src/gui/doc/snippets/dropevents/window.cpp
index 33409db517..c3445bcc75 100644
--- a/src/gui/doc/snippets/dropevents/window.cpp
+++ b/src/gui/doc/snippets/dropevents/window.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/dropevents/window.h b/src/gui/doc/snippets/dropevents/window.h
index 12c59a5988..17c323b952 100644
--- a/src/gui/doc/snippets/dropevents/window.h
+++ b/src/gui/doc/snippets/dropevents/window.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/droprectangle/main.cpp b/src/gui/doc/snippets/droprectangle/main.cpp
index 2bbab17333..d09c5b2d4c 100644
--- a/src/gui/doc/snippets/droprectangle/main.cpp
+++ b/src/gui/doc/snippets/droprectangle/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/droprectangle/window.cpp b/src/gui/doc/snippets/droprectangle/window.cpp
index b5f5322b0e..47b66931ea 100644
--- a/src/gui/doc/snippets/droprectangle/window.cpp
+++ b/src/gui/doc/snippets/droprectangle/window.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/droprectangle/window.h b/src/gui/doc/snippets/droprectangle/window.h
index 41638bebef..683e5cb813 100644
--- a/src/gui/doc/snippets/droprectangle/window.h
+++ b/src/gui/doc/snippets/droprectangle/window.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/image/image.cpp b/src/gui/doc/snippets/image/image.cpp
index efa64f52f3..c3b9abc364 100644
--- a/src/gui/doc/snippets/image/image.cpp
+++ b/src/gui/doc/snippets/image/image.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/image/supportedformat.cpp b/src/gui/doc/snippets/image/supportedformat.cpp
index 2a2508ab94..a537d2cdc3 100644
--- a/src/gui/doc/snippets/image/supportedformat.cpp
+++ b/src/gui/doc/snippets/image/supportedformat.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/matrix/matrix.cpp b/src/gui/doc/snippets/matrix/matrix.cpp
index e33b80c0c0..ec9e130a29 100644
--- a/src/gui/doc/snippets/matrix/matrix.cpp
+++ b/src/gui/doc/snippets/matrix/matrix.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/picture/picture.cpp b/src/gui/doc/snippets/picture/picture.cpp
index 8b4281905f..3a7676f60a 100644
--- a/src/gui/doc/snippets/picture/picture.cpp
+++ b/src/gui/doc/snippets/picture/picture.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/plaintextlayout/main.cpp b/src/gui/doc/snippets/plaintextlayout/main.cpp
index af0bc9884c..1a50c27091 100644
--- a/src/gui/doc/snippets/plaintextlayout/main.cpp
+++ b/src/gui/doc/snippets/plaintextlayout/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/plaintextlayout/window.cpp b/src/gui/doc/snippets/plaintextlayout/window.cpp
index baeb1fdf6c..9bc4df05f1 100644
--- a/src/gui/doc/snippets/plaintextlayout/window.cpp
+++ b/src/gui/doc/snippets/plaintextlayout/window.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/plaintextlayout/window.h b/src/gui/doc/snippets/plaintextlayout/window.h
index 9e56f33750..0068a37482 100644
--- a/src/gui/doc/snippets/plaintextlayout/window.h
+++ b/src/gui/doc/snippets/plaintextlayout/window.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/polygon/polygon.cpp b/src/gui/doc/snippets/polygon/polygon.cpp
index daaf5b7f4e..b387a0432e 100644
--- a/src/gui/doc/snippets/polygon/polygon.cpp
+++ b/src/gui/doc/snippets/polygon/polygon.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/qfileopenevent/Info.plist b/src/gui/doc/snippets/qfileopenevent/Info.plist
index 6b8039bc7d..85311bb037 100644
--- a/src/gui/doc/snippets/qfileopenevent/Info.plist
+++ b/src/gui/doc/snippets/qfileopenevent/Info.plist
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Samuel Gaist <samuel.gaist@edeltech.ch>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
@@ -56,4 +66,4 @@
     </array>
 </dict>
 </plist>
-//! [Custom Info.plist]
\ No newline at end of file
+//! [Custom Info.plist]
diff --git a/src/gui/doc/snippets/qfileopenevent/main.cpp b/src/gui/doc/snippets/qfileopenevent/main.cpp
index 3fd1757bd7..3e707f2ddf 100644
--- a/src/gui/doc/snippets/qfileopenevent/main.cpp
+++ b/src/gui/doc/snippets/qfileopenevent/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Samuel Gaist <samuel.gaist@edeltech.ch>
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 Samuel Gaist <samuel.gaist@edeltech.ch>
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/qfontdatabase/main.cpp b/src/gui/doc/snippets/qfontdatabase/main.cpp
index aacd6f47fa..ae078f374d 100644
--- a/src/gui/doc/snippets/qfontdatabase/main.cpp
+++ b/src/gui/doc/snippets/qfontdatabase/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/qstatustipevent/main.cpp b/src/gui/doc/snippets/qstatustipevent/main.cpp
index 72e758c91b..cc43c56334 100644
--- a/src/gui/doc/snippets/qstatustipevent/main.cpp
+++ b/src/gui/doc/snippets/qstatustipevent/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/qtextobject/textobjectinterface.h b/src/gui/doc/snippets/qtextobject/textobjectinterface.h
index 7bd5a1d83e..b93cc55ca7 100644
--- a/src/gui/doc/snippets/qtextobject/textobjectinterface.h
+++ b/src/gui/doc/snippets/qtextobject/textobjectinterface.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/scribe-overview/main.cpp b/src/gui/doc/snippets/scribe-overview/main.cpp
index f1ed77a277..6a0ff7a341 100644
--- a/src/gui/doc/snippets/scribe-overview/main.cpp
+++ b/src/gui/doc/snippets/scribe-overview/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/separations/finalwidget.cpp b/src/gui/doc/snippets/separations/finalwidget.cpp
index cf5a36f98f..4cc8abe7aa 100644
--- a/src/gui/doc/snippets/separations/finalwidget.cpp
+++ b/src/gui/doc/snippets/separations/finalwidget.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/separations/finalwidget.h b/src/gui/doc/snippets/separations/finalwidget.h
index 0eec10f477..0301f68fe9 100644
--- a/src/gui/doc/snippets/separations/finalwidget.h
+++ b/src/gui/doc/snippets/separations/finalwidget.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/separations/main.cpp b/src/gui/doc/snippets/separations/main.cpp
index 4c3d5b1b64..a730f193a8 100644
--- a/src/gui/doc/snippets/separations/main.cpp
+++ b/src/gui/doc/snippets/separations/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/separations/screenwidget.cpp b/src/gui/doc/snippets/separations/screenwidget.cpp
index 11ed28a35d..6f8be49bfa 100644
--- a/src/gui/doc/snippets/separations/screenwidget.cpp
+++ b/src/gui/doc/snippets/separations/screenwidget.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/separations/screenwidget.h b/src/gui/doc/snippets/separations/screenwidget.h
index 319550e0f8..1fc839be65 100644
--- a/src/gui/doc/snippets/separations/screenwidget.h
+++ b/src/gui/doc/snippets/separations/screenwidget.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/separations/separations.qdoc b/src/gui/doc/snippets/separations/separations.qdoc
index 097f155190..ecb35012ee 100644
--- a/src/gui/doc/snippets/separations/separations.qdoc
+++ b/src/gui/doc/snippets/separations/separations.qdoc
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/separations/viewer.cpp b/src/gui/doc/snippets/separations/viewer.cpp
index 30c9d2e7d9..641294ea35 100644
--- a/src/gui/doc/snippets/separations/viewer.cpp
+++ b/src/gui/doc/snippets/separations/viewer.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/separations/viewer.h b/src/gui/doc/snippets/separations/viewer.h
index ebb7be4d24..5dfba3a209 100644
--- a/src/gui/doc/snippets/separations/viewer.h
+++ b/src/gui/doc/snippets/separations/viewer.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textblock-formats/main.cpp b/src/gui/doc/snippets/textblock-formats/main.cpp
index 712f586785..daa8f67f8b 100644
--- a/src/gui/doc/snippets/textblock-formats/main.cpp
+++ b/src/gui/doc/snippets/textblock-formats/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textblock-fragments/main.cpp b/src/gui/doc/snippets/textblock-fragments/main.cpp
index 10cec127c2..60afcac7b5 100644
--- a/src/gui/doc/snippets/textblock-fragments/main.cpp
+++ b/src/gui/doc/snippets/textblock-fragments/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp b/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp
index 9730b40212..bcc5c7dc30 100644
--- a/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp
+++ b/src/gui/doc/snippets/textblock-fragments/mainwindow.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textblock-fragments/mainwindow.h b/src/gui/doc/snippets/textblock-fragments/mainwindow.h
index 8f234e20c7..0ce579c158 100644
--- a/src/gui/doc/snippets/textblock-fragments/mainwindow.h
+++ b/src/gui/doc/snippets/textblock-fragments/mainwindow.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textblock-fragments/xmlwriter.cpp b/src/gui/doc/snippets/textblock-fragments/xmlwriter.cpp
index fa6c5a1fa1..1172b39847 100644
--- a/src/gui/doc/snippets/textblock-fragments/xmlwriter.cpp
+++ b/src/gui/doc/snippets/textblock-fragments/xmlwriter.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textblock-fragments/xmlwriter.h b/src/gui/doc/snippets/textblock-fragments/xmlwriter.h
index a83c208944..a9562e7c42 100644
--- a/src/gui/doc/snippets/textblock-fragments/xmlwriter.h
+++ b/src/gui/doc/snippets/textblock-fragments/xmlwriter.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-blocks/main.cpp b/src/gui/doc/snippets/textdocument-blocks/main.cpp
index 10cec127c2..60afcac7b5 100644
--- a/src/gui/doc/snippets/textdocument-blocks/main.cpp
+++ b/src/gui/doc/snippets/textdocument-blocks/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp b/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp
index 5a9c468a71..f512cf0dc6 100644
--- a/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-blocks/mainwindow.h b/src/gui/doc/snippets/textdocument-blocks/mainwindow.h
index 8f234e20c7..0ce579c158 100644
--- a/src/gui/doc/snippets/textdocument-blocks/mainwindow.h
+++ b/src/gui/doc/snippets/textdocument-blocks/mainwindow.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-blocks/xmlwriter.cpp b/src/gui/doc/snippets/textdocument-blocks/xmlwriter.cpp
index 832eccbc7b..b6bea4730b 100644
--- a/src/gui/doc/snippets/textdocument-blocks/xmlwriter.cpp
+++ b/src/gui/doc/snippets/textdocument-blocks/xmlwriter.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-blocks/xmlwriter.h b/src/gui/doc/snippets/textdocument-blocks/xmlwriter.h
index bce27ed3a9..e9455550d1 100644
--- a/src/gui/doc/snippets/textdocument-blocks/xmlwriter.h
+++ b/src/gui/doc/snippets/textdocument-blocks/xmlwriter.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-charformats/main.cpp b/src/gui/doc/snippets/textdocument-charformats/main.cpp
index 41d6f24f41..55a8eca9db 100644
--- a/src/gui/doc/snippets/textdocument-charformats/main.cpp
+++ b/src/gui/doc/snippets/textdocument-charformats/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-css/main.cpp b/src/gui/doc/snippets/textdocument-css/main.cpp
index fa68ad86fc..d8aac0c5f5 100644
--- a/src/gui/doc/snippets/textdocument-css/main.cpp
+++ b/src/gui/doc/snippets/textdocument-css/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-cursors/main.cpp b/src/gui/doc/snippets/textdocument-cursors/main.cpp
index 135747f58c..c19047b4e3 100644
--- a/src/gui/doc/snippets/textdocument-cursors/main.cpp
+++ b/src/gui/doc/snippets/textdocument-cursors/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-find/main.cpp b/src/gui/doc/snippets/textdocument-find/main.cpp
index f25d326312..2021760e48 100644
--- a/src/gui/doc/snippets/textdocument-find/main.cpp
+++ b/src/gui/doc/snippets/textdocument-find/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-frames/main.cpp b/src/gui/doc/snippets/textdocument-frames/main.cpp
index 853203949a..d5ee759b8f 100644
--- a/src/gui/doc/snippets/textdocument-frames/main.cpp
+++ b/src/gui/doc/snippets/textdocument-frames/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-frames/mainwindow.cpp b/src/gui/doc/snippets/textdocument-frames/mainwindow.cpp
index 52d26bd838..f15ad45f2e 100644
--- a/src/gui/doc/snippets/textdocument-frames/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-frames/mainwindow.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-frames/mainwindow.h b/src/gui/doc/snippets/textdocument-frames/mainwindow.h
index 115b1cf3fa..d4f41c81c0 100644
--- a/src/gui/doc/snippets/textdocument-frames/mainwindow.h
+++ b/src/gui/doc/snippets/textdocument-frames/mainwindow.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-frames/xmlwriter.cpp b/src/gui/doc/snippets/textdocument-frames/xmlwriter.cpp
index 02f9602e9c..137e88d904 100644
--- a/src/gui/doc/snippets/textdocument-frames/xmlwriter.cpp
+++ b/src/gui/doc/snippets/textdocument-frames/xmlwriter.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-frames/xmlwriter.h b/src/gui/doc/snippets/textdocument-frames/xmlwriter.h
index 997f66dc3a..156f383867 100644
--- a/src/gui/doc/snippets/textdocument-frames/xmlwriter.h
+++ b/src/gui/doc/snippets/textdocument-frames/xmlwriter.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-imagedrop/main.cpp b/src/gui/doc/snippets/textdocument-imagedrop/main.cpp
index 17d395ab41..198555c579 100644
--- a/src/gui/doc/snippets/textdocument-imagedrop/main.cpp
+++ b/src/gui/doc/snippets/textdocument-imagedrop/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-imagedrop/textedit.h b/src/gui/doc/snippets/textdocument-imagedrop/textedit.h
index bf6603eda9..9f73bceeaf 100644
--- a/src/gui/doc/snippets/textdocument-imagedrop/textedit.h
+++ b/src/gui/doc/snippets/textdocument-imagedrop/textedit.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-imageformat/main.cpp b/src/gui/doc/snippets/textdocument-imageformat/main.cpp
index c64288a649..89b09dc9b1 100644
--- a/src/gui/doc/snippets/textdocument-imageformat/main.cpp
+++ b/src/gui/doc/snippets/textdocument-imageformat/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-images/main.cpp b/src/gui/doc/snippets/textdocument-images/main.cpp
index 1ab51876b7..a3314f0c9e 100644
--- a/src/gui/doc/snippets/textdocument-images/main.cpp
+++ b/src/gui/doc/snippets/textdocument-images/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-listitems/main.cpp b/src/gui/doc/snippets/textdocument-listitems/main.cpp
index 10cec127c2..60afcac7b5 100644
--- a/src/gui/doc/snippets/textdocument-listitems/main.cpp
+++ b/src/gui/doc/snippets/textdocument-listitems/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-listitems/mainwindow.cpp b/src/gui/doc/snippets/textdocument-listitems/mainwindow.cpp
index 80d4af5327..c39dacfe29 100644
--- a/src/gui/doc/snippets/textdocument-listitems/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-listitems/mainwindow.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-listitems/mainwindow.h b/src/gui/doc/snippets/textdocument-listitems/mainwindow.h
index ef05c91716..1dc94632b6 100644
--- a/src/gui/doc/snippets/textdocument-listitems/mainwindow.h
+++ b/src/gui/doc/snippets/textdocument-listitems/mainwindow.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-listitemstyles/main.cpp b/src/gui/doc/snippets/textdocument-listitemstyles/main.cpp
index 10cec127c2..60afcac7b5 100644
--- a/src/gui/doc/snippets/textdocument-listitemstyles/main.cpp
+++ b/src/gui/doc/snippets/textdocument-listitemstyles/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.cpp b/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.cpp
index d8dd61f98f..b39bc0bd10 100644
--- a/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.h b/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.h
index af96c7bc8b..baf9be5f0d 100644
--- a/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.h
+++ b/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-lists/mainwindow.cpp b/src/gui/doc/snippets/textdocument-lists/mainwindow.cpp
index 16efe8c632..15a2752c8b 100644
--- a/src/gui/doc/snippets/textdocument-lists/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-lists/mainwindow.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-printing/main.cpp b/src/gui/doc/snippets/textdocument-printing/main.cpp
index 10cec127c2..60afcac7b5 100644
--- a/src/gui/doc/snippets/textdocument-printing/main.cpp
+++ b/src/gui/doc/snippets/textdocument-printing/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-printing/mainwindow.cpp b/src/gui/doc/snippets/textdocument-printing/mainwindow.cpp
index 8564bf6be7..40459b49da 100644
--- a/src/gui/doc/snippets/textdocument-printing/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-printing/mainwindow.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-printing/mainwindow.h b/src/gui/doc/snippets/textdocument-printing/mainwindow.h
index 4c1dcf457b..7b73c4139d 100644
--- a/src/gui/doc/snippets/textdocument-printing/mainwindow.h
+++ b/src/gui/doc/snippets/textdocument-printing/mainwindow.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-resources/main.cpp b/src/gui/doc/snippets/textdocument-resources/main.cpp
index 26574bf428..6712b5b2ec 100644
--- a/src/gui/doc/snippets/textdocument-resources/main.cpp
+++ b/src/gui/doc/snippets/textdocument-resources/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-selections/main.cpp b/src/gui/doc/snippets/textdocument-selections/main.cpp
index 10cec127c2..60afcac7b5 100644
--- a/src/gui/doc/snippets/textdocument-selections/main.cpp
+++ b/src/gui/doc/snippets/textdocument-selections/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp b/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp
index 05a8c86d63..8ac3913f3c 100644
--- a/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-selections/mainwindow.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-selections/mainwindow.h b/src/gui/doc/snippets/textdocument-selections/mainwindow.h
index 3db7e0c2a9..7b75b13e82 100644
--- a/src/gui/doc/snippets/textdocument-selections/mainwindow.h
+++ b/src/gui/doc/snippets/textdocument-selections/mainwindow.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-tables/main.cpp b/src/gui/doc/snippets/textdocument-tables/main.cpp
index 4cb0a1daa6..f37ea92dc4 100644
--- a/src/gui/doc/snippets/textdocument-tables/main.cpp
+++ b/src/gui/doc/snippets/textdocument-tables/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp b/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp
index cfd679c39c..061c191f1c 100644
--- a/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-tables/mainwindow.h b/src/gui/doc/snippets/textdocument-tables/mainwindow.h
index 7a2e081517..dc26cf3650 100644
--- a/src/gui/doc/snippets/textdocument-tables/mainwindow.h
+++ b/src/gui/doc/snippets/textdocument-tables/mainwindow.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-tables/xmlwriter.cpp b/src/gui/doc/snippets/textdocument-tables/xmlwriter.cpp
index fd860c73ee..e082fc8c7f 100644
--- a/src/gui/doc/snippets/textdocument-tables/xmlwriter.cpp
+++ b/src/gui/doc/snippets/textdocument-tables/xmlwriter.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-tables/xmlwriter.h b/src/gui/doc/snippets/textdocument-tables/xmlwriter.h
index 5a64fb0a4e..049e55df20 100644
--- a/src/gui/doc/snippets/textdocument-tables/xmlwriter.h
+++ b/src/gui/doc/snippets/textdocument-tables/xmlwriter.h
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocument-texttable/main.cpp b/src/gui/doc/snippets/textdocument-texttable/main.cpp
index b5dc412edb..518624634e 100644
--- a/src/gui/doc/snippets/textdocument-texttable/main.cpp
+++ b/src/gui/doc/snippets/textdocument-texttable/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/textdocumentendsnippet.cpp b/src/gui/doc/snippets/textdocumentendsnippet.cpp
index 5510fbae9d..c8de501838 100644
--- a/src/gui/doc/snippets/textdocumentendsnippet.cpp
+++ b/src/gui/doc/snippets/textdocumentendsnippet.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/snippets/transform/main.cpp b/src/gui/doc/snippets/transform/main.cpp
index 361ba6b178..e096eee7fc 100644
--- a/src/gui/doc/snippets/transform/main.cpp
+++ b/src/gui/doc/snippets/transform/main.cpp
@@ -1,12 +1,22 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
 **
 ** "Redistribution and use in source and binary forms, with or without
 ** modification, are permitted provided that the following conditions are
diff --git a/src/gui/doc/src/coordsys.qdoc b/src/gui/doc/src/coordsys.qdoc
index 117bac20a2..1856428361 100644
--- a/src/gui/doc/src/coordsys.qdoc
+++ b/src/gui/doc/src/coordsys.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -11,8 +11,8 @@
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file included in the packaging of
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/doc/src/dnd.qdoc b/src/gui/doc/src/dnd.qdoc
index 27f236b7a6..03b3cbfa24 100644
--- a/src/gui/doc/src/dnd.qdoc
+++ b/src/gui/doc/src/dnd.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -11,8 +11,8 @@
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file included in the packaging of
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/doc/src/external-resources.qdoc b/src/gui/doc/src/external-resources.qdoc
index b3854923f3..6a423323ea 100644
--- a/src/gui/doc/src/external-resources.qdoc
+++ b/src/gui/doc/src/external-resources.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -11,8 +11,8 @@
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file included in the packaging of
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/doc/src/paintsystem.qdoc b/src/gui/doc/src/paintsystem.qdoc
index 955543668d..98d71e9e55 100644
--- a/src/gui/doc/src/paintsystem.qdoc
+++ b/src/gui/doc/src/paintsystem.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -11,8 +11,8 @@
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file included in the packaging of
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/doc/src/qtgui.qdoc b/src/gui/doc/src/qtgui.qdoc
index 6e29597152..9781135960 100644
--- a/src/gui/doc/src/qtgui.qdoc
+++ b/src/gui/doc/src/qtgui.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -11,8 +11,8 @@
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file included in the packaging of
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/doc/src/richtext.qdoc b/src/gui/doc/src/richtext.qdoc
index 58f7890f8b..f3bbcaf5bb 100644
--- a/src/gui/doc/src/richtext.qdoc
+++ b/src/gui/doc/src/richtext.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -11,8 +11,8 @@
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file included in the packaging of
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 69434e801f..462f133ff8 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -31,7 +31,7 @@ testcocoon {
     load(testcocoon)
 }
 
-mac:!ios: LIBS_PRIVATE += -framework Cocoa
+osx: LIBS_PRIVATE += -framework AppKit
 
 CONFIG += simd optimize_full
 
diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp
index 745f6f59cb..e8405a6d11 100644
--- a/src/gui/image/qbitmap.cpp
+++ b/src/gui/image/qbitmap.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -190,6 +196,8 @@ QBitmap &QBitmap::operator=(const QPixmap &pixmap)
     return *this;
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+
 /*!
   Destroys the bitmap.
 */
@@ -197,6 +205,8 @@ QBitmap::~QBitmap()
 {
 }
 
+#endif
+
 /*!
     \fn void QBitmap::swap(QBitmap &other)
     \since 4.8
diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h
index be693af1cf..68727e74b5 100644
--- a/src/gui/image/qbitmap.h
+++ b/src/gui/image/qbitmap.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -49,7 +55,14 @@ public:
     QBitmap(int w, int h);
     explicit QBitmap(const QSize &);
     explicit QBitmap(const QString &fileName, const char *format = Q_NULLPTR);
+    // ### Qt 6: don't inherit QPixmap
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    QBitmap(const QBitmap &other) : QPixmap(other) {}
+    // QBitmap(QBitmap &&other) : QPixmap(std::move(other)) {} // QPixmap doesn't, yet, have a move ctor
+    QBitmap &operator=(const QBitmap &other) { QPixmap::operator=(other); return *this; }
+    QBitmap &operator=(QBitmap &&other) Q_DECL_NOTHROW { QPixmap::operator=(std::move(other)); return *this; }
     ~QBitmap();
+#endif
 
     QBitmap &operator=(const QPixmap &);
     inline void swap(QBitmap &other) { QPixmap::swap(other); } // prevent QBitmap<->QPixmap swaps
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
index bb238d3eb3..9545abfd21 100644
--- a/src/gui/image/qbmphandler.cpp
+++ b/src/gui/image/qbmphandler.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qbmphandler_p.h b/src/gui/image/qbmphandler_p.h
index 0d6909c050..c4800e3f97 100644
--- a/src/gui/image/qbmphandler_p.h
+++ b/src/gui/image/qbmphandler_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
index 4197d7e959..bae74bf9a1 100644
--- a/src/gui/image/qgifhandler.cpp
+++ b/src/gui/image/qgifhandler.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qgifhandler_p.h b/src/gui/image/qgifhandler_p.h
index 5c8a6ba003..bc3debe83c 100644
--- a/src/gui/image/qgifhandler_p.h
+++ b/src/gui/image/qgifhandler_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 3531be412e..db118edf04 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -1,32 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Copyright (C) 2015 Olivier Goffart <ogoffart@woboq.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -41,10 +47,13 @@
 #include "private/qiconloader_p.h"
 #include "qpainter.h"
 #include "qfileinfo.h"
+#include <qmimedatabase.h>
+#include <qmimetype.h>
 #include "qpixmapcache.h"
 #include "qvariant.h"
 #include "qcache.h"
 #include "qdebug.h"
+#include "qdir.h"
 #include "qpalette.h"
 #include "qmath.h"
 
@@ -277,7 +286,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St
     if (pm.isNull()) {
         int idx = pixmaps.count();
         while (--idx >= 0) {
-            if (pe == &pixmaps[idx]) {
+            if (pe == &pixmaps.at(idx)) {
                 pixmaps.remove(idx);
                 break;
             }
@@ -436,7 +445,7 @@ void QPixmapIconEngine::addFile(const QString &fileName, const QSize &size, QIco
             }
         }
     }
-    foreach (const QImage &i, icoImages)
+    for (const QImage &i : qAsConst(icoImages))
         pixmaps += QPixmapIconEngineEntry(abs, i, mode, state);
     if (icoImages.isEmpty() && !ignoreSize) // Add placeholder with the filename and empty pixmap for the size.
         pixmaps += QPixmapIconEngineEntry(abs, size, mode, state);
@@ -523,7 +532,6 @@ void QPixmapIconEngine::virtual_hook(int id, void *data)
     }
 }
 
-#ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QIconEngineFactoryInterface_iid, QLatin1String("/iconengines"), Qt::CaseInsensitive))
 
@@ -531,8 +539,6 @@ QFactoryLoader *qt_iconEngineFactoryLoader()
 {
     return loader();
 }
-#endif
-
 
 
 /*!
@@ -923,7 +929,7 @@ void QIcon::paint(QPainter *painter, const QRect &rect, Qt::Alignment alignment,
 */
 bool QIcon::isNull() const
 {
-    return !d;
+    return !d || d->engine->isNull();
 }
 
 /*!\internal
@@ -938,7 +944,12 @@ bool QIcon::isDetached() const
 void QIcon::detach()
 {
     if (d) {
-        if (d->ref.load() != 1) {
+        if (d->engine->isNull()) {
+            if (!d->ref.deref())
+                delete d;
+            d = 0;
+            return;
+        } else if (d->ref.load() != 1) {
             QIconPrivate *x = new QIconPrivate;
             x->engine = d->engine->clone();
             if (!d->ref.deref())
@@ -962,15 +973,26 @@ void QIcon::addPixmap(const QPixmap &pixmap, Mode mode, State state)
 {
     if (pixmap.isNull())
         return;
+    detach();
     if (!d) {
         d = new QIconPrivate;
         d->engine = new QPixmapIconEngine;
-    } else {
-        detach();
     }
     d->engine->addPixmap(pixmap, mode, state);
 }
 
+static QIconEngine *iconEngineFromSuffix(const QString &fileName, const QString &suffix)
+{
+    if (!suffix.isEmpty()) {
+        const int index = loader()->indexOf(suffix);
+        if (index != -1) {
+            if (QIconEnginePlugin *factory = qobject_cast<QIconEnginePlugin*>(loader()->instance(index))) {
+                return factory->create(fileName);
+            }
+        }
+    }
+    return nullptr;
+}
 
 /*!  Adds an image from the file with the given \a fileName to the
      icon, as a specialization for \a size, \a mode and \a state. The
@@ -1006,30 +1028,17 @@ void QIcon::addFile(const QString &fileName, const QSize &size, Mode mode, State
 {
     if (fileName.isEmpty())
         return;
+    detach();
     if (!d) {
-#ifndef QT_NO_LIBRARY
+
         QFileInfo info(fileName);
-        QString suffix = info.suffix();
-        if (!suffix.isEmpty()) {
-            // first try version 2 engines..
-            const int index = loader()->indexOf(suffix);
-            if (index != -1) {
-                if (QIconEnginePlugin *factory = qobject_cast<QIconEnginePlugin*>(loader()->instance(index))) {
-                    if (QIconEngine *engine = factory->create(fileName)) {
-                        d = new QIconPrivate;
-                        d->engine = engine;
-                    }
-                }
-            }
-        }
-#endif
-        // ...then fall back to the default engine
-        if (!d) {
-            d = new QIconPrivate;
-            d->engine = new QPixmapIconEngine;
-        }
-    } else {
-        detach();
+        QIconEngine *engine = iconEngineFromSuffix(fileName, info.suffix());
+#ifndef QT_NO_MIMETYPE
+        if (!engine)
+            engine = iconEngineFromSuffix(fileName, QMimeDatabase().mimeTypeForFile(info).preferredSuffix());
+#endif // !QT_NO_MIMETYPE
+        d = new QIconPrivate;
+        d->engine = engine ? engine : new QPixmapIconEngine;
     }
 
     d->engine->addFile(fileName, size, mode, state);
@@ -1139,8 +1148,7 @@ QString QIcon::themeName()
     \since 4.6
 
     Returns the QIcon corresponding to \a name in the current
-    icon theme. If no such icon is found in the current theme
-    \a fallback is returned instead.
+    icon theme.
 
     The latest version of the freedesktop icon specification and naming
     specification can be obtained here:
@@ -1154,24 +1162,25 @@ QString QIcon::themeName()
 
     \snippet code/src_gui_image_qicon.cpp 3
 
-    Or if you want to provide a guaranteed fallback for platforms that
-    do not support theme icons, you can use the second argument:
-
-    \snippet code/src_gui_image_qicon.cpp 4
-
     \note By default, only X11 will support themed icons. In order to
     use themed icons on Mac and Windows, you will have to bundle a
     compliant theme in one of your themeSearchPaths() and set the
     appropriate themeName().
 
+    \note Qt will make use of GTK's icon-theme.cache if present to speed up
+    the lookup. These caches can be generated using gtk-update-icon-cache:
+    \l{https://developer.gnome.org/gtk3/stable/gtk-update-icon-cache.html}.
+
     \sa themeName(), setThemeName(), themeSearchPaths()
 */
-QIcon QIcon::fromTheme(const QString &name, const QIcon &fallback)
+QIcon QIcon::fromTheme(const QString &name)
 {
     QIcon icon;
 
     if (qtIconCache()->contains(name)) {
         icon = *qtIconCache()->object(name);
+    } else if (QDir::isAbsolutePath(name)) {
+        return QIcon(name);
     } else {
         QPlatformTheme * const platformTheme = QGuiApplicationPrivate::platformTheme();
         bool hasUserTheme = QIconLoader::instance()->hasUserTheme();
@@ -1182,7 +1191,26 @@ QIcon QIcon::fromTheme(const QString &name, const QIcon &fallback)
         qtIconCache()->insert(name, cachedIcon);
     }
 
-    if (qApp && icon.availableSizes().isEmpty())
+    return icon;
+}
+
+/*!
+    \overload
+
+    Returns the QIcon corresponding to \a name in the current
+    icon theme. If no such icon is found in the current theme
+    \a fallback is returned instead.
+
+    If you want to provide a guaranteed fallback for platforms that
+    do not support theme icons, you can use the second argument:
+
+    \snippet code/src_gui_image_qicon.cpp 4
+*/
+QIcon QIcon::fromTheme(const QString &name, const QIcon &fallback)
+{
+    QIcon icon = fromTheme(name);
+
+    if (icon.isNull() || icon.availableSizes().isEmpty())
         return fallback;
 
     return icon;
@@ -1206,8 +1234,8 @@ bool QIcon::hasThemeIcon(const QString &name)
 /*!
     \since 5.6
 
-    Indicate that this icon is a mask image, and hence can potentially
-    be modified based on where it's displayed.
+    Indicate that this icon is a mask image(boolean \a isMask), and hence can
+    potentially be modified based on where it's displayed.
     \sa isMask()
 */
 void QIcon::setIsMask(bool isMask)
@@ -1307,7 +1335,6 @@ QDataStream &operator>>(QDataStream &s, QIcon &icon)
             QIconEngine *engine = new QIconLoaderEngine();
             icon.d->engine = engine;
             engine->read(s);
-#ifndef QT_NO_LIBRARY
         } else {
             const int index = loader()->indexOf(key);
             if (index != -1) {
@@ -1319,7 +1346,6 @@ QDataStream &operator>>(QDataStream &s, QIcon &icon)
                     } // factory
                 } // instance
             } // index
-#endif
         }
     } else if (s.version() == QDataStream::Qt_4_2) {
         icon = QIcon();
diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h
index 9ed7336502..1b0e73c21b 100644
--- a/src/gui/image/qicon.h
+++ b/src/gui/image/qicon.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -105,7 +111,8 @@ public:
     void setIsMask(bool isMask);
     bool isMask() const;
 
-    static QIcon fromTheme(const QString &name, const QIcon &fallback = QIcon());
+    static QIcon fromTheme(const QString &name);
+    static QIcon fromTheme(const QString &name, const QIcon &fallback);
     static bool hasThemeIcon(const QString &name);
 
     static QStringList themeSearchPaths();
diff --git a/src/gui/image/qicon_p.h b/src/gui/image/qicon_p.h
index 2a4f584a0d..cfae9b3e52 100644
--- a/src/gui/image/qicon_p.h
+++ b/src/gui/image/qicon_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -90,6 +96,7 @@ struct QPixmapIconEngineEntry
     QIcon::State state;
     bool isNull() const {return (fileName.isEmpty() && pixmap.isNull()); }
 };
+Q_DECLARE_TYPEINFO(QPixmapIconEngineEntry, Q_MOVABLE_TYPE);
 
 inline QPixmapIconEngineEntry::QPixmapIconEngineEntry(const QString &file, const QImage &image, QIcon::Mode m, QIcon::State s)
     : fileName(file), size(image.size()), mode(m), state(s)
diff --git a/src/gui/image/qiconengine.cpp b/src/gui/image/qiconengine.cpp
index c09933d45f..16cd4aa954 100644
--- a/src/gui/image/qiconengine.cpp
+++ b/src/gui/image/qiconengine.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -150,6 +156,11 @@ void QIconEngine::addFile(const QString &/*fileName*/, const QSize &/*size*/, QI
     icon, for example when instantiating an icon using
     QIcon::fromTheme().
 
+    \value IsNullHook Allow to query if this engine represents a null
+    icon. The \a data argument of the virtual_hook() is a pointer to a
+    bool that can be set to true if the icon is null. This enum value
+    was added in Qt 5.7.
+
     \sa virtual_hook()
  */
 
@@ -283,4 +294,16 @@ QString QIconEngine::iconName() const
     return name;
 }
 
+/*!
+    \since 5.7
+
+    Returns true if this icon engine represent a null QIcon.
+ */
+bool QIconEngine::isNull() const
+{
+    bool isNull = false;
+    const_cast<QIconEngine *>(this)->virtual_hook(QIconEngine::IsNullHook, &isNull);
+    return isNull;
+}
+
 QT_END_NAMESPACE
diff --git a/src/gui/image/qiconengine.h b/src/gui/image/qiconengine.h
index 9977113054..c702a1e8bb 100644
--- a/src/gui/image/qiconengine.h
+++ b/src/gui/image/qiconengine.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -58,7 +64,7 @@ public:
     virtual bool read(QDataStream &in);
     virtual bool write(QDataStream &out) const;
 
-    enum IconEngineHook { AvailableSizesHook = 1, IconNameHook };
+    enum IconEngineHook { AvailableSizesHook = 1, IconNameHook, IsNullHook };
 
     struct AvailableSizesArgument
     {
@@ -71,6 +77,7 @@ public:
                                     QIcon::State state = QIcon::Off) const;
 
     virtual QString iconName() const;
+    bool isNull() const; // ### Qt6 make virtual
 
     virtual void virtual_hook(int id, void *data);
 };
diff --git a/src/gui/image/qiconengineplugin.cpp b/src/gui/image/qiconengineplugin.cpp
index 07cf269bd0..ca80ee50a7 100644
--- a/src/gui/image/qiconengineplugin.cpp
+++ b/src/gui/image/qiconengineplugin.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qiconengineplugin.h b/src/gui/image/qiconengineplugin.h
index b05969f283..aacb3a9ebb 100644
--- a/src/gui/image/qiconengineplugin.h
+++ b/src/gui/image/qiconengineplugin.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qiconloader.cpp b/src/gui/image/qiconloader.cpp
index c7f1f2beb4..0233ccbf87 100644
--- a/src/gui/image/qiconloader.cpp
+++ b/src/gui/image/qiconloader.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -88,9 +94,7 @@ static inline QStringList systemIconSearchPaths()
     return QStringList();
 }
 
-#ifndef QT_NO_LIBRARY
 extern QFactoryLoader *qt_iconEngineFactoryLoader(); // qicon.cpp
-#endif
 
 void QIconLoader::ensureInitialized()
 {
@@ -103,10 +107,8 @@ void QIconLoader::ensureInitialized()
 
         if (m_systemTheme.isEmpty())
             m_systemTheme = fallbackTheme();
-#ifndef QT_NO_LIBRARY
         if (qt_iconEngineFactoryLoader()->keyMap().key(QLatin1String("svg"), -1) != -1)
             m_supportsSvg = true;
-#endif //QT_NO_LIBRARY
     }
 }
 
@@ -155,19 +157,155 @@ QStringList QIconLoader::themeSearchPaths() const
     return m_iconDirs;
 }
 
+/*!
+    \internal
+    Helper class that reads and looks up into the icon-theme.cache generated with
+    gtk-update-icon-cache. If at any point we detect a corruption in the file
+    (because the offsets point at wrong locations for example), the reader
+    is marked as invalid.
+*/
+class QIconCacheGtkReader
+{
+public:
+    explicit QIconCacheGtkReader(const QString &themeDir);
+    QVector<const char *> lookup(const QString &);
+    bool isValid() const { return m_isValid; }
+private:
+    QFile m_file;
+    const unsigned char *m_data;
+    quint64 m_size;
+    bool m_isValid;
+
+    quint16 read16(uint offset)
+    {
+        if (offset > m_size - 2 || (offset & 0x1)) {
+            m_isValid = false;
+            return 0;
+        }
+        return m_data[offset+1] | m_data[offset] << 8;
+    }
+    quint32 read32(uint offset)
+    {
+        if (offset > m_size - 4 || (offset & 0x3)) {
+            m_isValid = false;
+            return 0;
+        }
+        return m_data[offset+3] | m_data[offset+2] << 8
+            | m_data[offset+1] << 16 | m_data[offset] << 24;
+    }
+};
+
+
+QIconCacheGtkReader::QIconCacheGtkReader(const QString &dirName)
+    : m_isValid(false)
+{
+    QFileInfo info(dirName + QLatin1Literal("/icon-theme.cache"));
+    if (!info.exists() || info.lastModified() < QFileInfo(dirName).lastModified())
+        return;
+    m_file.setFileName(info.absoluteFilePath());
+    if (!m_file.open(QFile::ReadOnly))
+        return;
+    m_size = m_file.size();
+    m_data = m_file.map(0, m_size);
+    if (!m_data)
+        return;
+    if (read16(0) != 1) // VERSION_MAJOR
+        return;
+
+    m_isValid = true;
+
+    // Check that all the directories are older than the cache
+    auto lastModified = info.lastModified();
+    quint32 dirListOffset = read32(8);
+    quint32 dirListLen = read32(dirListOffset);
+    for (uint i = 0; i < dirListLen; ++i) {
+        quint32 offset = read32(dirListOffset + 4 + 4 * i);
+        if (!m_isValid || offset >= m_size || lastModified < QFileInfo(dirName + QLatin1Char('/')
+                + QString::fromUtf8(reinterpret_cast<const char*>(m_data + offset))).lastModified()) {
+            m_isValid = false;
+            return;
+        }
+    }
+}
+
+static quint32 icon_name_hash(const char *p)
+{
+    quint32 h = static_cast<signed char>(*p);
+    for (p += 1; *p != '\0'; p++)
+        h = (h << 5) - h + *p;
+    return h;
+}
+
+/*! \internal
+    lookup the icon name and return the list of subdirectories in which an icon
+    with this name is present. The char* are pointers to the mapped data.
+    For example, this would return { "32x32/apps", "24x24/apps" , ... }
+ */
+QVector<const char *> QIconCacheGtkReader::lookup(const QString &name)
+{
+    QVector<const char *> ret;
+    if (!isValid())
+        return ret;
+
+    QByteArray nameUtf8 = name.toUtf8();
+    quint32 hash = icon_name_hash(nameUtf8);
+
+    quint32 hashOffset = read32(4);
+    quint32 hashBucketCount = read32(hashOffset);
+
+    if (!isValid() || hashBucketCount == 0) {
+        m_isValid = false;
+        return ret;
+    }
+
+    quint32 bucketIndex = hash % hashBucketCount;
+    quint32 bucketOffset = read32(hashOffset + 4 + bucketIndex * 4);
+    while (bucketOffset > 0 && bucketOffset <= m_size - 12) {
+        quint32 nameOff = read32(bucketOffset + 4);
+        if (nameOff < m_size && strcmp(reinterpret_cast<const char*>(m_data + nameOff), nameUtf8) == 0) {
+            quint32 dirListOffset = read32(8);
+            quint32 dirListLen = read32(dirListOffset);
+
+            quint32 listOffset = read32(bucketOffset+8);
+            quint32 listLen = read32(listOffset);
+
+            if (!m_isValid || listOffset + 4 + 8 * listLen > m_size) {
+                m_isValid = false;
+                return ret;
+            }
+
+            ret.reserve(listLen);
+            for (uint j = 0; j < listLen && m_isValid; ++j) {
+                quint32 dirIndex = read16(listOffset + 4 + 8 * j);
+                quint32 o = read32(dirListOffset + 4 + dirIndex*4);
+                if (!m_isValid || dirIndex >= dirListLen || o >= m_size) {
+                    m_isValid = false;
+                    return ret;
+                }
+                ret.append(reinterpret_cast<const char*>(m_data) + o);
+            }
+            return ret;
+        }
+        bucketOffset = read32(bucketOffset);
+    }
+    return ret;
+}
+
 QIconTheme::QIconTheme(const QString &themeName)
         : m_valid(false)
 {
     QFile themeIndex;
 
-    QStringList iconDirs = QIcon::themeSearchPaths();
+    const QStringList iconDirs = QIcon::themeSearchPaths();
     for ( int i = 0 ; i < iconDirs.size() ; ++i) {
         QDir iconDir(iconDirs[i]);
         QString themeDir = iconDir.path() + QLatin1Char('/') + themeName;
         QFileInfo themeDirInfo(themeDir);
 
-        if (themeDirInfo.isDir())
+        if (themeDirInfo.isDir()) {
             m_contentDirs << themeDir;
+            m_gtkCaches << QSharedPointer<QIconCacheGtkReader>::create(themeDir);
+        }
 
         if (!m_valid) {
             themeIndex.setFileName(themeDir + QLatin1String("/index.theme"));
@@ -257,7 +395,6 @@ QThemeIconInfo QIconLoader::findIconHelper(const QString &themeName,
     }
 
     const QStringList contentDirs = theme.contentDirs();
-    const QVector<QIconDirInfo> subDirs = theme.keyList();
 
     QString iconNameFallback = iconName;
 
@@ -268,6 +405,29 @@ QThemeIconInfo QIconLoader::findIconHelper(const QString &themeName,
 
         // Add all relevant files
         for (int i = 0; i < contentDirs.size(); ++i) {
+            QVector<QIconDirInfo> subDirs = theme.keyList();
+
+            // Try to reduce the amount of subDirs by looking in the GTK+ cache in order to save
+            // a massive amount of file stat (especially if the icon is not there)
+            auto cache = theme.m_gtkCaches.at(i);
+            if (cache->isValid()) {
+                const auto result = cache->lookup(iconNameFallback);
+                if (cache->isValid()) {
+                    const QVector<QIconDirInfo> subDirsCopy = subDirs;
+                    subDirs.clear();
+                    subDirs.reserve(result.count());
+                    for (const char *s : result) {
+                        QString path = QString::fromUtf8(s);
+                        auto it = std::find_if(subDirsCopy.cbegin(), subDirsCopy.cend(),
+                                               [&](const QIconDirInfo &info) {
+                                                   return info.path == path; } );
+                        if (it != subDirsCopy.cend()) {
+                            subDirs.append(*it);
+                        }
+                    }
+                }
+            }
+
             QString contentDir = contentDirs.at(i) + QLatin1Char('/');
             for (int j = 0; j < subDirs.size() ; ++j) {
                 const QIconDirInfo &dirInfo = subDirs.at(j);
@@ -587,6 +747,11 @@ void QIconLoaderEngine::virtual_hook(int id, void *data)
             name = m_info.iconName;
         }
         break;
+    case QIconEngine::IsNullHook:
+        {
+            *reinterpret_cast<bool*>(data) = m_info.entries.isEmpty();
+        }
+        break;
     default:
         QIconEngine::virtual_hook(id, data);
     }
diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h
index 57ab60b7a5..c3421b2047 100644
--- a/src/gui/image/qiconloader_p.h
+++ b/src/gui/image/qiconloader_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -138,6 +144,8 @@ private:
     friend class QIconLoader;
 };
 
+class QIconCacheGtkReader;
+
 class QIconTheme
 {
 public:
@@ -147,12 +155,13 @@ public:
     QVector<QIconDirInfo> keyList() { return m_keyList; }
     QStringList contentDirs() { return m_contentDirs; }
     bool isValid() { return m_valid; }
-
 private:
     QStringList m_contentDirs;
     QVector<QIconDirInfo> m_keyList;
     QStringList m_parents;
     bool m_valid;
+public:
+    QVector<QSharedPointer<QIconCacheGtkReader>> m_gtkCaches;
 };
 
 class Q_GUI_EXPORT QIconLoader
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 856ba64204..f3cc48cf33 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -190,74 +196,81 @@ bool QImageData::checkForAlphaPixels() const
         break;
     case QImage::Format_ARGB32:
     case QImage::Format_ARGB32_Premultiplied: {
-        uchar *bits = data;
+        const uchar *bits = data;
         for (int y=0; y<height && !has_alpha_pixels; ++y) {
+            uint alphaAnd = 0xff000000;
             for (int x=0; x<width; ++x)
-                has_alpha_pixels |= (((uint *)bits)[x] & 0xff000000) != 0xff000000;
+                alphaAnd &= reinterpret_cast<const uint*>(bits)[x];
+            has_alpha_pixels = (alphaAnd != 0xff000000);
             bits += bytes_per_line;
         }
     } break;
 
     case QImage::Format_RGBA8888:
     case QImage::Format_RGBA8888_Premultiplied: {
-        uchar *bits = data;
+        const uchar *bits = data;
         for (int y=0; y<height && !has_alpha_pixels; ++y) {
+            uchar alphaAnd = 0xff;
             for (int x=0; x<width; ++x)
-                has_alpha_pixels |= bits[x*4+3] != 0xff;
+                alphaAnd &= bits[x * 4+ 3];
+            has_alpha_pixels = (alphaAnd != 0xff);
             bits += bytes_per_line;
         }
     } break;
 
     case QImage::Format_A2BGR30_Premultiplied:
     case QImage::Format_A2RGB30_Premultiplied: {
-        uchar *bits = data;
+        const uchar *bits = data;
         for (int y=0; y<height && !has_alpha_pixels; ++y) {
+            uint alphaAnd = 0xc0000000;
             for (int x=0; x<width; ++x)
-                has_alpha_pixels |= (((uint *)bits)[x] & 0xc0000000) != 0xc0000000;
+                alphaAnd &= reinterpret_cast<const uint*>(bits)[x];
+            has_alpha_pixels = (alphaAnd != 0xc0000000);
             bits += bytes_per_line;
         }
     } break;
 
     case QImage::Format_ARGB8555_Premultiplied:
     case QImage::Format_ARGB8565_Premultiplied: {
-        uchar *bits = data;
-        uchar *end_bits = data + bytes_per_line;
+        const uchar *bits = data;
+        const uchar *end_bits = data + bytes_per_line;
 
         for (int y=0; y<height && !has_alpha_pixels; ++y) {
+            uchar alphaAnd = 0xff;
             while (bits < end_bits) {
-                has_alpha_pixels |= bits[0] != 0;
+                alphaAnd &= bits[0];
                 bits += 3;
             }
+            has_alpha_pixels = (alphaAnd != 0xff);
             bits = end_bits;
             end_bits += bytes_per_line;
         }
     } break;
 
     case QImage::Format_ARGB6666_Premultiplied: {
-        uchar *bits = data;
-        uchar *end_bits = data + bytes_per_line;
+        const uchar *bits = data;
+        const uchar *end_bits = data + bytes_per_line;
 
         for (int y=0; y<height && !has_alpha_pixels; ++y) {
+            uchar alphaAnd = 0xfc;
             while (bits < end_bits) {
-                has_alpha_pixels |= (bits[0] & 0xfc) != 0;
+                alphaAnd &= bits[0];
                 bits += 3;
             }
+            has_alpha_pixels = (alphaAnd != 0xfc);
             bits = end_bits;
             end_bits += bytes_per_line;
         }
     } break;
 
     case QImage::Format_ARGB4444_Premultiplied: {
-        uchar *bits = data;
-        uchar *end_bits = data + bytes_per_line;
-
+        const uchar *bits = data;
         for (int y=0; y<height && !has_alpha_pixels; ++y) {
-            while (bits < end_bits) {
-                has_alpha_pixels |= (bits[0] & 0xf0) != 0;
-                bits += 2;
-            }
-            bits = end_bits;
-            end_bits += bytes_per_line;
+            ushort alphaAnd = 0xf000;
+            for (int x=0; x<width; ++x)
+                alphaAnd &= reinterpret_cast<const ushort*>(bits)[x];
+            has_alpha_pixels = (alphaAnd != 0xf000);
+            bits += bytes_per_line;
         }
     } break;
 
@@ -2060,10 +2073,10 @@ static QImage convertWithPalette(const QImage &src, QImage::Format format,
     dest.setColorTable(clut);
 
     QString textsKeys = src.text();
-    QStringList textKeyList = textsKeys.split(QLatin1Char('\n'), QString::SkipEmptyParts);
-    foreach (const QString &textKey, textKeyList) {
-        QStringList textKeySplitted = textKey.split(QLatin1String(": "));
-        dest.setText(textKeySplitted[0], textKeySplitted[1]);
+    const auto textKeyList = textsKeys.splitRef(QLatin1Char('\n'), QString::SkipEmptyParts);
+    for (const auto &textKey : textKeyList) {
+        const auto textKeySplitted = textKey.split(QLatin1String(": "));
+        dest.setText(textKeySplitted[0].toString(), textKeySplitted[1].toString());
     }
 
     int h = src.height();
@@ -2453,10 +2466,16 @@ QColor QImage::pixelColor(int x, int y) const
 */
 void QImage::setPixelColor(int x, int y, const QColor &color)
 {
-    if (!d || x < 0 || x >= width() || y < 0 || y >= height() || !color.isValid()) {
+    if (!d || x < 0 || x >= width() || y < 0 || y >= height()) {
         qWarning("QImage::setPixelColor: coordinate (%d,%d) out of range", x, y);
         return;
     }
+
+    if (!color.isValid()) {
+        qWarning("QImage::setPixelColor: color is invalid");
+        return;
+    }
+
     // QColor is always unpremultiplied
     QRgba64 c = color.rgba64();
     if (!hasAlphaChannel())
@@ -3763,11 +3782,10 @@ QString QImage::text(const QString &key) const
         return d->text.value(key);
 
     QString tmp;
-    foreach (const QString &key, d->text.keys()) {
-        if (!tmp.isEmpty())
-            tmp += QLatin1String("\n\n");
-        tmp += key + QLatin1String(": ") + d->text.value(key).simplified();
-    }
+    for (auto it = d->text.begin(), end = d->text.end(); it != end; ++it)
+        tmp += it.key() + QLatin1String(": ") + it.value().simplified() + QLatin1String("\n\n");
+    if (!tmp.isEmpty())
+        tmp.chop(2); // remove final \n\n
     return tmp;
 }
 
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 97c191c6c4..6f8e214b11 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -168,9 +174,9 @@ public:
     Format format() const;
 
 #if defined(Q_COMPILER_REF_QUALIFIERS) && !defined(QT_COMPILING_QIMAGE_COMPAT_CPP)
-    QImage convertToFormat(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor) const & Q_REQUIRED_RESULT
+    Q_ALWAYS_INLINE QImage convertToFormat(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor) const & Q_REQUIRED_RESULT
     { return convertToFormat_helper(f, flags); }
-    QImage convertToFormat(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor) && Q_REQUIRED_RESULT
+    Q_ALWAYS_INLINE QImage convertToFormat(Format f, Qt::ImageConversionFlags flags = Qt::AutoColor) && Q_REQUIRED_RESULT
     {
         if (convertToFormat_inplace(f, flags))
             return std::move(*this);
diff --git a/src/gui/image/qimage_avx2.cpp b/src/gui/image/qimage_avx2.cpp
index c52baec948..0519f17c5d 100644
--- a/src/gui/image/qimage_avx2.cpp
+++ b/src/gui/image/qimage_avx2.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qimage_compat.cpp b/src/gui/image/qimage_compat.cpp
index 9982ca6192..ba31a9ac9b 100644
--- a/src/gui/image/qimage_compat.cpp
+++ b/src/gui/image/qimage_compat.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp
index c25b4cf5c3..2c3a20870e 100644
--- a/src/gui/image/qimage_conversions.cpp
+++ b/src/gui/image/qimage_conversions.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -1727,24 +1733,30 @@ static void convert_Indexed8_to_X32(QImageData *dest, const QImageData *src, Qt:
     Q_ASSERT(src->width == dest->width);
     Q_ASSERT(src->height == dest->height);
 
-    QVector<QRgb> colorTable = fix_color_table(src->colortable, dest->format);
+    QVector<QRgb> colorTable = src->has_alpha_clut ? fix_color_table(src->colortable, dest->format) : src->colortable;
     if (colorTable.size() == 0) {
         colorTable.resize(256);
         for (int i=0; i<256; ++i)
             colorTable[i] = qRgb(i, i, i);
     }
+    if (colorTable.size() < 256) {
+        int tableSize = colorTable.size();
+        colorTable.resize(256);
+        for (int i=tableSize; i<256; ++i)
+            colorTable[i] = 0;
+    }
 
     int w = src->width;
     const uchar *src_data = src->data;
     uchar *dest_data = dest->data;
-    int tableSize = colorTable.size() - 1;
+    const QRgb *colorTablePtr = colorTable.constData();
     for (int y = 0; y < src->height; y++) {
-        uint *p = (uint *)dest_data;
+        uint *p = reinterpret_cast<uint *>(dest_data);
         const uchar *b = src_data;
         uint *end = p + w;
 
         while (p < end)
-            *p++ = colorTable.at(qMin<int>(tableSize, *b++));
+            *p++ = colorTablePtr[*b++];
 
         src_data += src->bytes_per_line;
         dest_data += dest->bytes_per_line;
diff --git a/src/gui/image/qimage_mips_dspr2.cpp b/src/gui/image/qimage_mips_dspr2.cpp
index 0d0942298b..13cca12cfa 100644
--- a/src/gui/image/qimage_mips_dspr2.cpp
+++ b/src/gui/image/qimage_mips_dspr2.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Imagination Technologies Limited, www.imgtec.com
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qimage_mips_dspr2_asm.S b/src/gui/image/qimage_mips_dspr2_asm.S
index a14a91b390..15beab29dc 100644
--- a/src/gui/image/qimage_mips_dspr2_asm.S
+++ b/src/gui/image/qimage_mips_dspr2_asm.S
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Imagination Technologies Limited, www.imgtec.com
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qimage_neon.cpp b/src/gui/image/qimage_neon.cpp
index 5853510ee1..57a24edeca 100644
--- a/src/gui/image/qimage_neon.cpp
+++ b/src/gui/image/qimage_neon.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h
index 4979eab207..3e76f39b94 100644
--- a/src/gui/image/qimage_p.h
+++ b/src/gui/image/qimage_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qimage_sse2.cpp b/src/gui/image/qimage_sse2.cpp
index 4a719d4c26..0fb92e9d43 100644
--- a/src/gui/image/qimage_sse2.cpp
+++ b/src/gui/image/qimage_sse2.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qimage_sse4.cpp b/src/gui/image/qimage_sse4.cpp
index 5fad4f572a..1f3f8f0d3f 100644
--- a/src/gui/image/qimage_sse4.cpp
+++ b/src/gui/image/qimage_sse4.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qimage_ssse3.cpp b/src/gui/image/qimage_ssse3.cpp
index 4597661776..0fa0eecd80 100644
--- a/src/gui/image/qimage_ssse3.cpp
+++ b/src/gui/image/qimage_ssse3.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp
index 22b4bcf560..5d1f8fa91f 100644
--- a/src/gui/image/qimageiohandler.cpp
+++ b/src/gui/image/qimageiohandler.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h
index 47a8a2b7c6..8f196ee9e0 100644
--- a/src/gui/image/qimageiohandler.h
+++ b/src/gui/image/qimageiohandler.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qimagepixmapcleanuphooks.cpp b/src/gui/image/qimagepixmapcleanuphooks.cpp
index 613a1de678..f383e7a60e 100644
--- a/src/gui/image/qimagepixmapcleanuphooks.cpp
+++ b/src/gui/image/qimagepixmapcleanuphooks.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -78,38 +84,38 @@ void QImagePixmapCleanupHooks::removeImageHook(_qt_image_cleanup_hook_64 hook)
 
 void QImagePixmapCleanupHooks::executePlatformPixmapModificationHooks(QPlatformPixmap* pmd)
 {
-    QImagePixmapCleanupHooks *h = qt_image_and_pixmap_cleanup_hooks();
+    const QImagePixmapCleanupHooks *h = qt_image_and_pixmap_cleanup_hooks();
     // the global destructor for the pixmap and image hooks might have
     // been called already if the app is "leaking" global
     // pixmaps/images
     if (!h)
         return;
-    for (int i = 0; i < h->pixmapModificationHooks.count(); ++i)
-        h->pixmapModificationHooks[i](pmd);
+    for (auto hook : h->pixmapModificationHooks)
+        hook(pmd);
 }
 
 void QImagePixmapCleanupHooks::executePlatformPixmapDestructionHooks(QPlatformPixmap* pmd)
 {
-    QImagePixmapCleanupHooks *h = qt_image_and_pixmap_cleanup_hooks();
+    const QImagePixmapCleanupHooks *h = qt_image_and_pixmap_cleanup_hooks();
     // the global destructor for the pixmap and image hooks might have
     // been called already if the app is "leaking" global
     // pixmaps/images
     if (!h)
         return;
-    for (int i = 0; i < h->pixmapDestructionHooks.count(); ++i)
-        h->pixmapDestructionHooks[i](pmd);
+    for (auto hook : h->pixmapDestructionHooks)
+        hook(pmd);
 }
 
 void QImagePixmapCleanupHooks::executeImageHooks(qint64 key)
 {
-    QImagePixmapCleanupHooks *h = qt_image_and_pixmap_cleanup_hooks();
+    const QImagePixmapCleanupHooks *h = qt_image_and_pixmap_cleanup_hooks();
     // the global destructor for the pixmap and image hooks might have
     // been called already if the app is "leaking" global
     // pixmaps/images
     if (!h)
         return;
-    for (int i = 0; i < h->imageHooks.count(); ++i)
-        h->imageHooks[i](key);
+    for (auto hook : h->imageHooks)
+        hook(key);
 }
 
 
diff --git a/src/gui/image/qimagepixmapcleanuphooks_p.h b/src/gui/image/qimagepixmapcleanuphooks_p.h
index 76fd5ca9be..f0ac17b0a9 100644
--- a/src/gui/image/qimagepixmapcleanuphooks_p.h
+++ b/src/gui/image/qimagepixmapcleanuphooks_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index 4322a41abd..4dada4ca82 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -499,7 +505,7 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
 
     if (!handler) {
 #ifdef QIMAGEREADER_DEBUG
-        qDebug() << "QImageReader::createReadHandler: no handlers found. giving up.";
+        qDebug("QImageReader::createReadHandler: no handlers found. giving up.");
 #endif
         // no handler: give up.
         return 0;
diff --git a/src/gui/image/qimagereader.h b/src/gui/image/qimagereader.h
index 6745c55b97..ad4f56c001 100644
--- a/src/gui/image/qimagereader.h
+++ b/src/gui/image/qimagereader.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index 1cf75d8688..35db038601 100644
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -848,9 +854,9 @@ void supportedImageHandlerMimeTypes(QFactoryLoader *loader,
 
     const int pluginCount = metaDataList.size();
     for (int i = 0; i < pluginCount; ++i) {
-        const QJsonObject metaData = metaDataList.at(i).value(QStringLiteral("MetaData")).toObject();
-        const QJsonArray keys = metaData.value(QStringLiteral("Keys")).toArray();
-        const QJsonArray mimeTypes = metaData.value(QStringLiteral("MimeTypes")).toArray();
+        const QJsonObject metaData = metaDataList.at(i).value(QLatin1String("MetaData")).toObject();
+        const QJsonArray keys = metaData.value(QLatin1String("Keys")).toArray();
+        const QJsonArray mimeTypes = metaData.value(QLatin1String("MimeTypes")).toArray();
         QImageIOPlugin *plugin = qobject_cast<QImageIOPlugin *>(loader->instance(i));
         const int keyCount = keys.size();
         for (int k = 0; k < keyCount; ++k) {
diff --git a/src/gui/image/qimagewriter.h b/src/gui/image/qimagewriter.h
index 7f92595c53..a6208ae5dc 100644
--- a/src/gui/image/qimagewriter.h
+++ b/src/gui/image/qimagewriter.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp
index 68709b708d..52e8b39f11 100644
--- a/src/gui/image/qjpeghandler.cpp
+++ b/src/gui/image/qjpeghandler.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qjpeghandler_p.h b/src/gui/image/qjpeghandler_p.h
index ce53085031..534ce12115 100644
--- a/src/gui/image/qjpeghandler_p.h
+++ b/src/gui/image/qjpeghandler_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index 09cd788c61..1fdef4e230 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -965,14 +971,16 @@ void QMovie::setScaledSize(const QSize &size)
 QList<QByteArray> QMovie::supportedFormats()
 {
     QList<QByteArray> list = QImageReader::supportedImageFormats();
-    QMutableListIterator<QByteArray> it(list);
+
     QBuffer buffer;
     buffer.open(QIODevice::ReadOnly);
-    while (it.hasNext()) {
-        QImageReader reader(&buffer, it.next());
-        if (!reader.supportsAnimation())
-            it.remove();
-    }
+
+    const auto doesntSupportAnimation =
+            [&buffer](const QByteArray &format) {
+                return !QImageReader(&buffer, format).supportsAnimation();
+            };
+
+    list.erase(std::remove_if(list.begin(), list.end(), doesntSupportAnimation), list.end());
     return list;
 }
 
diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h
index a750e4a9fc..cf644d3347 100644
--- a/src/gui/image/qmovie.h
+++ b/src/gui/image/qmovie.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index f349cba374..38e67761b1 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qnativeimage_p.h b/src/gui/image/qnativeimage_p.h
index 49477521dc..2398a6e2ce 100644
--- a/src/gui/image/qnativeimage_p.h
+++ b/src/gui/image/qnativeimage_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qpaintengine_pic.cpp b/src/gui/image/qpaintengine_pic.cpp
index 47480ebbae..6a87a01a87 100644
--- a/src/gui/image/qpaintengine_pic.cpp
+++ b/src/gui/image/qpaintengine_pic.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -85,7 +91,7 @@ bool QPicturePaintEngine::begin(QPaintDevice *pd)
 {
     Q_D(QPicturePaintEngine);
 #ifdef QT_PICTURE_DEBUG
-    qDebug() << "QPicturePaintEngine::begin()";
+    qDebug("QPicturePaintEngine::begin()");
 #endif
     Q_ASSERT(pd);
     QPicture *pic = static_cast<QPicture *>(pd);
@@ -118,7 +124,7 @@ bool QPicturePaintEngine::end()
 {
     Q_D(QPicturePaintEngine);
 #ifdef QT_PICTURE_DEBUG
-    qDebug() << "QPicturePaintEngine::end()";
+    qDebug("QPicturePaintEngine::end()");
 #endif
     d->pic_d->trecs++;
     d->s << (quint8) QPicturePrivate::PdcEnd << (quint8) 0;
diff --git a/src/gui/image/qpaintengine_pic_p.h b/src/gui/image/qpaintengine_pic_p.h
index f7f945bbbb..6894593092 100644
--- a/src/gui/image/qpaintengine_pic_p.h
+++ b/src/gui/image/qpaintengine_pic_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index 2b184466f4..7506e2e1a9 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -1408,7 +1414,6 @@ Q_GLOBAL_STATIC(QPHList, pictureHandlers)
 
 void qt_init_picture_plugins()
 {
-#ifndef QT_NO_LIBRARY
     typedef QMultiMap<int, QString> PluginKeyMap;
     typedef PluginKeyMap::const_iterator PluginKeyMapConstIterator;
 
@@ -1423,7 +1428,6 @@ void qt_init_picture_plugins()
         if (QPictureFormatPlugin *format = qobject_cast<QPictureFormatPlugin*>(loader.instance(it.key())))
             format->installIOHandler(it.value());
     }
-#endif
 }
 
 static void cleanup()
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h
index a71d1deb02..f375157317 100644
--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qpicture_p.h b/src/gui/image/qpicture_p.h
index a414a122f1..df1235469c 100644
--- a/src/gui/image/qpicture_p.h
+++ b/src/gui/image/qpicture_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qpictureformatplugin.cpp b/src/gui/image/qpictureformatplugin.cpp
index 0400a3a843..ef57ad720f 100644
--- a/src/gui/image/qpictureformatplugin.cpp
+++ b/src/gui/image/qpictureformatplugin.cpp
@@ -1,38 +1,44 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
 #include "qpictureformatplugin.h"
-#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_PICTURE)
+#if !defined(QT_NO_PICTURE)
 #include "qpicture.h"
 
 QT_BEGIN_NAMESPACE
@@ -124,6 +130,6 @@ bool QPictureFormatPlugin::savePicture(const QString &format, const QString &fil
     return false;
 }
 
-#endif // QT_NO_LIBRARY || QT_NO_PICTURE
+#endif // QT_NO_PICTURE
 
 QT_END_NAMESPACE
diff --git a/src/gui/image/qpictureformatplugin.h b/src/gui/image/qpictureformatplugin.h
index 9ad938fa79..003ccac116 100644
--- a/src/gui/image/qpictureformatplugin.h
+++ b/src/gui/image/qpictureformatplugin.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -40,7 +46,7 @@
 QT_BEGIN_NAMESPACE
 
 
-#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_PICTURE)
+#if !defined(QT_NO_PICTURE)
 
 class QPicture;
 class QImage;
@@ -62,7 +68,7 @@ public:
 
 };
 
-#endif // QT_NO_LIBRARY || QT_NO_PICTURE
+#endif // QT_NO_PICTURE
 
 QT_END_NAMESPACE
 
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 3726b2124c..db922b4a9f 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -64,7 +70,7 @@ QT_BEGIN_NAMESPACE
 
 static bool qt_pixmap_thread_test()
 {
-    if (!QCoreApplication::instance()) {
+    if (Q_UNLIKELY(!QCoreApplication::instance())) {
         qFatal("QPixmap: Must construct a QGuiApplication before a QPixmap");
         return false;
     }
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 48db7a3840..165ec4a6b8 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qpixmap_blitter.cpp b/src/gui/image/qpixmap_blitter.cpp
index a68425e100..0906b65d96 100644
--- a/src/gui/image/qpixmap_blitter.cpp
+++ b/src/gui/image/qpixmap_blitter.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qpixmap_blitter_p.h b/src/gui/image/qpixmap_blitter_p.h
index e1444f6279..bc97bbc1df 100644
--- a/src/gui/image/qpixmap_blitter_p.h
+++ b/src/gui/image/qpixmap_blitter_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp
index bbdf77355e..13104ce17f 100644
--- a/src/gui/image/qpixmap_raster.cpp
+++ b/src/gui/image/qpixmap_raster.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h
index 7f3c54f853..1a42757669 100644
--- a/src/gui/image/qpixmap_raster_p.h
+++ b/src/gui/image/qpixmap_raster_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qpixmap_win.cpp b/src/gui/image/qpixmap_win.cpp
index 8db3bdbc7f..7f20586156 100644
--- a/src/gui/image/qpixmap_win.cpp
+++ b/src/gui/image/qpixmap_win.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index d29ddcf978..6d03332367 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -156,6 +162,16 @@ bool QPixmapCache::Key::operator ==(const Key &key) const
 */
 
 /*!
+    Returns \c true if there is a cached pixmap associated with this key.
+    Otherwise, if pixmap was flushed, the key is no longer valid.
+    \since 5.7
+*/
+bool QPixmapCache::Key::isValid() const Q_DECL_NOTHROW
+{
+    return d && d->isValid;
+}
+
+/*!
     \internal
 */
 QPixmapCache::Key &QPixmapCache::Key::operator =(const Key &other)
diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h
index 37a0588e06..cc35fd0fd2 100644
--- a/src/gui/image/qpixmapcache.h
+++ b/src/gui/image/qpixmapcache.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -59,6 +65,7 @@ public:
         Key &operator =(const Key &other);
 
         void swap(Key &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+        bool isValid() const Q_DECL_NOTHROW;
 
     private:
         KeyData *d;
diff --git a/src/gui/image/qpixmapcache_p.h b/src/gui/image/qpixmapcache_p.h
index 99490a0e17..951c4ea9b1 100644
--- a/src/gui/image/qpixmapcache_p.h
+++ b/src/gui/image/qpixmapcache_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qplatformpixmap.cpp b/src/gui/image/qplatformpixmap.cpp
index 8e8b192cdd..00c21a5f54 100644
--- a/src/gui/image/qplatformpixmap.cpp
+++ b/src/gui/image/qplatformpixmap.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qplatformpixmap.h b/src/gui/image/qplatformpixmap.h
index f0f17a5bbb..c83278a4c3 100644
--- a/src/gui/image/qplatformpixmap.h
+++ b/src/gui/image/qplatformpixmap.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index e9944e1750..d021e6f09f 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -1,32 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Samuel Gaist <samuel.gaist@edeltech.ch>
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -755,7 +761,7 @@ static void set_text(const QImage &image, png_structp png_ptr, png_infop info_pt
     QMap<QString, QString>::ConstIterator it = text.constBegin();
     int i = 0;
     while (it != text.constEnd()) {
-        text_ptr[i].key = qstrdup(it.key().left(79).toLatin1().constData());
+        text_ptr[i].key = qstrdup(it.key().leftRef(79).toLatin1().constData());
         bool noCompress = (it.value().length() < 40);
 
 #ifdef PNG_iTXt_SUPPORTED
diff --git a/src/gui/image/qpnghandler_p.h b/src/gui/image/qpnghandler_p.h
index 4261387f4b..fb5a830baa 100644
--- a/src/gui/image/qpnghandler_p.h
+++ b/src/gui/image/qpnghandler_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qppmhandler.cpp b/src/gui/image/qppmhandler.cpp
index 6eb35e1558..42d3684aea 100644
--- a/src/gui/image/qppmhandler.cpp
+++ b/src/gui/image/qppmhandler.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qppmhandler_p.h b/src/gui/image/qppmhandler_p.h
index 31ca0a80d3..1e8ca2b81e 100644
--- a/src/gui/image/qppmhandler_p.h
+++ b/src/gui/image/qppmhandler_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp
index 44d07f1624..eda816f0f2 100644
--- a/src/gui/image/qxbmhandler.cpp
+++ b/src/gui/image/qxbmhandler.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qxbmhandler_p.h b/src/gui/image/qxbmhandler_p.h
index ba3222c406..5094a43ef6 100644
--- a/src/gui/image/qxbmhandler_p.h
+++ b/src/gui/image/qxbmhandler_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp
index b673ae5b33..c8c8f993d3 100644
--- a/src/gui/image/qxpmhandler.cpp
+++ b/src/gui/image/qxpmhandler.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -1148,7 +1154,7 @@ static bool write_xpm_image(const QImage &sourceImage, QIODevice *device, const
         int cc = 0;
         for(x=0; x<w; x++) {
             int color = (int)(*(yp + x));
-            QByteArray chars(xpm_color_name(cpp, colorMap[color]));
+            const QByteArray chars(xpm_color_name(cpp, colorMap[color]));
             line[cc++] = QLatin1Char(chars[0]);
             if (cpp > 1) {
                 line[cc++] = QLatin1Char(chars[1]);
diff --git a/src/gui/image/qxpmhandler_p.h b/src/gui/image/qxpmhandler_p.h
index b58ae60fd0..9a2041be94 100644
--- a/src/gui/image/qxpmhandler_p.h
+++ b/src/gui/image/qxpmhandler_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp
index 25b82b94b5..5c04510af1 100644
--- a/src/gui/itemmodels/qstandarditemmodel.cpp
+++ b/src/gui/itemmodels/qstandarditemmodel.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -51,6 +57,11 @@
 
 QT_BEGIN_NAMESPACE
 
+static inline QString qStandardItemModelDataListMimeType()
+{
+    return QStringLiteral("application/x-qstandarditemmodeldatalist");
+}
+
 class QStandardItemModelLessThan
 {
 public:
@@ -192,19 +203,17 @@ void QStandardItemPrivate::setItemData(const QMap<int, QVariant> &roles)
 
     //let's build the vector of new values
     QVector<QStandardItemData> newValues;
-    QMap<int, QVariant>::const_iterator it;
-    for (it = roles.begin(); it != roles.end(); ++it) {
-        QVariant value = it.value();
+    for (auto it = roles.begin(), end = roles.end(); it != end; ++it) {
+        const QVariant &value = it.value();
         if (value.isValid()) {
             int role = it.key();
             role = (role == Qt::EditRole) ? Qt::DisplayRole : role;
-            QStandardItemData wid(role,it.value());
-            newValues.append(wid);
+            newValues.append(QStandardItemData(role, value));
         }
     }
 
     if (values!=newValues) {
-        values=newValues;
+        values.swap(newValues);
         if (model)
             model->d_func()->itemChanged(q);
     }
@@ -1796,11 +1805,12 @@ QStandardItem *QStandardItem::takeChild(int row, int column)
 QList<QStandardItem*> QStandardItem::takeRow(int row)
 {
     Q_D(QStandardItem);
+    QList<QStandardItem*> items;
     if ((row < 0) || (row >= rowCount()))
-        return QList<QStandardItem*>();
+        return items;
     if (d->model)
         d->model->d_func()->rowsAboutToBeRemoved(this, row, row);
-    QList<QStandardItem*> items;
+
     int index = d->childIndex(row, 0);  // Will return -1 if there are no columns
     if (index != -1) {
         int col_count = d->columnCount();
@@ -1829,13 +1839,15 @@ QList<QStandardItem*> QStandardItem::takeRow(int row)
 QList<QStandardItem*> QStandardItem::takeColumn(int column)
 {
     Q_D(QStandardItem);
+    QList<QStandardItem*> items;
     if ((column < 0) || (column >= columnCount()))
-        return QList<QStandardItem*>();
+        return items;
     if (d->model)
         d->model->d_func()->columnsAboutToBeRemoved(this, column, column);
-    QList<QStandardItem*> items;
 
-    for (int row = d->rowCount() - 1; row >= 0; --row) {
+    const int rowCount = d->rowCount();
+    items.reserve(rowCount);
+    for (int row = rowCount - 1; row >= 0; --row) {
         int index = d->childIndex(row, column);
         QStandardItem *ch = d->children.at(index);
         if (ch)
@@ -2164,6 +2176,7 @@ void QStandardItemModel::clear()
     Q_D(QStandardItemModel);
     beginResetModel();
     d->root.reset(new QStandardItem);
+    d->root->setFlags(Qt::ItemIsDropEnabled);
     d->root->d_func()->setModel(this);
     qDeleteAll(d->columnHeaderItems);
     d->columnHeaderItems.clear();
@@ -2972,7 +2985,7 @@ void QStandardItemModel::sort(int column, Qt::SortOrder order)
 */
 QStringList QStandardItemModel::mimeTypes() const
 {
-    return QAbstractItemModel::mimeTypes() <<  QLatin1String("application/x-qstandarditemmodeldatalist");
+    return QAbstractItemModel::mimeTypes() << qStandardItemModelDataListMimeType();
 }
 
 /*!
@@ -2984,7 +2997,7 @@ QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const
     if(!data)
         return 0;
 
-    QString format = QLatin1String("application/x-qstandarditemmodeldatalist");
+    const QString format = qStandardItemModelDataListMimeType();
     if (!mimeTypes().contains(format))
         return data;
     QByteArray encoded;
@@ -2999,7 +3012,7 @@ QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const
             itemsSet << item;
             stack.push(item);
         } else {
-            qWarning() << "QStandardItemModel::mimeData: No item associated with invalid index";
+            qWarning("QStandardItemModel::mimeData: No item associated with invalid index");
             return 0;
         }
     }
@@ -3017,10 +3030,7 @@ QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const
             for (int i = 0; i < childList.count(); ++i) {
                 QStandardItem *chi = childList.at(i);
                 if (chi) {
-                    QSet<QStandardItem *>::iterator it = itemsSet.find(chi);
-                    if (it != itemsSet.end()) {
-                        itemsSet.erase(it);
-                    }
+                    itemsSet.erase(itemsSet.constFind(chi));
                     stack.push(chi);
                 }
             }
@@ -3028,9 +3038,8 @@ QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const
     }
 
     stack.reserve(itemsSet.count());
-    foreach (QStandardItem *item, itemsSet) {
+    for (QStandardItem *item : qAsConst(itemsSet))
         stack.push(item);
-    }
 
     //stream everything recursively
     while (!stack.isEmpty()) {
@@ -3080,7 +3089,7 @@ bool QStandardItemModel::dropMimeData(const QMimeData *data, Qt::DropAction acti
     if (!data || !(action == Qt::CopyAction || action == Qt::MoveAction))
         return false;
     // check if the format is supported
-    QString format = QLatin1String("application/x-qstandarditemmodeldatalist");
+    const QString format = qStandardItemModelDataListMimeType();
     if (!data->hasFormat(format))
         return QAbstractItemModel::dropMimeData(data, action, row, column, parent);
 
@@ -3130,13 +3139,13 @@ bool QStandardItemModel::dropMimeData(const QMimeData *data, Qt::DropAction acti
     for (int i = 0; i < rows.count(); ++i)
         rowsToInsert[rows.at(i)] = 1;
     for (int i = 0; i < rowsToInsert.count(); ++i) {
-        if (rowsToInsert[i] == 1){
+        if (rowsToInsert.at(i) == 1){
             rowsToInsert[i] = dragRowCount;
             ++dragRowCount;
         }
     }
     for (int i = 0; i < rows.count(); ++i)
-        rows[i] = top + rowsToInsert[rows[i]];
+        rows[i] = top + rowsToInsert.at(rows.at(i));
 
     QBitArray isWrittenTo(dragRowCount * dragColumnCount);
 
diff --git a/src/gui/itemmodels/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h
index 8740f7940b..476b936a25 100644
--- a/src/gui/itemmodels/qstandarditemmodel.h
+++ b/src/gui/itemmodels/qstandarditemmodel.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/itemmodels/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h
index b49045d283..1849e1a850 100644
--- a/src/gui/itemmodels/qstandarditemmodel_p.h
+++ b/src/gui/itemmodels/qstandarditemmodel_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -66,6 +72,7 @@ public:
     QVariant value;
     inline bool operator==(const QStandardItemData &other) const { return role == other.role && value == other.value; }
 };
+Q_DECLARE_TYPEINFO(QStandardItemData, Q_MOVABLE_TYPE);
 
 #ifndef QT_NO_DATASTREAM
 
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp
index 325ba7d787..cf98bba54c 100644
--- a/src/gui/kernel/qclipboard.cpp
+++ b/src/gui/kernel/qclipboard.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qclipboard.h b/src/gui/kernel/qclipboard.h
index a285e188a6..2588288880 100644
--- a/src/gui/kernel/qclipboard.h
+++ b/src/gui/kernel/qclipboard.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp
index c25f3c2665..b7035d47c4 100644
--- a/src/gui/kernel/qcursor.cpp
+++ b/src/gui/kernel/qcursor.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -368,9 +374,6 @@ QDataStream &operator>>(QDataStream &s, QCursor &c)
     because this size is supported on all platforms. Some platforms
     also support 16 x 16, 48 x 48, and 64 x 64 cursors.
 
-    \note On Windows CE, the cursor size is fixed. If the pixmap
-    is bigger than the system size, it will be scaled.
-
     \sa QPixmap::QPixmap(), QPixmap::setMask()
 */
 
@@ -427,9 +430,6 @@ QCursor::QCursor(const QPixmap &pixmap, int hotX, int hotY)
     because this size is supported on all platforms. Some platforms
     also support 16 x 16, 48 x 48, and 64 x 64 cursors.
 
-    \note On Windows CE, the cursor size is fixed. If the pixmap
-    is bigger than the system size, it will be scaled.
-
     \sa QBitmap::QBitmap(), QBitmap::setMask()
 */
 
diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h
index 5f32192b8d..814e8ab7bd 100644
--- a/src/gui/kernel/qcursor.h
+++ b/src/gui/kernel/qcursor.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -81,9 +87,12 @@ public:
     QCursor &operator=(const QCursor &cursor);
 #ifdef Q_COMPILER_RVALUE_REFS
     QCursor(QCursor &&other) Q_DECL_NOTHROW : d(other.d) { other.d = Q_NULLPTR; }
-    inline QCursor &operator=(QCursor &&other)
-    { qSwap(d, other.d); return *this; }
+    inline QCursor &operator=(QCursor &&other) Q_DECL_NOTHROW
+    { swap(other); return *this; }
 #endif
+
+    void swap(QCursor &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+
     operator QVariant() const;
 
     Qt::CursorShape shape() const;
@@ -104,6 +113,7 @@ public:
 private:
     QCursorData *d;
 };
+Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QCursor)
 
 /*****************************************************************************
   QCursor stream functions
diff --git a/src/gui/kernel/qcursor_p.h b/src/gui/kernel/qcursor_p.h
index 188ea387b3..8dcea7fdcc 100644
--- a/src/gui/kernel/qcursor_p.h
+++ b/src/gui/kernel/qcursor_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp
index b05da1bfd0..21f9b46654 100644
--- a/src/gui/kernel/qdnd.cpp
+++ b/src/gui/kernel/qdnd.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/kernel/qdnd_p.h
index 537984f9df..af7aaf771a 100644
--- a/src/gui/kernel/qdnd_p.h
+++ b/src/gui/kernel/qdnd_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp
index c2d168de5d..5b36f496f1 100644
--- a/src/gui/kernel/qdrag.cpp
+++ b/src/gui/kernel/qdrag.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -33,6 +39,8 @@
 
 #include <qdrag.h>
 #include "private/qguiapplication_p.h"
+#include "qpa/qplatformintegration.h"
+#include "qpa/qplatformdrag.h"
 #include <qpixmap.h>
 #include <qpoint.h>
 #include "qdnd_p.h"
@@ -223,6 +231,8 @@ QObject *QDrag::target() const
     loop. Other events are still delivered to the application while
     the operation is performed. On Windows, the Qt event loop is
     blocked during the operation.
+
+    \sa cancel()
 */
 
 Qt::DropAction QDrag::exec(Qt::DropActions supportedActions)
@@ -377,6 +387,21 @@ Qt::DropAction QDrag::defaultAction() const
     Q_D(const QDrag);
     return d->default_action;
 }
+
+/*!
+    Cancels a drag operation initiated by Qt.
+
+    \note This is currently implemented on Windows and X11.
+
+    \since 5.6
+    \sa exec()
+*/
+void QDrag::cancel()
+{
+    if (QPlatformDrag *platformDrag = QGuiApplicationPrivate::platformIntegration()->drag())
+        platformDrag->cancelDrag();
+}
+
 /*!
     \fn void QDrag::actionChanged(Qt::DropAction action)
 
diff --git a/src/gui/kernel/qdrag.h b/src/gui/kernel/qdrag.h
index 0672cb00f9..6332899c39 100644
--- a/src/gui/kernel/qdrag.h
+++ b/src/gui/kernel/qdrag.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -77,6 +83,8 @@ public:
     Qt::DropActions supportedActions() const;
     Qt::DropAction defaultAction() const;
 
+    static void cancel();
+
 Q_SIGNALS:
     void actionChanged(Qt::DropAction action);
     void targetChanged(QObject *newTarget);
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index d8b103b3f0..1da862515b 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -37,6 +43,7 @@
 #include "qpa/qplatformintegration.h"
 #include "qpa/qplatformdrag.h"
 #include "private/qevent_p.h"
+#include "qfile.h"
 #include "qmetaobject.h"
 #include "qmimedata.h"
 #include "private/qdnd_p.h"
@@ -695,6 +702,31 @@ QHoverEvent::~QHoverEvent()
 */
 
 /*!
+    \fn bool QWheelEvent::inverted() const
+    \since 5.7
+
+    Returns whether the delta values delivered with the event are inverted.
+
+    Normally, a vertical wheel will produce a QWheelEvent with positive delta
+    values if the top of the wheel is rotating away from the hand operating it.
+    Similarly, a horizontal wheel movement will produce a QWheelEvent with
+    positive delta values if the top of the wheel is moved to the left.
+
+    However, on some platforms this is configurable, so that the same
+    operations described above will produce negative delta values (but with the
+    same magnitude). With the inverted property a wheel event consumer can
+    choose to always follow the direction of the wheel, regardless of the
+    system settings, but only for specific widgets. (One such use case could be
+    that the user is rotating the wheel in the same direction as a visual
+    Tumbler rotates. Another usecase is to make a slider handle follow the
+    direction of movement of fingers on a touchpad regardless of system
+    configuration.)
+
+    \note Many platforms provide no such information. On such platforms
+    \l inverted always returns false.
+*/
+
+/*!
     \fn Qt::Orientation QWheelEvent::orientation() const
     \obsolete
 
@@ -727,10 +759,8 @@ QWheelEvent::QWheelEvent(const QPointF &pos, int delta,
                          Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers,
                          Qt::Orientation orient)
     : QInputEvent(Wheel, modifiers), p(pos), qt4D(delta), qt4O(orient), mouseState(buttons),
-      ph(Qt::NoScrollPhase), src(Qt::MouseEventNotSynthesized)
+      ph(Qt::NoScrollPhase), src(Qt::MouseEventNotSynthesized), invertedScrolling(false)
 {
-    if (!QGuiApplicationPrivate::scrollNoPhaseAllowed)
-        ph = Qt::ScrollUpdate;
     g = QCursor::pos();
     if (orient == Qt::Vertical)
         angleD = QPoint(0, delta);
@@ -764,10 +794,8 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos, int delta
                          Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers,
                          Qt::Orientation orient)
     : QInputEvent(Wheel, modifiers), p(pos), g(globalPos), qt4D(delta), qt4O(orient), mouseState(buttons),
-      ph(Qt::NoScrollPhase), src(Qt::MouseEventNotSynthesized)
+      ph(Qt::NoScrollPhase), src(Qt::MouseEventNotSynthesized), invertedScrolling(false)
 {
-    if (!QGuiApplicationPrivate::scrollNoPhaseAllowed)
-        ph = Qt::ScrollUpdate;
     if (orient == Qt::Vertical)
         angleD = QPoint(0, delta);
     else
@@ -803,11 +831,8 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
             Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers)
     : QInputEvent(Wheel, modifiers), p(pos), g(globalPos), pixelD(pixelDelta),
       angleD(angleDelta), qt4D(qt4Delta), qt4O(qt4Orientation), mouseState(buttons), ph(Qt::NoScrollPhase),
-      src(Qt::MouseEventNotSynthesized)
-{
-    if (!QGuiApplicationPrivate::scrollNoPhaseAllowed)
-        ph = Qt::ScrollUpdate;
-}
+      src(Qt::MouseEventNotSynthesized), invertedScrolling(false)
+{}
 
 /*!
     Constructs a wheel event object.
@@ -837,15 +862,14 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
             Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase)
     : QInputEvent(Wheel, modifiers), p(pos), g(globalPos), pixelD(pixelDelta),
       angleD(angleDelta), qt4D(qt4Delta), qt4O(qt4Orientation), mouseState(buttons), ph(phase),
-      src(Qt::MouseEventNotSynthesized)
+      src(Qt::MouseEventNotSynthesized), invertedScrolling(false)
 {}
 
 /*!
     Constructs a wheel event object.
 
-    The \a pos provides the location of the mouse cursor
-    within the window. The position in global coordinates is specified
-    by \a globalPos.
+    The \a pos provides the location of the mouse cursor within the window. The
+    position in global coordinates is specified by \a globalPos.
 
     \a pixelDelta contains the scrolling distance in pixels on screen, while
     \a angleDelta contains the wheel rotation distance. \a pixelDelta is
@@ -873,7 +897,49 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
             QPoint pixelDelta, QPoint angleDelta, int qt4Delta, Qt::Orientation qt4Orientation,
             Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase, Qt::MouseEventSource source)
     : QInputEvent(Wheel, modifiers), p(pos), g(globalPos), pixelD(pixelDelta),
-      angleD(angleDelta), qt4D(qt4Delta), qt4O(qt4Orientation), mouseState(buttons), ph(phase), src(source)
+      angleD(angleDelta), qt4D(qt4Delta), qt4O(qt4Orientation), mouseState(buttons), ph(phase), src(source),
+      invertedScrolling(false)
+{}
+
+/*!
+    Constructs a wheel event object.
+
+    The \a pos provides the location of the mouse cursor
+    within the window. The position in global coordinates is specified
+    by \a globalPos.
+
+    \a pixelDelta contains the scrolling distance in pixels on screen, while
+    \a angleDelta contains the wheel rotation distance. \a pixelDelta is
+    optional and can be null.
+
+    The mouse and keyboard states at the time of the event are specified by
+    \a buttons and \a modifiers.
+
+    For backwards compatibility, the event can also hold monodirectional wheel
+    event data: \a qt4Delta specifies the rotation, and \a qt4Orientation the
+    direction.
+
+    The scrolling phase of the event is specified by \a phase.
+
+    If the wheel event comes from a physical mouse wheel, \a source is set to
+    Qt::MouseEventNotSynthesized. If it comes from a gesture detected by the
+    operating system, or from a non-mouse hardware device, such that \a
+    pixelDelta is directly related to finger movement, \a source is set to
+    Qt::MouseEventSynthesizedBySystem. If it comes from Qt, source would be set
+    to Qt::MouseEventSynthesizedByQt.
+
+    If the system is configured to invert the delta values delivered with the
+    event (such as natural scrolling of the touchpad on OS X), \a inverted
+    should be \c true. Otherwise, \a inverted is \c false
+
+    \sa posF(), globalPosF(), angleDelta(), pixelDelta(), phase()
+*/
+QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
+            QPoint pixelDelta, QPoint angleDelta, int qt4Delta, Qt::Orientation qt4Orientation,
+            Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase, Qt::MouseEventSource source, bool inverted)
+    : QInputEvent(Wheel, modifiers), p(pos), g(globalPos), pixelD(pixelDelta),
+      angleD(angleDelta), qt4D(qt4Delta), qt4O(qt4Orientation), mouseState(buttons), ph(phase), src(source),
+      invertedScrolling(inverted)
 {}
 
 #endif // QT_NO_WHEELEVENT
@@ -3977,9 +4043,11 @@ QDebug operator<<(QDebug dbg, const QEvent *e)
         QtDebugUtils::formatQEnum(dbg, static_cast<const QApplicationStateChangeEvent *>(e)->applicationState());
         dbg << ')';
         break;
+#  ifndef QT_NO_CONTEXTMENU
     case QEvent::ContextMenu:
         dbg << "QContextMenuEvent(" << static_cast<const QContextMenuEvent *>(e)->pos() << ')';
         break;
+#  endif // !QT_NO_CONTEXTMENU
 #  ifndef QT_NO_TABLETEVENT
     case QEvent::TabletEnterProximity:
     case QEvent::TabletLeaveProximity:
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index b5d2c4d159..570212966f 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -35,20 +41,19 @@
 #define QEVENT_H
 
 #include <QtGui/qwindowdefs.h>
-#include <QtCore/qobject.h>
 #include <QtGui/qregion.h>
 #include <QtCore/qnamespace.h>
 #include <QtCore/qstring.h>
 #include <QtGui/qkeysequence.h>
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qvariant.h>
-#include <QtCore/qmap.h>
+#include <QtCore/qmap.h> // ### Qt 6: Remove
 #include <QtCore/qvector.h>
-#include <QtCore/qset.h>
+#include <QtCore/qset.h> // ### Qt 6: Remove
 #include <QtCore/qurl.h>
-#include <QtCore/qfile.h>
+#include <QtCore/qfile.h> // ### Qt 6: Replace by <qiodevice.h> and forward declare QFile
 #include <QtGui/qvector2d.h>
-#include <QtGui/qtouchdevice.h>
+#include <QtGui/qtouchdevice.h> // ### Qt 6: Replace by forward declaration
 
 QT_BEGIN_NAMESPACE
 
@@ -182,6 +187,9 @@ public:
     QWheelEvent(const QPointF &pos, const QPointF &globalPos, QPoint pixelDelta, QPoint angleDelta,
                 int qt4Delta, Qt::Orientation qt4Orientation, Qt::MouseButtons buttons,
                 Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase, Qt::MouseEventSource source);
+    QWheelEvent(const QPointF &pos, const QPointF &globalPos, QPoint pixelDelta, QPoint angleDelta,
+                int qt4Delta, Qt::Orientation qt4Orientation, Qt::MouseButtons buttons,
+                Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase, Qt::MouseEventSource source, bool inverted);
     ~QWheelEvent();
 
 
@@ -205,6 +213,7 @@ public:
     inline Qt::MouseButtons buttons() const { return mouseState; }
 
     inline Qt::ScrollPhase phase() const { return Qt::ScrollPhase(ph); }
+    inline bool inverted() const { return invertedScrolling; }
 
     Qt::MouseEventSource source() const { return Qt::MouseEventSource(src); }
 
@@ -218,7 +227,8 @@ protected:
     Qt::MouseButtons mouseState;
     uint ph : 2;
     uint src: 2;
-    int reserved : 28;
+    bool invertedScrolling : 1;
+    int reserved : 27;
 
     friend class QApplication;
 };
@@ -570,8 +580,10 @@ private:
         Qt::InputMethodQuery query;
         QVariant value;
     };
+    friend QTypeInfo<QueryPair>;
     QVector<QueryPair> m_values;
 };
+Q_DECLARE_TYPEINFO(QInputMethodQueryEvent::QueryPair, Q_MOVABLE_TYPE);
 
 #endif // QT_NO_INPUTMETHOD
 
@@ -911,6 +923,9 @@ protected:
     friend class QGuiApplicationPrivate;
     friend class QApplication;
     friend class QApplicationPrivate;
+#ifndef QT_NO_GRAPHICSVIEW
+    friend class QGraphicsScenePrivate; // direct access to _touchPoints
+#endif
 };
 Q_DECLARE_TYPEINFO(QTouchEvent::TouchPoint, Q_MOVABLE_TYPE);
 Q_DECLARE_OPERATORS_FOR_FLAGS(QTouchEvent::TouchPoint::InfoFlags)
diff --git a/src/gui/kernel/qevent_p.h b/src/gui/kernel/qevent_p.h
index 685b948e12..726aa05d36 100644
--- a/src/gui/kernel/qevent_p.h
+++ b/src/gui/kernel/qevent_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qgenericplugin.cpp b/src/gui/kernel/qgenericplugin.cpp
index 47f3ea5811..a53b60b008 100644
--- a/src/gui/kernel/qgenericplugin.cpp
+++ b/src/gui/kernel/qgenericplugin.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -33,8 +39,6 @@
 
 #include "qgenericplugin.h"
 
-#ifndef QT_NO_LIBRARY
-
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -90,5 +94,3 @@ QGenericPlugin::~QGenericPlugin()
 */
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_LIBRARY
diff --git a/src/gui/kernel/qgenericplugin.h b/src/gui/kernel/qgenericplugin.h
index 03c1df7fba..7f1a493861 100644
--- a/src/gui/kernel/qgenericplugin.h
+++ b/src/gui/kernel/qgenericplugin.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -39,9 +45,6 @@
 
 QT_BEGIN_NAMESPACE
 
-
-#ifndef QT_NO_LIBRARY
-
 #define QGenericPluginFactoryInterface_iid "org.qt-project.Qt.QGenericPluginFactoryInterface"
 
 class Q_GUI_EXPORT QGenericPlugin : public QObject
@@ -54,8 +57,6 @@ public:
     virtual QObject* create(const QString& name, const QString &spec) = 0;
 };
 
-#endif // QT_NO_LIBRARY
-
 QT_END_NAMESPACE
 
 #endif // QGENERICPLUGIN_H
diff --git a/src/gui/kernel/qgenericpluginfactory.cpp b/src/gui/kernel/qgenericpluginfactory.cpp
index d7b9bfba06..9f41b948c0 100644
--- a/src/gui/kernel/qgenericpluginfactory.cpp
+++ b/src/gui/kernel/qgenericpluginfactory.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -40,16 +46,10 @@
 
 QT_BEGIN_NAMESPACE
 
-#if !defined(Q_OS_WIN32) || defined(QT_SHARED)
-#ifndef QT_NO_LIBRARY
-
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QGenericPluginFactoryInterface_iid,
      QLatin1String("/generic"), Qt::CaseInsensitive))
 
-#endif //QT_NO_LIBRARY
-#endif //QT_SHARED
-
 /*!
     \class QGenericPluginFactory
     \ingroup plugins
@@ -69,15 +69,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
 */
 QObject *QGenericPluginFactory::create(const QString& key, const QString &specification)
 {
-#if (!defined(Q_OS_WIN32) || defined(QT_SHARED)) && !defined(QT_NO_LIBRARY)
-    const QString driver = key.toLower();
-    if (QObject *object = qLoadPlugin1<QObject, QGenericPlugin>(loader(), driver, specification))
-        return object;
-#else // (!Q_OS_WIN32 || QT_SHARED) && !QT_NO_LIBRARY
-    Q_UNUSED(key)
-    Q_UNUSED(specification)
-#endif
-    return 0;
+    return qLoadPlugin<QObject, QGenericPlugin>(loader(), key.toLower(), specification);
 }
 
 /*!
@@ -89,8 +81,6 @@ QStringList QGenericPluginFactory::keys()
 {
     QStringList list;
 
-#if !defined(Q_OS_WIN32) || defined(QT_SHARED)
-#ifndef QT_NO_LIBRARY
     typedef QMultiMap<int, QString> PluginKeyMap;
     typedef PluginKeyMap::const_iterator PluginKeyMapConstIterator;
 
@@ -99,8 +89,6 @@ QStringList QGenericPluginFactory::keys()
     for (PluginKeyMapConstIterator it = keyMap.constBegin(); it != cend; ++it)
         if (!list.contains(it.value()))
             list += it.value();
-#endif //QT_NO_LIBRARY
-#endif
     return list;
 }
 
diff --git a/src/gui/kernel/qgenericpluginfactory.h b/src/gui/kernel/qgenericpluginfactory.h
index f5bfe22042..282f3fed6d 100644
--- a/src/gui/kernel/qgenericpluginfactory.h
+++ b/src/gui/kernel/qgenericpluginfactory.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 9cbcd714ab..353b623a3b 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2016 Intel Corporation.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -37,6 +44,7 @@
 #include <qpa/qplatformintegrationfactory_p.h>
 #include "private/qevent_p.h"
 #include "qfont.h"
+#include "qtouchdevice.h"
 #include <qpa/qplatformfontdatabase.h>
 #include <qpa/qplatformwindow.h>
 #include <qpa/qplatformnativeinterface.h>
@@ -123,8 +131,6 @@ Qt::KeyboardModifiers QGuiApplicationPrivate::modifier_buttons = Qt::NoModifier;
 
 QPointF QGuiApplicationPrivate::lastCursorPosition(qInf(), qInf());
 
-Qt::MouseButtons QGuiApplicationPrivate::tabletState = Qt::NoButton;
-QWindow *QGuiApplicationPrivate::tabletPressTarget = 0;
 QWindow *QGuiApplicationPrivate::currentMouseWindow = 0;
 
 QString QGuiApplicationPrivate::styleOverride;
@@ -133,6 +139,8 @@ Qt::ApplicationState QGuiApplicationPrivate::applicationState = Qt::ApplicationI
 
 bool QGuiApplicationPrivate::highDpiScalingUpdated = false;
 
+QVector<QGuiApplicationPrivate::TabletPointData> QGuiApplicationPrivate::tabletDevicePoints;
+
 QPlatformIntegration *QGuiApplicationPrivate::platform_integration = 0;
 QPlatformTheme *QGuiApplicationPrivate::platform_theme = 0;
 
@@ -154,6 +162,7 @@ QIcon *QGuiApplicationPrivate::app_icon = 0;
 
 QString *QGuiApplicationPrivate::platform_name = 0;
 QString *QGuiApplicationPrivate::displayName = 0;
+QString *QGuiApplicationPrivate::desktopFileName = 0;
 
 QPalette *QGuiApplicationPrivate::app_pal = 0;        // default application palette
 
@@ -190,9 +199,6 @@ bool QGuiApplicationPrivate::obey_desktop_settings = true;
 
 QInputDeviceManager *QGuiApplicationPrivate::m_inputDeviceManager = 0;
 
-// enable the fix for QTBUG-50199; TODO remove this check in 5.7
-bool QGuiApplicationPrivate::scrollNoPhaseAllowed = false;
-
 static qreal fontSmoothingGamma = 1.7;
 
 extern void qRegisterGuiVariant();
@@ -618,6 +624,8 @@ QGuiApplication::~QGuiApplication()
     QGuiApplicationPrivate::displayName = 0;
     delete QGuiApplicationPrivate::m_inputDeviceManager;
     QGuiApplicationPrivate::m_inputDeviceManager = 0;
+    delete QGuiApplicationPrivate::desktopFileName;
+    QGuiApplicationPrivate::desktopFileName = 0;
 }
 
 QGuiApplicationPrivate::QGuiApplicationPrivate(int &argc, char **argv, int flags)
@@ -659,6 +667,34 @@ QString QGuiApplication::applicationDisplayName()
 }
 
 /*!
+    \property QGuiApplication::desktopFileName
+    \brief the base name of the desktop entry for this application
+    \since 5.7
+
+    This is the file name, without the full path, of the desktop entry
+    that represents this application according to the freedesktop desktop
+    entry specification.
+
+    This property gives a precise indication of what desktop entry represents
+    the application and it is needed by the windowing system to retrieve
+    such information without resorting to imprecise heuristics.
+
+    The latest version of the freedesktop desktop entry specification can be obtained
+    \l{http://standards.freedesktop.org/desktop-entry-spec/latest/}{here}.
+*/
+void QGuiApplication::setDesktopFileName(const QString &name)
+{
+    if (!QGuiApplicationPrivate::desktopFileName)
+        QGuiApplicationPrivate::desktopFileName = new QString;
+    *QGuiApplicationPrivate::desktopFileName = name;
+}
+
+QString QGuiApplication::desktopFileName()
+{
+    return QGuiApplicationPrivate::desktopFileName ? *QGuiApplicationPrivate::desktopFileName : QString();
+}
+
+/*!
     Returns the most recently shown modal window. If no modal windows are
     visible, this function returns zero.
 
@@ -687,9 +723,10 @@ static void updateBlockedStatusRecursion(QWindow *window, bool shouldBeBlocked)
         p->blockedByModalWindow = shouldBeBlocked;
         QEvent e(shouldBeBlocked ? QEvent::WindowBlocked : QEvent::WindowUnblocked);
         QGuiApplication::sendEvent(window, &e);
-        foreach (QObject *c, window->children())
+        for (QObject *c : window->children()) {
             if (c->isWindowType())
                 updateBlockedStatusRecursion(static_cast<QWindow *>(c), shouldBeBlocked);
+        }
     }
 }
 
@@ -958,9 +995,8 @@ qreal QGuiApplication::devicePixelRatio() const
     }
 
     topDevicePixelRatio = 1.0; // make sure we never return 0.
-    foreach (QScreen *screen, QGuiApplicationPrivate::screen_list) {
+    for (QScreen *screen : qAsConst(QGuiApplicationPrivate::screen_list))
         topDevicePixelRatio = qMax(topDevicePixelRatio, screen->devicePixelRatio());
-    }
 
     return topDevicePixelRatio;
 }
@@ -976,7 +1012,7 @@ QWindow *QGuiApplication::topLevelAt(const QPoint &pos)
         QScreen *windowScreen = Q_NULLPTR;
 
         // Find the window on the primary virtual desktop first
-        foreach (QScreen *screen, primaryScreens) {
+        for (QScreen *screen : primaryScreens) {
             if (screen->geometry().contains(pos)) {
                 windowScreen = screen;
                 break;
@@ -988,7 +1024,7 @@ QWindow *QGuiApplication::topLevelAt(const QPoint &pos)
         // may repeat. Find only when there is more than one virtual desktop.
         if (!windowScreen && screens.count() != primaryScreens.count()) {
             for (int i = 1; i < screens.size(); ++i) {
-                QScreen *screen = screens[i];
+                QScreen *screen = screens.at(i);
                 if (screen->geometry().contains(pos)) {
                     windowScreen = screen;
                     break;
@@ -1056,9 +1092,7 @@ static void init_platform(const QString &pluginArgument, const QString &platform
 
    // Create the platform integration.
     QGuiApplicationPrivate::platform_integration = QPlatformIntegrationFactory::create(name, arguments, argc, argv, platformPluginPath);
-    if (QGuiApplicationPrivate::platform_integration) {
-        QGuiApplicationPrivate::platform_name = new QString(name);
-    } else {
+    if (Q_UNLIKELY(!QGuiApplicationPrivate::platform_integration)) {
         QStringList keys = QPlatformIntegrationFactory::keys(platformPluginPath);
 
         QString fatalMessage
@@ -1078,6 +1112,8 @@ static void init_platform(const QString &pluginArgument, const QString &platform
         return;
     }
 
+    QGuiApplicationPrivate::platform_name = new QString(name);
+
     // Many platforms have created QScreens at this point. Finish initializing
     // QHighDpiScaling to be prepared for early calls to qt_defaultDpi().
     if (QGuiApplication::primaryScreen()) {
@@ -1095,7 +1131,7 @@ static void init_platform(const QString &pluginArgument, const QString &platform
     // 2) Ask the platform integration for a list of theme names
     themeNames += QGuiApplicationPrivate::platform_integration->themeNames();
     // 3) Look for a theme plugin.
-    foreach (const QString &themeName, themeNames) {
+    for (const QString &themeName : qAsConst(themeNames)) {
         QGuiApplicationPrivate::platform_theme = QPlatformThemeFactory::create(themeName, platformPluginPath);
         if (QGuiApplicationPrivate::platform_theme)
             break;
@@ -1104,7 +1140,7 @@ static void init_platform(const QString &pluginArgument, const QString &platform
     // 4) If no theme plugin was found ask the platform integration to
     // create a theme
     if (!QGuiApplicationPrivate::platform_theme) {
-        foreach (const QString &themeName, themeNames) {
+        for (const QString &themeName : qAsConst(themeNames)) {
             QGuiApplicationPrivate::platform_theme = QGuiApplicationPrivate::platform_integration->createPlatformTheme(themeName);
             if (QGuiApplicationPrivate::platform_theme)
                 break;
@@ -1121,7 +1157,7 @@ static void init_platform(const QString &pluginArgument, const QString &platform
     // boolean 'foo' or strings: 'foo=bar'
     if (!arguments.isEmpty()) {
         if (QObject *nativeInterface = QGuiApplicationPrivate::platform_integration->nativeInterface()) {
-            foreach (const QString &argument, arguments) {
+            for (const QString &argument : qAsConst(arguments)) {
                 const int equalsPos = argument.indexOf(QLatin1Char('='));
                 const QByteArray name =
                     equalsPos != -1 ? argument.left(equalsPos).toUtf8() : argument.toUtf8();
@@ -1156,12 +1192,6 @@ static void init_plugins(const QList<QByteArray> &pluginList)
 
 void QGuiApplicationPrivate::createPlatformIntegration()
 {
-    // Use the Qt menus by default. Platform plugins that
-    // want to enable a native menu implementation can clear
-    // this flag.
-    QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true);
-
-
     QHighDpiScaling::initHighDpiScaling();
 
     // Load the platform integration
@@ -1330,9 +1360,9 @@ void QGuiApplicationPrivate::init()
         } else if (strcmp(arg, "-testability") == 0) {
             loadTestability = true;
         } else if (strncmp(arg, "-style=", 7) == 0) {
-            s = QString::fromLocal8Bit(arg + 7).toLower();
+            s = QString::fromLocal8Bit(arg + 7);
         } else if (strcmp(arg, "-style") == 0 && i < argc - 1) {
-            s = QString::fromLocal8Bit(argv[++i]).toLower();
+            s = QString::fromLocal8Bit(argv[++i]);
         } else {
             argv[j++] = argv[i];
         }
@@ -1348,10 +1378,8 @@ void QGuiApplicationPrivate::init()
 
     // Load environment exported generic plugins
     QByteArray envPlugins = qgetenv("QT_QPA_GENERIC_PLUGINS");
-    if (!envPlugins.isEmpty()) {
-        foreach (const QByteArray &plugin, envPlugins.split(','))
-            pluginList << plugin;
-    }
+    if (!envPlugins.isEmpty())
+        pluginList += envPlugins.split(',');
 
     if (platform_integration == 0)
         createPlatformIntegration();
@@ -1403,16 +1431,16 @@ void QGuiApplicationPrivate::init()
 
     if (loadTestability) {
         QLibrary testLib(QStringLiteral("qttestability"));
-        if (testLib.load()) {
+        if (Q_UNLIKELY(!testLib.load())) {
+            qCritical() << "Library qttestability load failed:" << testLib.errorString();
+        } else {
             typedef void (*TasInitialize)(void);
             TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
-            if (initFunction) {
-                initFunction();
+            if (Q_UNLIKELY(!initFunction)) {
+                qCritical("Library qttestability resolve failed!");
             } else {
-                qCritical() << "Library qttestability resolve failed!";
+                initFunction();
             }
-        } else {
-            qCritical() << "Library qttestability load failed:" << testLib.errorString();
         }
     }
 #else
@@ -1421,8 +1449,6 @@ void QGuiApplicationPrivate::init()
 
     if (layout_direction == Qt::LayoutDirectionAuto || force_reverse)
         QGuiApplication::setLayoutDirection(qt_detectRTLLanguage() ? Qt::RightToLeft : Qt::LeftToRight);
-
-    scrollNoPhaseAllowed = qEnvironmentVariableIsSet("QT_ENABLE_MOUSE_WHEEL_TRACKING");
 }
 
 extern void qt_cleanupFontDatabase();
@@ -1569,7 +1595,7 @@ QFunctionPointer QGuiApplication::platformFunction(const QByteArray &function)
 {
     QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
     if (!pi) {
-        qWarning() << "QGuiApplication::platformFunction(): Must construct a QGuiApplication before accessing a platform function";
+        qWarning("QGuiApplication::platformFunction(): Must construct a QGuiApplication before accessing a platform function");
         return Q_NULLPTR;
     }
 
@@ -1948,7 +1974,8 @@ void QGuiApplicationPrivate::processWheelEvent(QWindowSystemInterfacePrivate::Wh
         return;
     }
 
-     QWheelEvent ev(localPoint, globalPoint, e->pixelDelta, e->angleDelta, e->qt4Delta, e->qt4Orientation, buttons, e->modifiers, e->phase, e->source);
+     QWheelEvent ev(localPoint, globalPoint, e->pixelDelta, e->angleDelta, e->qt4Delta, e->qt4Orientation,
+                    buttons, e->modifiers, e->phase, e->source, e->inverted);
      ev.setTimestamp(e->timestamp);
      QGuiApplication::sendSpontaneousEvent(window, &ev);
 #endif /* ifndef QT_NO_WHEELEVENT */
@@ -1961,7 +1988,7 @@ void QGuiApplicationPrivate::processKeyEvent(QWindowSystemInterfacePrivate::KeyE
     QWindow *window = e->window.data();
     modifier_buttons = e->modifiers;
     if (e->nullWindow()
-#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
+#if defined(Q_OS_ANDROID)
            || e->key == Qt::Key_Back || e->key == Qt::Key_Menu
 #endif
             ) {
@@ -1987,7 +2014,7 @@ void QGuiApplicationPrivate::processKeyEvent(QWindowSystemInterfacePrivate::KeyE
 
     if (window && !window->d_func()->blockedByModalWindow)
         QGuiApplication::sendSpontaneousEvent(window, &ev);
-#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
+#if defined(Q_OS_ANDROID)
     else
         ev.setAccepted(false);
 
@@ -2204,12 +2231,26 @@ void QGuiApplicationPrivate::processFileOpenEvent(QWindowSystemInterfacePrivate:
     QGuiApplication::sendSpontaneousEvent(qApp, &event);
 }
 
+QGuiApplicationPrivate::TabletPointData &QGuiApplicationPrivate::tabletDevicePoint(qint64 deviceId)
+{
+    for (int i = 0; i < tabletDevicePoints.size(); ++i) {
+        TabletPointData &pointData = tabletDevicePoints[i];
+        if (pointData.deviceId == deviceId)
+            return pointData;
+    }
+
+    tabletDevicePoints.append(TabletPointData(deviceId));
+    return tabletDevicePoints.last();
+}
+
 void QGuiApplicationPrivate::processTabletEvent(QWindowSystemInterfacePrivate::TabletEvent *e)
 {
 #ifndef QT_NO_TABLETEVENT
+    TabletPointData &pointData = tabletDevicePoint(e->uid);
+
     QEvent::Type type = QEvent::TabletMove;
-    if (e->buttons != tabletState)
-        type = (e->buttons > tabletState) ? QEvent::TabletPress : QEvent::TabletRelease;
+    if (e->buttons != pointData.state)
+        type = (e->buttons > pointData.state) ? QEvent::TabletPress : QEvent::TabletRelease;
 
     QWindow *window = e->window.data();
     modifier_buttons = e->modifiers;
@@ -2225,14 +2266,14 @@ void QGuiApplicationPrivate::processTabletEvent(QWindowSystemInterfacePrivate::T
         }
         if (!window)
             return;
-        tabletPressTarget = window;
+        pointData.target = window;
     } else {
         if (e->nullWindow()) {
-            window = tabletPressTarget;
+            window = pointData.target;
             localValid = false;
         }
         if (type == QEvent::TabletRelease)
-            tabletPressTarget = 0;
+            pointData.target = Q_NULLPTR;
         if (!window)
             return;
     }
@@ -2241,7 +2282,7 @@ void QGuiApplicationPrivate::processTabletEvent(QWindowSystemInterfacePrivate::T
         QPointF delta = e->global - e->global.toPoint();
         local = window->mapFromGlobal(e->global.toPoint()) + delta;
     }
-    Qt::MouseButtons stateChange = e->buttons ^ tabletState;
+    Qt::MouseButtons stateChange = e->buttons ^ pointData.state;
     Qt::MouseButton button = Qt::NoButton;
     for (int check = Qt::LeftButton; check <= int(Qt::MaxMouseButton); check = check << 1) {
         if (check & stateChange) {
@@ -2253,9 +2294,17 @@ void QGuiApplicationPrivate::processTabletEvent(QWindowSystemInterfacePrivate::T
                     e->device, e->pointerType, e->pressure, e->xTilt, e->yTilt,
                     e->tangentialPressure, e->rotation, e->z,
                     e->modifiers, e->uid, button, e->buttons);
+    ev.setAccepted(false);
     ev.setTimestamp(e->timestamp);
     QGuiApplication::sendSpontaneousEvent(window, &ev);
-    tabletState = e->buttons;
+    pointData.state = e->buttons;
+    if (!ev.isAccepted() && !QWindowSystemInterfacePrivate::TabletEvent::platformSynthesizesMouse
+            && qApp->testAttribute(Qt::AA_SynthesizeMouseForUnhandledTabletEvents)) {
+        QWindowSystemInterfacePrivate::MouseEvent fake(window, e->timestamp, e->local, e->global,
+                                                       e->buttons, e->modifiers, Qt::MouseEventSynthesizedByQt);
+        fake.flags |= QWindowSystemInterfacePrivate::WindowSystemEvent::Synthetic;
+        processMouseEvent(&fake);
+    }
 #else
     Q_UNUSED(e)
 #endif
@@ -2267,7 +2316,7 @@ void QGuiApplicationPrivate::processTabletEnterProximityEvent(QWindowSystemInter
     QTabletEvent ev(QEvent::TabletEnterProximity, QPointF(), QPointF(),
                     e->device, e->pointerType, 0, 0, 0,
                     0, 0, 0,
-                    Qt::NoModifier, e->uid, Qt::NoButton, tabletState);
+                    Qt::NoModifier, e->uid, Qt::NoButton, tabletDevicePoint(e->uid).state);
     ev.setTimestamp(e->timestamp);
     QGuiApplication::sendSpontaneousEvent(qGuiApp, &ev);
 #else
@@ -2281,7 +2330,7 @@ void QGuiApplicationPrivate::processTabletLeaveProximityEvent(QWindowSystemInter
     QTabletEvent ev(QEvent::TabletLeaveProximity, QPointF(), QPointF(),
                     e->device, e->pointerType, 0, 0, 0,
                     0, 0, 0,
-                    Qt::NoModifier, e->uid, Qt::NoButton, tabletState);
+                    Qt::NoModifier, e->uid, Qt::NoButton, tabletDevicePoint(e->uid).state);
     ev.setTimestamp(e->timestamp);
     QGuiApplication::sendSpontaneousEvent(qGuiApp, &ev);
 #else
@@ -2562,7 +2611,7 @@ void QGuiApplicationPrivate::processTouchEvent(QWindowSystemInterfacePrivate::To
                 if (b == Qt::NoButton)
                     self->synthesizedMousePoints.clear();
 
-                QList<QTouchEvent::TouchPoint> touchPoints = touchEvent.touchPoints();
+                const QList<QTouchEvent::TouchPoint> &touchPoints = touchEvent.touchPoints();
                 if (eventType == QEvent::TouchBegin)
                     m_fakeMouseSourcePointId = touchPoints.first().id();
 
@@ -2672,7 +2721,8 @@ void QGuiApplicationPrivate::reportGeometryChange(QWindowSystemInterfacePrivate:
         emit s->availableGeometryChanged(s->availableGeometry());
 
     if (geometryChanged || availableGeometryChanged) {
-        foreach (QScreen* sibling, s->virtualSiblings())
+        const auto siblings = s->virtualSiblings();
+        for (QScreen* sibling : siblings)
             emit sibling->virtualGeometryChanged(sibling->virtualGeometry());
     }
 }
@@ -3623,7 +3673,7 @@ void QGuiApplicationPrivate::_q_updateFocusObject(QObject *object)
     emit q->focusObjectChanged(object);
 }
 
-enum {
+enum MouseMasks {
     MouseCapsMask = 0xFF,
     MouseSourceMaskDst = 0xFF00,
     MouseSourceMaskSrc = MouseCapsMask,
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index 3f233d4eda..10057c5b7f 100644
--- a/src/gui/kernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -67,6 +73,7 @@ class Q_GUI_EXPORT QGuiApplication : public QCoreApplication
     Q_OBJECT
     Q_PROPERTY(QIcon windowIcon READ windowIcon WRITE setWindowIcon)
     Q_PROPERTY(QString applicationDisplayName READ applicationDisplayName WRITE setApplicationDisplayName)
+    Q_PROPERTY(QString desktopFileName READ desktopFileName WRITE setDesktopFileName)
     Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged)
     Q_PROPERTY(QString platformName READ platformName STORED false)
     Q_PROPERTY(bool quitOnLastWindowClosed  READ quitOnLastWindowClosed WRITE setQuitOnLastWindowClosed)
@@ -83,6 +90,9 @@ public:
     static void setApplicationDisplayName(const QString &name);
     static QString applicationDisplayName();
 
+    static void setDesktopFileName(const QString &name);
+    static QString desktopFileName();
+
     static QWindowList allWindows();
     static QWindowList topLevelWindows();
     static QWindow *topLevelAt(const QPoint &pos);
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index 306d76c5f0..a028441a2f 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -185,6 +191,7 @@ public:
     static QIcon *app_icon;
     static QString *platform_name;
     static QString *displayName;
+    static QString *desktopFileName;
 
     QWindowList modalWindowList;
     static void showModalWindow(QWindow *window);
@@ -199,13 +206,20 @@ public:
     static int mousePressY;
     static int mouse_double_click_distance;
     static QPointF lastCursorPosition;
-    static Qt::MouseButtons tabletState;
-    static QWindow *tabletPressTarget;
     static QWindow *currentMouseWindow;
     static QWindow *currentMousePressWindow;
     static Qt::ApplicationState applicationState;
     static bool highDpiScalingUpdated;
 
+    struct TabletPointData {
+        TabletPointData(qint64 devId = 0) : deviceId(devId), state(Qt::NoButton), target(Q_NULLPTR) {}
+        qint64 deviceId;
+        Qt::MouseButtons state;
+        QWindow *target;
+    };
+    static QVector<TabletPointData> tabletDevicePoints;
+    static TabletPointData &tabletDevicePoint(qint64 deviceId);
+
 #ifndef QT_NO_CLIPBOARD
     static QClipboard *qt_clipboard;
 #endif
@@ -288,9 +302,6 @@ public:
 
     static void setApplicationState(Qt::ApplicationState state, bool forcePropagate = false);
 
-    // enable the fix for QTBUG-50199; TODO remove this check in 5.7
-    static bool scrollNoPhaseAllowed;
-
 protected:
     virtual void notifyThemeChanged();
     bool tryCloseRemainingWindows(QWindowList processedWindows);
diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp
index a0769ca671..4ae4b209ca 100644
--- a/src/gui/kernel/qguivariant.cpp
+++ b/src/gui/kernel/qguivariant.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp
index 6846196719..fccd81f8e8 100644
--- a/src/gui/kernel/qhighdpiscaling.cpp
+++ b/src/gui/kernel/qhighdpiscaling.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -261,7 +267,8 @@ void QHighDpiScaling::updateHighDpiScaling()
         return;
 
     if (m_usePixelDensity && !m_pixelDensityScalingActive) {
-        Q_FOREACH (QScreen *screen, QGuiApplication::screens()) {
+        const auto screens = QGuiApplication::screens();
+        for (QScreen *screen : screens) {
             if (!qFuzzyCompare(screenSubfactor(screen->handle()), qreal(1))) {
                 m_pixelDensityScalingActive = true;
                 break;
@@ -270,7 +277,8 @@ void QHighDpiScaling::updateHighDpiScaling()
     }
     if (qEnvironmentVariableIsSet(screenFactorsEnvVar)) {
         int i = 0;
-        Q_FOREACH (const QByteArray &spec, qgetenv(screenFactorsEnvVar).split(';')) {
+        const auto specs = qgetenv(screenFactorsEnvVar).split(';');
+        for (const QByteArray &spec : specs) {
             QScreen *screen = 0;
             int equalsPos = spec.lastIndexOf('=');
             double factor = 0;
@@ -281,7 +289,8 @@ void QHighDpiScaling::updateHighDpiScaling()
                 bool ok;
                 factor = f.toDouble(&ok);
                 if (ok) {
-                    Q_FOREACH (QScreen *s, QGuiApplication::screens()) {
+                    const auto screens = QGuiApplication::screens();
+                    for (QScreen *s : screens) {
                         if (s->name() == QString::fromLocal8Bit(name)) {
                             screen = s;
                             break;
@@ -321,7 +330,8 @@ void QHighDpiScaling::setGlobalFactor(qreal factor)
     m_globalScalingActive = !qFuzzyCompare(factor, qreal(1));
     m_factor = m_globalScalingActive ? factor : qreal(1);
     m_active = m_globalScalingActive || m_screenFactorSet || m_pixelDensityScalingActive;
-    Q_FOREACH (QScreen *screen, QGuiApplication::screens())
+    const auto screens = QGuiApplication::screens();
+    for (QScreen *screen : screens)
          screen->d_func()->updateHighDpi();
 }
 
diff --git a/src/gui/kernel/qhighdpiscaling_p.h b/src/gui/kernel/qhighdpiscaling_p.h
index a7b80982af..eb3a9d5545 100644
--- a/src/gui/kernel/qhighdpiscaling_p.h
+++ b/src/gui/kernel/qhighdpiscaling_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -376,7 +382,8 @@ inline QRegion fromNativeLocalRegion(const QRegion &pixelRegion, const QWindow *
 
     qreal scaleFactor = QHighDpiScaling::factor(window);
     QRegion pointRegion;
-    foreach (const QRect &rect, pixelRegion.rects()) {
+    const auto rects = pixelRegion.rects();
+    for (const QRect &rect : rects) {
         pointRegion += QRect(fromNative(rect.topLeft(), scaleFactor),
                              fromNative(rect.size(), scaleFactor));
     }
@@ -408,7 +415,8 @@ inline QRegion toNativeLocalRegion(const QRegion &pointRegion, const QWindow *wi
 
     qreal scaleFactor = QHighDpiScaling::factor(window);
     QRegion pixelRegon;
-    foreach (const QRect &rect, pointRegion.rects()) {
+    const auto rects = pointRegion.rects();
+    for (const QRect &rect : rects) {
         pixelRegon += QRect(toNative(rect.topLeft(), scaleFactor),
                              toNative(rect.size(), scaleFactor));
     }
@@ -465,8 +473,10 @@ QVector<T> fromNativePixels(const QVector<T> &pixelValues, const QWindow *window
         return pixelValues;
 
     QVector<T> pointValues;
-    foreach (const T& pixelValue, pixelValues)
-        pointValues.append(pixelValue / QHighDpiScaling::factor(window));
+    pointValues.reserve(pixelValues.size());
+    const auto factor = QHighDpiScaling::factor(window);
+    for (const T &pixelValue : pixelValues)
+        pointValues.append(pixelValue / factor);
     return pointValues;
 }
 
@@ -478,8 +488,10 @@ QVector<T> toNativePixels(const QVector<T> &pointValues, const QWindow *window)
         return pointValues;
 
     QVector<T> pixelValues;
-    foreach (const T& pointValue, pointValues)
-        pixelValues.append(pointValue * QHighDpiScaling::factor(window));
+    pixelValues.reserve(pointValues.size());
+    const auto factor = QHighDpiScaling::factor(window);
+    for (const T &pointValue : pointValues)
+        pixelValues.append(pointValue * factor);
     return pixelValues;
 }
 
diff --git a/src/gui/kernel/qinputdevicemanager.cpp b/src/gui/kernel/qinputdevicemanager.cpp
index dbdb03adbb..2d231ae26f 100644
--- a/src/gui/kernel/qinputdevicemanager.cpp
+++ b/src/gui/kernel/qinputdevicemanager.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qinputdevicemanager_p.h b/src/gui/kernel/qinputdevicemanager_p.h
index d64793c23c..1cf0443834 100644
--- a/src/gui/kernel/qinputdevicemanager_p.h
+++ b/src/gui/kernel/qinputdevicemanager_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -61,7 +67,8 @@ public:
         DeviceTypeUnknown,
         DeviceTypePointer,
         DeviceTypeKeyboard,
-        DeviceTypeTouch
+        DeviceTypeTouch,
+        DeviceTypeTablet
     };
 
     QInputDeviceManager(QObject *parent = 0);
diff --git a/src/gui/kernel/qinputdevicemanager_p_p.h b/src/gui/kernel/qinputdevicemanager_p_p.h
index d6cb817d88..45d8b64172 100644
--- a/src/gui/kernel/qinputdevicemanager_p_p.h
+++ b/src/gui/kernel/qinputdevicemanager_p_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qinputmethod.cpp b/src/gui/kernel/qinputmethod.cpp
index 2684c43518..365b088840 100644
--- a/src/gui/kernel/qinputmethod.cpp
+++ b/src/gui/kernel/qinputmethod.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -91,6 +97,7 @@ void QInputMethod::setInputItemTransform(const QTransform &transform)
 
     d->inputItemTransform = transform;
     emit cursorRectangleChanged();
+    emit anchorRectangleChanged();
 }
 
 
@@ -120,6 +127,19 @@ void QInputMethod::setInputItemRectangle(const QRectF &rect)
     d->inputRectangle = rect;
 }
 
+static QRectF inputMethodQueryRectangle_helper(Qt::InputMethodQuery imquery, const QTransform &xform)
+{
+    QRectF r;
+    if (QObject *focusObject = qGuiApp->focusObject()) {
+        QInputMethodQueryEvent query(imquery);
+        QGuiApplication::sendEvent(focusObject, &query);
+        r = query.value(imquery).toRectF();
+        if (r.isValid())
+            r = xform.mapRect(r);
+    }
+    return r;
+}
+
 /*!
     \property QInputMethod::cursorRectangle
     \brief Input item's cursor rectangle in window coordinates.
@@ -130,18 +150,20 @@ void QInputMethod::setInputItemRectangle(const QRectF &rect)
 QRectF QInputMethod::cursorRectangle() const
 {
     Q_D(const QInputMethod);
+    return inputMethodQueryRectangle_helper(Qt::ImCursorRectangle, d->inputItemTransform);
+}
 
-    QObject *focusObject = qGuiApp->focusObject();
-    if (!focusObject)
-        return QRectF();
-
-    QInputMethodQueryEvent query(Qt::ImCursorRectangle);
-    QGuiApplication::sendEvent(focusObject, &query);
-    QRectF r = query.value(Qt::ImCursorRectangle).toRectF();
-    if (!r.isValid())
-        return QRectF();
+/*!
+    \property QInputMethod::anchorRectangle
+    \brief Input item's anchor rectangle in window coordinates.
 
-    return d->inputItemTransform.mapRect(r);
+    Anchor rectangle is often used by various text editing controls
+    like text prediction popups for following the text selection.
+*/
+QRectF QInputMethod::anchorRectangle() const
+{
+    Q_D(const QInputMethod);
+    return inputMethodQueryRectangle_helper(Qt::ImAnchorRectangle, d->inputItemTransform);
 }
 
 /*!
@@ -161,6 +183,18 @@ QRectF QInputMethod::keyboardRectangle() const
 }
 
 /*!
+    \property QInputMethod::inputItemClipRectangle
+    \brief Input item's clipped rectangle in window coordinates.
+
+    The clipped input rectangle is often used by various input methods to determine
+    how much screen real estate is available for the input method (e.g. Virtual Keyboard).
+*/
+QRectF QInputMethod::inputItemClipRectangle() const
+{
+    Q_D(const QInputMethod);
+    return inputMethodQueryRectangle_helper(Qt::ImInputItemClipRectangle, d->inputItemTransform);
+}
+/*!
     Requests virtual keyboard to open. If the platform
     doesn't provide virtual keyboard the visibility
     remains false.
@@ -294,6 +328,12 @@ void QInputMethod::update(Qt::InputMethodQueries queries)
 
     if (queries & Qt::ImCursorRectangle)
         emit cursorRectangleChanged();
+
+    if (queries & (Qt::ImAnchorRectangle))
+        emit anchorRectangleChanged();
+
+    if (queries & (Qt::ImInputItemClipRectangle))
+        emit inputItemClipRectangleChanged();
 }
 
 /*!
diff --git a/src/gui/kernel/qinputmethod.h b/src/gui/kernel/qinputmethod.h
index d7a7b1db8a..1a63d1314e 100644
--- a/src/gui/kernel/qinputmethod.h
+++ b/src/gui/kernel/qinputmethod.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -49,7 +55,9 @@ class Q_GUI_EXPORT QInputMethod : public QObject
     Q_OBJECT
     Q_DECLARE_PRIVATE(QInputMethod)
     Q_PROPERTY(QRectF cursorRectangle READ cursorRectangle NOTIFY cursorRectangleChanged)
+    Q_PROPERTY(QRectF anchorRectangle READ anchorRectangle NOTIFY anchorRectangleChanged)
     Q_PROPERTY(QRectF keyboardRectangle READ keyboardRectangle NOTIFY keyboardRectangleChanged)
+    Q_PROPERTY(QRectF inputItemClipRectangle READ inputItemClipRectangle NOTIFY inputItemClipRectangleChanged)
     Q_PROPERTY(bool visible READ isVisible NOTIFY visibleChanged)
     Q_PROPERTY(bool animating READ isAnimating NOTIFY animatingChanged)
     Q_PROPERTY(QLocale locale READ locale NOTIFY localeChanged)
@@ -64,10 +72,13 @@ public:
 
     // in window coordinates
     QRectF cursorRectangle() const; // ### what if we have rotations for the item?
+    QRectF anchorRectangle() const; // ### ditto
 
     // keyboard geometry in window coords
     QRectF keyboardRectangle() const;
 
+    QRectF inputItemClipRectangle() const;
+
     enum Action {
         Click,
         ContextMenu
@@ -96,7 +107,9 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void cursorRectangleChanged();
+    void anchorRectangleChanged();
     void keyboardRectangleChanged();
+    void inputItemClipRectangleChanged();
     void visibleChanged();
     void animatingChanged();
     void localeChanged();
diff --git a/src/gui/kernel/qinputmethod_p.h b/src/gui/kernel/qinputmethod_p.h
index 0111162e84..3f7cd195ea 100644
--- a/src/gui/kernel/qinputmethod_p.h
+++ b/src/gui/kernel/qinputmethod_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp
index d5da76bdfe..4893b1d57b 100644
--- a/src/gui/kernel/qkeymapper.cpp
+++ b/src/gui/kernel/qkeymapper.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h
index 34003cdf41..59977688e4 100644
--- a/src/gui/kernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index ea71e34e4b..9a75f4bc83 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -1148,21 +1154,22 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
     }
 
     int p = accel.lastIndexOf(QLatin1Char('+'), str.length() - 2); // -2 so that Ctrl++ works
+    QStringRef accelRef(&accel);
     if(p > 0)
-        accel = accel.mid(p + 1);
+        accelRef = accelRef.mid(p + 1);
 
     int fnum = 0;
-    if (accel.length() == 1) {
+    if (accelRef.length() == 1) {
 #if defined(Q_OS_MACX)
-        int qtKey = qtkeyForMacSymbol(accel[0]);
+        int qtKey = qtkeyForMacSymbol(accelRef.at(0));
         if (qtKey != -1) {
             ret |= qtKey;
         } else
 #endif
         {
-            ret |= accel[0].toUpper().unicode();
+            ret |= accelRef.at(0).toUpper().unicode();
         }
-    } else if (accel[0] == QLatin1Char('f') && (fnum = accel.mid(1).toInt()) && (fnum >= 1) && (fnum <= 35)) {
+    } else if (accelRef.at(0) == QLatin1Char('f') && (fnum = accelRef.mid(1).toInt()) >= 1 && fnum <= 35) {
         ret |= Qt::Key_F1 + fnum - 1;
     } else {
         // For NativeText, check the traslation table first,
@@ -1176,7 +1183,7 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
                 QString keyName(tran == 0
                                 ? QCoreApplication::translate("QShortcut", keyname[i].name)
                                 : QString::fromLatin1(keyname[i].name));
-                if (accel == keyName.toLower()) {
+                if (accelRef == keyName.toLower()) {
                     ret |= keyname[i].key;
                     found = true;
                     break;
@@ -1559,9 +1566,9 @@ QList<QKeySequence> QKeySequence::listFromString(const QString &str, SequenceFor
 {
     QList<QKeySequence> result;
 
-    QStringList strings = str.split(QLatin1String("; "));
+    const QStringList strings = str.split(QLatin1String("; "));
     result.reserve(strings.count());
-    foreach (const QString &string, strings) {
+    for (const QString &string : strings) {
         result << fromString(string, format);
     }
 
@@ -1580,7 +1587,7 @@ QString QKeySequence::listToString(const QList<QKeySequence> &list, SequenceForm
 {
     QString result;
 
-    foreach (const QKeySequence &sequence, list) {
+    for (const QKeySequence &sequence : list) {
         result += sequence.toString(format);
         result += QLatin1String("; ");
     }
diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h
index 98a611aab5..3a660b063e 100644
--- a/src/gui/kernel/qkeysequence.h
+++ b/src/gui/kernel/qkeysequence.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qkeysequence_p.h b/src/gui/kernel/qkeysequence_p.h
index 9525a343dc..116e91c0cd 100644
--- a/src/gui/kernel/qkeysequence_p.h
+++ b/src/gui/kernel/qkeysequence_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qoffscreensurface.cpp b/src/gui/kernel/qoffscreensurface.cpp
index 056cc19f69..a9535a6ad7 100644
--- a/src/gui/kernel/qoffscreensurface.cpp
+++ b/src/gui/kernel/qoffscreensurface.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qoffscreensurface.h b/src/gui/kernel/qoffscreensurface.h
index 17bc8a7d17..d639407e1a 100644
--- a/src/gui/kernel/qoffscreensurface.h
+++ b/src/gui/kernel/qoffscreensurface.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp
index 7588c36c9b..0f7bbfd2e1 100644
--- a/src/gui/kernel/qopenglcontext.cpp
+++ b/src/gui/kernel/qopenglcontext.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -649,7 +655,7 @@ void QOpenGLContext::destroy()
     delete d->functions;
     d->functions = 0;
 
-    foreach (QAbstractOpenGLFunctions *func, d->externalVersionFunctions) {
+    for (QAbstractOpenGLFunctions *func : qAsConst(d->externalVersionFunctions)) {
         QAbstractOpenGLFunctionsPrivate *func_d = QAbstractOpenGLFunctionsPrivate::get(func);
         func_d->owningContext = 0;
         func_d->initialized = false;
@@ -657,8 +663,6 @@ void QOpenGLContext::destroy()
     d->externalVersionFunctions.clear();
     qDeleteAll(d->versionFunctions);
     d->versionFunctions.clear();
-    qDeleteAll(d->versionFunctionsBackend);
-    d->versionFunctionsBackend.clear();
 
     delete d->textureFunctions;
     d->textureFunctions = 0;
@@ -950,7 +954,7 @@ bool QOpenGLContext::makeCurrent(QSurface *surface)
     if (!isValid())
         return false;
 
-    if (thread() != QThread::currentThread())
+    if (Q_UNLIKELY(thread() != QThread::currentThread()))
         qFatal("Cannot make QOpenGLContext current in a different thread");
 
     if (!surface) {
@@ -1031,19 +1035,19 @@ void QOpenGLContext::swapBuffers(QSurface *surface)
         return;
 
     if (!surface) {
-        qWarning() << "QOpenGLContext::swapBuffers() called with null argument";
+        qWarning("QOpenGLContext::swapBuffers() called with null argument");
         return;
     }
 
     if (!surface->supportsOpenGL()) {
-        qWarning() << "QOpenGLContext::swapBuffers() called with non-opengl surface";
+        qWarning("QOpenGLContext::swapBuffers() called with non-opengl surface");
         return;
     }
 
     if (surface->surfaceClass() == QSurface::Window
         && !qt_window_private(static_cast<QWindow *>(surface))->receivedExpose)
     {
-        qWarning() << "QOpenGLContext::swapBuffers() called with non-exposed window, behavior is undefined";
+        qWarning("QOpenGLContext::swapBuffers() called with non-exposed window, behavior is undefined");
     }
 
     QPlatformSurface *surfaceHandle = surface->surfaceHandle();
@@ -1052,7 +1056,7 @@ void QOpenGLContext::swapBuffers(QSurface *surface)
 
 #if !defined(QT_NO_DEBUG)
     if (!QOpenGLContextPrivate::toggleMakeCurrentTracker(this, false))
-        qWarning() << "QOpenGLContext::swapBuffers() called without corresponding makeCurrent()";
+        qWarning("QOpenGLContext::swapBuffers() called without corresponding makeCurrent()");
 #endif
     if (surface->format().swapBehavior() == QSurfaceFormat::SingleBuffer)
         functions()->glFlush();
@@ -1066,9 +1070,18 @@ void QOpenGLContext::swapBuffers(QSurface *surface)
 */
 QFunctionPointer QOpenGLContext::getProcAddress(const QByteArray &procName) const
 {
+    return getProcAddress(procName.constData());
+}
+
+/*!
+  \overload
+  \since 5.8
+ */
+QFunctionPointer QOpenGLContext::getProcAddress(const char *procName) const
+{
     Q_D(const QOpenGLContext);
     if (!d->platformGLContext)
-        return 0;
+        return nullptr;
     return d->platformGLContext->getProcAddress(procName);
 }
 
@@ -1212,7 +1225,7 @@ void *QOpenGLContext::openGLModuleHandle()
 
   \note A desktop OpenGL implementation may be capable of creating
   ES-compatible contexts too. Therefore in most cases it is more
-  appropriate to check QSurfaceFormat::renderableType() or using the
+  appropriate to check QSurfaceFormat::renderableType() or use
   the convenience function isOpenGLES().
 
   \note This function requires that the QGuiApplication instance is already created.
@@ -1289,29 +1302,10 @@ QOpenGLContext *QOpenGLContext::globalShareContext()
 /*!
     \internal
 */
-QOpenGLVersionFunctionsBackend *QOpenGLContext::functionsBackend(const QOpenGLVersionStatus &v) const
+QOpenGLVersionFunctionsStorage *QOpenGLContext::functionsBackendStorage() const
 {
     Q_D(const QOpenGLContext);
-    return d->versionFunctionsBackend.value(v, 0);
-}
-
-/*!
-    \internal
-*/
-void QOpenGLContext::insertFunctionsBackend(const QOpenGLVersionStatus &v,
-                                            QOpenGLVersionFunctionsBackend *backend)
-{
-    Q_D(QOpenGLContext);
-    d->versionFunctionsBackend.insert(v, backend);
-}
-
-/*!
-    \internal
-*/
-void QOpenGLContext::removeFunctionsBackend(const QOpenGLVersionStatus &v)
-{
-    Q_D(QOpenGLContext);
-    d->versionFunctionsBackend.remove(v);
+    return &d->versionFunctionsStorage;
 }
 
 /*!
@@ -1415,7 +1409,7 @@ void QOpenGLContextGroupPrivate::removeContext(QOpenGLContext *ctx)
         m_shares.removeOne(ctx);
 
         if (ctx == m_context && !m_shares.isEmpty())
-            m_context = m_shares.first();
+            m_context = m_shares.constFirst();
 
         if (!m_refs.deref()) {
             cleanup();
@@ -1579,7 +1573,7 @@ QOpenGLMultiGroupSharedResource::~QOpenGLMultiGroupSharedResource()
 #endif
     for (int i = 0; i < m_groups.size(); ++i) {
         if (!m_groups.at(i)->shares().isEmpty()) {
-            QOpenGLContext *context = m_groups.at(i)->shares().first();
+            QOpenGLContext *context = m_groups.at(i)->shares().constFirst();
             QOpenGLSharedResource *resource = value(context);
             if (resource)
                 resource->free();
diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h
index a658f24ac5..33e3f1c3f6 100644
--- a/src/gui/kernel/qopenglcontext.h
+++ b/src/gui/kernel/qopenglcontext.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -168,6 +174,7 @@ public:
 
     void swapBuffers(QSurface *surface);
     QFunctionPointer getProcAddress(const QByteArray &procName) const;
+    QFunctionPointer getProcAddress(const char *procName) const;
 
     QSurface *surface() const;
 
@@ -230,10 +237,7 @@ private:
     void setQGLContextHandle(void *handle,void (*qGLContextDeleteFunction)(void *));
     void deleteQGLContext();
 
-    QOpenGLVersionFunctionsBackend* functionsBackend(const QOpenGLVersionStatus &v) const;
-    void insertFunctionsBackend(const QOpenGLVersionStatus &v,
-                                QOpenGLVersionFunctionsBackend *backend);
-    void removeFunctionsBackend(const QOpenGLVersionStatus &v);
+    QOpenGLVersionFunctionsStorage* functionsBackendStorage() const;
     void insertExternalFunctions(QAbstractOpenGLFunctions *f);
     void removeExternalFunctions(QAbstractOpenGLFunctions *f);
 
diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h
index 7c8c698a7d..2fe8446c65 100644
--- a/src/gui/kernel/qopenglcontext_p.h
+++ b/src/gui/kernel/qopenglcontext_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -218,7 +224,7 @@ public:
     }
 
     mutable QHash<QOpenGLVersionProfile, QAbstractOpenGLFunctions *> versionFunctions;
-    mutable QHash<QOpenGLVersionStatus, QOpenGLVersionFunctionsBackend *> versionFunctionsBackend;
+    mutable QOpenGLVersionFunctionsStorage versionFunctionsStorage;
     mutable QSet<QAbstractOpenGLFunctions *> externalVersionFunctions;
 
     void *qGLContextHandle;
diff --git a/src/gui/kernel/qopenglwindow.cpp b/src/gui/kernel/qopenglwindow.cpp
index 3a1126d318..8ab5c08442 100644
--- a/src/gui/kernel/qopenglwindow.cpp
+++ b/src/gui/kernel/qopenglwindow.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -246,9 +252,10 @@ void QOpenGLWindowPrivate::beginPaint(const QRegion &region)
         if (!fbo || fbo->size() != deviceSize) {
             QOpenGLFramebufferObjectFormat fboFormat;
             fboFormat.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
-            if (q->requestedFormat().samples() > 0) {
+            const int samples = q->requestedFormat().samples();
+            if (samples > 0) {
                 if (updateBehavior != QOpenGLWindow::PartialUpdateBlend)
-                    fboFormat.setSamples(q->requestedFormat().samples());
+                    fboFormat.setSamples(samples);
                 else
                     qWarning("QOpenGLWindow: PartialUpdateBlend does not support multisampling");
             }
diff --git a/src/gui/kernel/qopenglwindow.h b/src/gui/kernel/qopenglwindow.h
index 0c2b44c1c7..6e2a8ab904 100644
--- a/src/gui/kernel/qopenglwindow.h
+++ b/src/gui/kernel/qopenglwindow.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qpaintdevicewindow.cpp b/src/gui/kernel/qpaintdevicewindow.cpp
index cd894866c3..c35478da38 100644
--- a/src/gui/kernel/qpaintdevicewindow.cpp
+++ b/src/gui/kernel/qpaintdevicewindow.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qpaintdevicewindow.h b/src/gui/kernel/qpaintdevicewindow.h
index 4d7e5dd518..1b66ed7c41 100644
--- a/src/gui/kernel/qpaintdevicewindow.h
+++ b/src/gui/kernel/qpaintdevicewindow.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qpaintdevicewindow_p.h b/src/gui/kernel/qpaintdevicewindow_p.h
index 071f2ee54c..39cd1b3615 100644
--- a/src/gui/kernel/qpaintdevicewindow_p.h
+++ b/src/gui/kernel/qpaintdevicewindow_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index a8102125fb..a992793246 100644
--- a/src/gui/kernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h
index 66b3f039f4..c130a1844b 100644
--- a/src/gui/kernel/qpalette.h
+++ b/src/gui/kernel/qpalette.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qpixelformat.cpp b/src/gui/kernel/qpixelformat.cpp
index d0fed88dbb..c132a1418e 100644
--- a/src/gui/kernel/qpixelformat.cpp
+++ b/src/gui/kernel/qpixelformat.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qpixelformat.h b/src/gui/kernel/qpixelformat.h
index 9ccfa39e95..a78a3b5ad3 100644
--- a/src/gui/kernel/qpixelformat.h
+++ b/src/gui/kernel/qpixelformat.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformclipboard.cpp b/src/gui/kernel/qplatformclipboard.cpp
index 1cb223fef6..ab2998b901 100644
--- a/src/gui/kernel/qplatformclipboard.cpp
+++ b/src/gui/kernel/qplatformclipboard.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformclipboard.h b/src/gui/kernel/qplatformclipboard.h
index f52e3e2fa2..c30e085d00 100644
--- a/src/gui/kernel/qplatformclipboard.h
+++ b/src/gui/kernel/qplatformclipboard.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformcursor.cpp b/src/gui/kernel/qplatformcursor.cpp
index cd43fc42fe..c644d4769a 100644
--- a/src/gui/kernel/qplatformcursor.cpp
+++ b/src/gui/kernel/qplatformcursor.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -46,9 +52,10 @@ QT_BEGIN_NAMESPACE
 QList<QPlatformCursor *> QPlatformCursorPrivate::getInstances()
 {
     QList<QPlatformCursor *> result;
-    foreach (const QScreen *screen, QGuiApplicationPrivate::screen_list)
+    for (const QScreen *screen : qAsConst(QGuiApplicationPrivate::screen_list)) {
         if (QPlatformCursor *cursor = screen->handle()->cursor())
             result.push_back(cursor);
+    }
     return result;
 }
 
diff --git a/src/gui/kernel/qplatformcursor.h b/src/gui/kernel/qplatformcursor.h
index 8c788fd27b..52c93c87e3 100644
--- a/src/gui/kernel/qplatformcursor.h
+++ b/src/gui/kernel/qplatformcursor.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp
index f69efe0935..fe4d167078 100644
--- a/src/gui/kernel/qplatformdialoghelper.cpp
+++ b/src/gui/kernel/qplatformdialoghelper.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -33,6 +39,7 @@
 
 #include "qplatformdialoghelper.h"
 
+#include <QtCore/QCoreApplication>
 #include <QtCore/QVariant>
 #include <QtCore/QSharedData>
 #include <QtCore/QSettings>
@@ -251,7 +258,7 @@ void QColorDialogStaticData::readSettings()
 #ifndef QT_NO_SETTINGS
     const QSettings settings(QSettings::UserScope, QStringLiteral("QtProject"));
     for (int i = 0; i < int(CustomColorCount); ++i) {
-        const QVariant v = settings.value(QStringLiteral("Qt/customColors/") + QString::number(i));
+        const QVariant v = settings.value(QLatin1String("Qt/customColors/") + QString::number(i));
         if (v.isValid())
             customRgb[i] = v.toUInt();
     }
@@ -264,7 +271,7 @@ void QColorDialogStaticData::writeSettings() const
     if (!customSet) {
         QSettings settings(QSettings::UserScope, QStringLiteral("QtProject"));
         for (int i = 0; i < int(CustomColorCount); ++i)
-            settings.setValue(QStringLiteral("Qt/customColors/") + QString::number(i), customRgb[i]);
+            settings.setValue(QLatin1String("Qt/customColors/") + QString::number(i), customRgb[i]);
     }
 #endif
 }
@@ -405,7 +412,8 @@ public:
         viewMode(QFileDialogOptions::Detail),
         fileMode(QFileDialogOptions::AnyFile),
         acceptMode(QFileDialogOptions::AcceptOpen),
-        filters(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs)
+        filters(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs),
+        useDefaultNameFilters(true)
     {}
 
     QFileDialogOptions::FileDialogOptions options;
@@ -417,6 +425,7 @@ public:
     QString labels[QFileDialogOptions::DialogLabelCount];
     QDir::Filters filters;
     QList<QUrl> sidebarUrls;
+    bool useDefaultNameFilters;
     QStringList nameFilters;
     QStringList mimeTypeFilters;
     QString defaultSuffix;
@@ -528,14 +537,48 @@ QList<QUrl> QFileDialogOptions::sidebarUrls() const
     return d->sidebarUrls;
 }
 
+/*!
+    \since 5.7
+    \internal
+    The bool property useDefaultNameFilters indicates that no name filters have been
+    set or that they are equivalent to \gui{All Files (*)}. If it is true, the
+    platform can choose to hide the filter combo box.
+
+    \sa defaultNameFilterString().
+*/
+bool QFileDialogOptions::useDefaultNameFilters() const
+{
+    return d->useDefaultNameFilters;
+}
+
+void QFileDialogOptions::setUseDefaultNameFilters(bool dnf)
+{
+    d->useDefaultNameFilters = dnf;
+}
+
 void QFileDialogOptions::setNameFilters(const QStringList &filters)
 {
+    d->useDefaultNameFilters = filters.size() == 1
+        && filters.first() == QFileDialogOptions::defaultNameFilterString();
     d->nameFilters = filters;
 }
 
 QStringList QFileDialogOptions::nameFilters() const
 {
-    return d->nameFilters;
+    return d->useDefaultNameFilters ?
+        QStringList(QFileDialogOptions::defaultNameFilterString()) : d->nameFilters;
+}
+
+/*!
+    \since 5.6
+    \internal
+    \return The translated default name filter string (\gui{All Files (*)}).
+    \sa defaultNameFilters(), nameFilters()
+*/
+
+QString QFileDialogOptions::defaultNameFilterString()
+{
+    return QCoreApplication::translate("QFileDialog", "All Files (*)");
 }
 
 void QFileDialogOptions::setMimeTypeFilters(const QStringList &filters)
diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h
index 5b2f4ece77..825dcf293d 100644
--- a/src/gui/kernel/qplatformdialoghelper.h
+++ b/src/gui/kernel/qplatformdialoghelper.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -343,6 +349,9 @@ public:
     void setSidebarUrls(const QList<QUrl> &urls);
     QList<QUrl> sidebarUrls() const;
 
+    bool useDefaultNameFilters() const;
+    void setUseDefaultNameFilters(bool d);
+
     void setNameFilters(const QStringList &filters);
     QStringList nameFilters() const;
 
@@ -371,6 +380,8 @@ public:
     void setSupportedSchemes(const QStringList &schemes);
     QStringList supportedSchemes() const;
 
+    static QString defaultNameFilterString();
+
 private:
     QSharedDataPointer<QFileDialogOptionsPrivate> d;
 };
diff --git a/src/gui/kernel/qplatformdrag.cpp b/src/gui/kernel/qplatformdrag.cpp
index d789c75d1d..903f6686a8 100644
--- a/src/gui/kernel/qplatformdrag.cpp
+++ b/src/gui/kernel/qplatformdrag.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -155,6 +161,20 @@ Qt::DropAction QPlatformDrag::defaultAction(Qt::DropActions possibleActions,
 }
 
 /*!
+    \brief Cancels the currently active drag (only for drags of
+    the current application initiated by QPlatformDrag::drag()).
+
+    The default implementation does nothing.
+
+    \since 5.6
+ */
+
+void QPlatformDrag::cancelDrag()
+{
+    Q_UNIMPLEMENTED();
+}
+
+/*!
     \brief Called to notify QDrag about changes of the current action.
  */
 
diff --git a/src/gui/kernel/qplatformdrag.h b/src/gui/kernel/qplatformdrag.h
index 10ee88477f..a9744a17ac 100644
--- a/src/gui/kernel/qplatformdrag.h
+++ b/src/gui/kernel/qplatformdrag.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -92,6 +98,7 @@ public:
     virtual QMimeData *platformDropData() = 0;
 
     virtual Qt::DropAction drag(QDrag *m_drag) = 0;
+    virtual void cancelDrag();
     void updateAction(Qt::DropAction action);
 
     virtual Qt::DropAction defaultAction(Qt::DropActions possibleActions, Qt::KeyboardModifiers modifiers) const;
diff --git a/src/gui/kernel/qplatformgraphicsbuffer.cpp b/src/gui/kernel/qplatformgraphicsbuffer.cpp
index 84fe673bcf..8080cb91ad 100644
--- a/src/gui/kernel/qplatformgraphicsbuffer.cpp
+++ b/src/gui/kernel/qplatformgraphicsbuffer.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformgraphicsbuffer.h b/src/gui/kernel/qplatformgraphicsbuffer.h
index e13ab783c2..53fc551ad2 100644
--- a/src/gui/kernel/qplatformgraphicsbuffer.h
+++ b/src/gui/kernel/qplatformgraphicsbuffer.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformgraphicsbufferhelper.cpp b/src/gui/kernel/qplatformgraphicsbufferhelper.cpp
index 52457ed606..82a88eca04 100644
--- a/src/gui/kernel/qplatformgraphicsbufferhelper.cpp
+++ b/src/gui/kernel/qplatformgraphicsbufferhelper.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtPlatformSupport module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformgraphicsbufferhelper.h b/src/gui/kernel/qplatformgraphicsbufferhelper.h
index cc1a4918cd..59fcd12fd0 100644
--- a/src/gui/kernel/qplatformgraphicsbufferhelper.h
+++ b/src/gui/kernel/qplatformgraphicsbufferhelper.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtPlatformSupport module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatforminputcontext.cpp b/src/gui/kernel/qplatforminputcontext.cpp
index f9ff1d36d9..3f59116e9a 100644
--- a/src/gui/kernel/qplatforminputcontext.cpp
+++ b/src/gui/kernel/qplatforminputcontext.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -37,6 +43,8 @@
 #include "private/qkeymapper_p.h"
 #include <qpa/qplatforminputcontext_p.h>
 
+#include <QtGui/qtransform.h>
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -261,5 +269,30 @@ void QPlatformInputContextPrivate::setInputMethodAccepted(bool accepted)
     QPlatformInputContextPrivate::s_inputMethodAccepted = accepted;
 }
 
+/*!
+ * \brief QPlatformInputContext::setSelectionOnFocusObject
+ * \param anchorPos Beginning of selection in currently active window coordinates
+ * \param cursorPos End of selection in currently active window coordinates
+ */
+void QPlatformInputContext::setSelectionOnFocusObject(const QPointF &anchorPos, const QPointF &cursorPos)
+{
+    QObject *focus = qApp->focusObject();
+    if (!focus)
+        return;
+
+    QInputMethod *im = QGuiApplication::inputMethod();
+    const QTransform mapToLocal = im->inputItemTransform().inverted();
+    bool success;
+    int anchor = QInputMethod::queryFocusObject(Qt::ImCursorPosition, anchorPos * mapToLocal).toInt(&success);
+    if (success) {
+        int cursor = QInputMethod::queryFocusObject(Qt::ImCursorPosition, cursorPos * mapToLocal).toInt(&success);
+        if (success) {
+            QList<QInputMethodEvent::Attribute> imAttributes;
+            imAttributes.append(QInputMethodEvent::Attribute(QInputMethodEvent::Selection, anchor, cursor - anchor, QVariant()));
+            QInputMethodEvent event(QString(), imAttributes);
+            QGuiApplication::sendEvent(focus, &event);
+        }
+    }
+}
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qplatforminputcontext.h b/src/gui/kernel/qplatforminputcontext.h
index 280556e12a..7afa6b82f2 100644
--- a/src/gui/kernel/qplatforminputcontext.h
+++ b/src/gui/kernel/qplatforminputcontext.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -89,6 +95,8 @@ public:
     virtual void setFocusObject(QObject *object);
     bool inputMethodAccepted() const;
 
+    static void setSelectionOnFocusObject(const QPointF &anchorPos, const QPointF &cursorPos);
+
 private:
     friend class QGuiApplication;
     friend class QGuiApplicationPrivate;
diff --git a/src/gui/kernel/qplatforminputcontext_p.h b/src/gui/kernel/qplatforminputcontext_p.h
index 7cb06d6625..14e9dda072 100644
--- a/src/gui/kernel/qplatforminputcontext_p.h
+++ b/src/gui/kernel/qplatforminputcontext_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatforminputcontextfactory.cpp b/src/gui/kernel/qplatforminputcontextfactory.cpp
index fedf940dda..5f4f8d88fa 100644
--- a/src/gui/kernel/qplatforminputcontextfactory.cpp
+++ b/src/gui/kernel/qplatforminputcontextfactory.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -42,14 +48,14 @@
 
 QT_BEGIN_NAMESPACE
 
-#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
+#ifndef QT_NO_SETTINGS
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QPlatformInputContextFactoryInterface_iid, QLatin1String("/platforminputcontexts"), Qt::CaseInsensitive))
 #endif
 
 QStringList QPlatformInputContextFactory::keys()
 {
-#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
+#ifndef QT_NO_SETTINGS
     return loader()->keyMap().values();
 #else
     return QStringList();
@@ -64,12 +70,12 @@ QString QPlatformInputContextFactory::requested()
 
 QPlatformInputContext *QPlatformInputContextFactory::create(const QString& key)
 {
-#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
+#ifndef QT_NO_SETTINGS
     if (!key.isEmpty()) {
         QStringList paramList = key.split(QLatin1Char(':'));
         const QString platform = paramList.takeFirst().toLower();
 
-        QPlatformInputContext *ic = qLoadPlugin1<QPlatformInputContext, QPlatformInputContextPlugin>
+        QPlatformInputContext *ic = qLoadPlugin<QPlatformInputContext, QPlatformInputContextPlugin>
                                                  (loader(), platform, paramList);
         if (ic && ic->isValid())
             return ic;
diff --git a/src/gui/kernel/qplatforminputcontextfactory_p.h b/src/gui/kernel/qplatforminputcontextfactory_p.h
index 38f4358287..4106b2fedc 100644
--- a/src/gui/kernel/qplatforminputcontextfactory_p.h
+++ b/src/gui/kernel/qplatforminputcontextfactory_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatforminputcontextplugin.cpp b/src/gui/kernel/qplatforminputcontextplugin.cpp
index 87985104d3..53d56dbb48 100644
--- a/src/gui/kernel/qplatforminputcontextplugin.cpp
+++ b/src/gui/kernel/qplatforminputcontextplugin.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatforminputcontextplugin_p.h b/src/gui/kernel/qplatforminputcontextplugin_p.h
index d05672558d..1bb0332ac7 100644
--- a/src/gui/kernel/qplatforminputcontextplugin_p.h
+++ b/src/gui/kernel/qplatforminputcontextplugin_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp
index 14633d8b30..3490e786a8 100644
--- a/src/gui/kernel/qplatformintegration.cpp
+++ b/src/gui/kernel/qplatformintegration.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -149,13 +155,11 @@ QPlatformServices *QPlatformIntegration::services() const
 /*!
     \fn QPlatformWindow *QPlatformIntegration::createPlatformWindow(QWindow *window) const
 
-    Factory function for QPlatformWindow. The \a window parameter is a pointer to the top level
-    window which the QPlatformWindow is supposed to be created for.
+    Factory function for QPlatformWindow. The \a window parameter is a pointer to the window
+    which the QPlatformWindow is supposed to be created for.
 
-    All top level windows have to have a QPlatformWindow, and it will be created when the
-    QPlatformWindow is set to be visible for the first time. If the top level window's flags are
-    changed, or if the top level window's QPlatformWindowFormat is changed, then the top level
-    window's QPlatformWindow is deleted and a new one is created.
+    All windows have to have a QPlatformWindow, and it will be created on-demand when the
+    QWindow is made visible for the first time, or explicitly through calling QWindow::create().
 
     In the constructor, of the QPlatformWindow, the window flags, state, title and geometry
     of the \a window should be applied to the underlying window. If the resulting flags or state
@@ -220,7 +224,8 @@ QPlatformServices *QPlatformIntegration::services() const
     platforms where no window management is available, meaning for example that windows
     are never repositioned by the window manager. The default implementation returns \c true.
 
-    \value AllGLFunctionsQueryable The QOpenGLContext backend provided by the platform is
+    \value AllGLFunctionsQueryable Deprecated. Used to indicate whether the QOpenGLContext
+    backend provided by the platform is
     able to return function pointers from getProcAddress() even for standard OpenGL
     functions, for example OpenGL 1 functions like glClear() or glDrawArrays(). This is
     important because the OpenGL specifications do not require this ability from the
@@ -228,7 +233,8 @@ QPlatformServices *QPlatformIntegration::services() const
     platform plugins may however choose to enhance the behavior in the backend
     implementation for QOpenGLContext::getProcAddress() and support returning a function
     pointer also for the standard, non-extension functions. This capability is a
-    prerequisite for dynamic OpenGL loading.
+    prerequisite for dynamic OpenGL loading. Starting with Qt 5.7, the platform plugin
+    is required to have this capability.
 
     \value ApplicationIcon The platform supports setting the application icon. (since 5.5)
  */
@@ -468,11 +474,11 @@ void QPlatformIntegration::screenAdded(QPlatformScreen *ps, bool isPrimary)
 
 void QPlatformIntegration::removeScreen(QScreen *screen)
 {
-    const bool wasPrimary = (!QGuiApplicationPrivate::screen_list.isEmpty() && QGuiApplicationPrivate::screen_list[0] == screen);
+    const bool wasPrimary = (!QGuiApplicationPrivate::screen_list.isEmpty() && QGuiApplicationPrivate::screen_list.at(0) == screen);
     QGuiApplicationPrivate::screen_list.removeOne(screen);
 
     if (wasPrimary && qGuiApp && !QGuiApplicationPrivate::screen_list.isEmpty())
-        emit qGuiApp->primaryScreenChanged(QGuiApplicationPrivate::screen_list[0]);
+        emit qGuiApp->primaryScreenChanged(QGuiApplicationPrivate::screen_list.at(0));
 }
 
 /*!
@@ -559,6 +565,17 @@ void QPlatformIntegration::sync()
 {
 }
 
+/*!
+   \since 5.7
+
+    Should sound a bell, using the default volume and sound.
+
+    \sa QApplication::beep()
+*/
+void QPlatformIntegration::beep() const
+{
+}
+
 #ifndef QT_NO_OPENGL
 /*!
   Platform integration function for querying the OpenGL implementation type.
diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h
index af89a73455..6ac98c20ce 100644
--- a/src/gui/kernel/qplatformintegration.h
+++ b/src/gui/kernel/qplatformintegration.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -176,6 +182,8 @@ public:
 
     void removeScreen(QScreen *screen);
 
+    virtual void beep() const;
+
 protected:
     void screenAdded(QPlatformScreen *screen, bool isPrimary = false);
     void destroyScreen(QPlatformScreen *screen);
diff --git a/src/gui/kernel/qplatformintegrationfactory.cpp b/src/gui/kernel/qplatformintegrationfactory.cpp
index 5a1fb3ca83..1e04a673eb 100644
--- a/src/gui/kernel/qplatformintegrationfactory.cpp
+++ b/src/gui/kernel/qplatformintegrationfactory.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -42,23 +48,12 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QPlatformIntegrationFactoryInterface_iid, QLatin1String("/platforms"), Qt::CaseInsensitive))
+
+#ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader,
                           (QPlatformIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
-
-static inline QPlatformIntegration *loadIntegration(QFactoryLoader *loader, const QString &key, const QStringList &parameters, int &argc, char ** argv)
-{
-    const int index = loader->indexOf(key);
-    if (index != -1) {
-        if (QPlatformIntegrationPlugin *factory = qobject_cast<QPlatformIntegrationPlugin *>(loader->instance(index)))
-            if (QPlatformIntegration *result = factory->create(key, parameters, argc, argv))
-                return result;
-    }
-    return 0;
-}
-
 #endif // !QT_NO_LIBRARY
 
 QPlatformIntegration *QPlatformIntegrationFactory::create(const QString &platform, const QStringList &paramList, int &argc, char **argv, const QString &platformPluginPath)
@@ -67,19 +62,13 @@ QPlatformIntegration *QPlatformIntegrationFactory::create(const QString &platfor
     // Try loading the plugin from platformPluginPath first:
     if (!platformPluginPath.isEmpty()) {
         QCoreApplication::addLibraryPath(platformPluginPath);
-        if (QPlatformIntegration *ret = loadIntegration(directLoader(), platform, paramList, argc, argv))
+        if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))
             return ret;
     }
-    if (QPlatformIntegration *ret = loadIntegration(loader(), platform, paramList, argc, argv))
-        return ret;
 #else
-    Q_UNUSED(platform);
-    Q_UNUSED(paramList);
-    Q_UNUSED(argc);
-    Q_UNUSED(argv);
     Q_UNUSED(platformPluginPath);
 #endif
-    return 0;
+    return qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(loader(), platform, paramList, argc, argv);
 }
 
 /*!
@@ -91,13 +80,13 @@ QPlatformIntegration *QPlatformIntegrationFactory::create(const QString &platfor
 
 QStringList QPlatformIntegrationFactory::keys(const QString &platformPluginPath)
 {
-#ifndef QT_NO_LIBRARY
     QStringList list;
+#ifndef QT_NO_LIBRARY
     if (!platformPluginPath.isEmpty()) {
         QCoreApplication::addLibraryPath(platformPluginPath);
         list = directLoader()->keyMap().values();
         if (!list.isEmpty()) {
-            const QString postFix = QStringLiteral(" (from ")
+            const QString postFix = QLatin1String(" (from ")
                                     + QDir::toNativeSeparators(platformPluginPath)
                                     + QLatin1Char(')');
             const QStringList::iterator end = list.end();
@@ -105,12 +94,11 @@ QStringList QPlatformIntegrationFactory::keys(const QString &platformPluginPath)
                 (*it).append(postFix);
         }
     }
-    list.append(loader()->keyMap().values());
-    return list;
 #else
     Q_UNUSED(platformPluginPath);
-    return QStringList();
 #endif
+    list.append(loader()->keyMap().values());
+    return list;
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qplatformintegrationfactory_p.h b/src/gui/kernel/qplatformintegrationfactory_p.h
index 2ac0954cc1..ea8c846557 100644
--- a/src/gui/kernel/qplatformintegrationfactory_p.h
+++ b/src/gui/kernel/qplatformintegrationfactory_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformintegrationplugin.cpp b/src/gui/kernel/qplatformintegrationplugin.cpp
index 04d0c2a8e3..35e4d2797b 100644
--- a/src/gui/kernel/qplatformintegrationplugin.cpp
+++ b/src/gui/kernel/qplatformintegrationplugin.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformintegrationplugin.h b/src/gui/kernel/qplatformintegrationplugin.h
index 89808cde5e..7d2a9b2a5f 100644
--- a/src/gui/kernel/qplatformintegrationplugin.h
+++ b/src/gui/kernel/qplatformintegrationplugin.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformmenu.cpp b/src/gui/kernel/qplatformmenu.cpp
index da65381931..2912416309 100644
--- a/src/gui/kernel/qplatformmenu.cpp
+++ b/src/gui/kernel/qplatformmenu.cpp
@@ -1,32 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Copyright (C) 2014 Martin Graesslin <mgraesslin@kde.org>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformmenu.h b/src/gui/kernel/qplatformmenu.h
index bc0b3a4870..bd4f4d9beb 100644
--- a/src/gui/kernel/qplatformmenu.h
+++ b/src/gui/kernel/qplatformmenu.h
@@ -1,32 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author James Turner <james.turner@kdab.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -81,6 +87,7 @@ public:
     virtual void setEnabled(bool enabled) = 0;
     virtual void setIconSize(int size) = 0;
     virtual void setNativeContents(WId item) { Q_UNUSED(item); }
+    virtual void setHasExclusiveGroup(bool hasExclusiveGroup) { Q_UNUSED(hasExclusiveGroup); }
 
 Q_SIGNALS:
     void activated();
@@ -141,6 +148,7 @@ public:
     virtual void handleReparent(QWindow *newParentWindow) = 0;
 
     virtual QPlatformMenu *menuForTag(quintptr tag) const = 0;
+    virtual QPlatformMenu *createMenu() const { return nullptr; }
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qplatformnativeinterface.cpp b/src/gui/kernel/qplatformnativeinterface.cpp
index 8fa8debcb9..f48e470d1b 100644
--- a/src/gui/kernel/qplatformnativeinterface.cpp
+++ b/src/gui/kernel/qplatformnativeinterface.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -80,6 +86,15 @@ void * QPlatformNativeInterface::nativeResourceForBackingStore(const QByteArray
     return 0;
 }
 
+#ifndef QT_NO_CURSOR
+void *QPlatformNativeInterface::nativeResourceForCursor(const QByteArray &resource, const QCursor &cursor)
+{
+    Q_UNUSED(resource);
+    Q_UNUSED(cursor);
+    return Q_NULLPTR;
+}
+#endif // !QT_NO_CURSOR
+
 QPlatformNativeInterface::NativeResourceForIntegrationFunction QPlatformNativeInterface::nativeResourceFunctionForIntegration(const QByteArray &resource)
 {
     Q_UNUSED(resource);
diff --git a/src/gui/kernel/qplatformnativeinterface.h b/src/gui/kernel/qplatformnativeinterface.h
index 71a4e9c768..f830221c70 100644
--- a/src/gui/kernel/qplatformnativeinterface.h
+++ b/src/gui/kernel/qplatformnativeinterface.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -65,6 +71,9 @@ public:
     virtual void *nativeResourceForScreen(const QByteArray &resource, QScreen *screen);
     virtual void *nativeResourceForWindow(const QByteArray &resource, QWindow *window);
     virtual void *nativeResourceForBackingStore(const QByteArray &resource, QBackingStore *backingStore);
+#ifndef QT_NO_CURSOR
+    virtual void *nativeResourceForCursor(const QByteArray &resource, const QCursor &cursor);
+#endif
 
     typedef void * (*NativeResourceForIntegrationFunction)();
     typedef void * (*NativeResourceForContextFunction)(QOpenGLContext *context);
diff --git a/src/gui/kernel/qplatformoffscreensurface.cpp b/src/gui/kernel/qplatformoffscreensurface.cpp
index bfde0a0ffc..9d35b37c6a 100644
--- a/src/gui/kernel/qplatformoffscreensurface.cpp
+++ b/src/gui/kernel/qplatformoffscreensurface.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformoffscreensurface.h b/src/gui/kernel/qplatformoffscreensurface.h
index 87513f882c..77a8f63316 100644
--- a/src/gui/kernel/qplatformoffscreensurface.h
+++ b/src/gui/kernel/qplatformoffscreensurface.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformopenglcontext.cpp b/src/gui/kernel/qplatformopenglcontext.cpp
index f98f8a496c..07b5a0dda6 100644
--- a/src/gui/kernel/qplatformopenglcontext.cpp
+++ b/src/gui/kernel/qplatformopenglcontext.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -65,10 +71,11 @@ QT_BEGIN_NAMESPACE
     The implementation must support being called in a thread different than the gui-thread.
 */
 
-/*! \fn QFunctionPointer QPlatformOpenGLContext::getProcAddress(const QByteArray &procName)
-    Reimplement in subclass to native getProcAddr calls.
+/*! \fn QFunctionPointer QPlatformOpenGLContext::getProcAddress(const char *procName)
 
-    Note: its convenient to use qPrintable(const QString &str) to get the const char * pointer
+    Reimplement in subclass to allow dynamic querying of OpenGL symbols. As opposed to e.g. the wglGetProcAddress
+    function on Windows, Qt expects this methods to be able to return valid function pointers even for standard
+    OpenGL symbols.
 */
 
 class QPlatformOpenGLContextPrivate
diff --git a/src/gui/kernel/qplatformopenglcontext.h b/src/gui/kernel/qplatformopenglcontext.h
index a1b781f4e0..1a38a5fed3 100644
--- a/src/gui/kernel/qplatformopenglcontext.h
+++ b/src/gui/kernel/qplatformopenglcontext.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -77,7 +83,7 @@ public:
     virtual bool isSharing() const { return false; }
     virtual bool isValid() const { return true; }
 
-    virtual QFunctionPointer getProcAddress(const QByteArray &procName) = 0;
+    virtual QFunctionPointer getProcAddress(const char *procName) = 0;
 
     QOpenGLContext *context() const;
 
diff --git a/src/gui/kernel/qplatformscreen.cpp b/src/gui/kernel/qplatformscreen.cpp
index 3ec7a4cf3f..1d519e84f9 100644
--- a/src/gui/kernel/qplatformscreen.cpp
+++ b/src/gui/kernel/qplatformscreen.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -87,7 +93,7 @@ QPixmap QPlatformScreen::grabWindow(WId window, int x, int y, int width, int hei
 */
 QWindow *QPlatformScreen::topLevelAt(const QPoint & pos) const
 {
-    QWindowList list = QGuiApplication::topLevelWindows();
+    const QWindowList list = QGuiApplication::topLevelWindows();
     for (int i = list.size()-1; i >= 0; --i) {
         QWindow *w = list[i];
         if (w->isVisible() && QHighDpi::toNativePixels(w->geometry(), w).contains(pos))
@@ -105,7 +111,8 @@ QWindow *QPlatformScreen::topLevelAt(const QPoint & pos) const
 const QPlatformScreen *QPlatformScreen::screenForPosition(const QPoint &point) const
 {
     if (!geometry().contains(point)) {
-        Q_FOREACH (const QPlatformScreen* screen, virtualSiblings()) {
+        const auto screens = virtualSiblings();
+        for (const QPlatformScreen *screen : screens) {
             if (screen->geometry().contains(point))
                 return screen;
         }
diff --git a/src/gui/kernel/qplatformscreen.h b/src/gui/kernel/qplatformscreen.h
index b32f9cf97c..cd300c34c8 100644
--- a/src/gui/kernel/qplatformscreen.h
+++ b/src/gui/kernel/qplatformscreen.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformscreen_p.h b/src/gui/kernel/qplatformscreen_p.h
index 04c7e4d67f..aa31c4db25 100644
--- a/src/gui/kernel/qplatformscreen_p.h
+++ b/src/gui/kernel/qplatformscreen_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformservices.cpp b/src/gui/kernel/qplatformservices.cpp
index a37f9d056c..fdc6a6c4aa 100644
--- a/src/gui/kernel/qplatformservices.cpp
+++ b/src/gui/kernel/qplatformservices.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformservices.h b/src/gui/kernel/qplatformservices.h
index c4e3797593..52b8ce7854 100644
--- a/src/gui/kernel/qplatformservices.h
+++ b/src/gui/kernel/qplatformservices.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformsessionmanager.cpp b/src/gui/kernel/qplatformsessionmanager.cpp
index b48819bab9..a66fc6d016 100644
--- a/src/gui/kernel/qplatformsessionmanager.cpp
+++ b/src/gui/kernel/qplatformsessionmanager.cpp
@@ -2,32 +2,38 @@
 **
 ** Copyright (C) 2013 Samuel Gaist <samuel.gaist@edeltech.ch>
 ** Copyright (C) 2013 Teo Mrnjavac <teo@kde.org>
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformsessionmanager.h b/src/gui/kernel/qplatformsessionmanager.h
index 70e2c065eb..98c364f7fe 100644
--- a/src/gui/kernel/qplatformsessionmanager.h
+++ b/src/gui/kernel/qplatformsessionmanager.h
@@ -2,32 +2,38 @@
 **
 ** Copyright (C) 2013 Samuel Gaist <samuel.gaist@edeltech.ch>
 ** Copyright (C) 2013 Teo Mrnjavac <teo@kde.org>
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformsharedgraphicscache.cpp b/src/gui/kernel/qplatformsharedgraphicscache.cpp
index c364b6207d..f6c4e3309e 100644
--- a/src/gui/kernel/qplatformsharedgraphicscache.cpp
+++ b/src/gui/kernel/qplatformsharedgraphicscache.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformsharedgraphicscache.h b/src/gui/kernel/qplatformsharedgraphicscache.h
index 93650fdf8c..6e0ba9151f 100644
--- a/src/gui/kernel/qplatformsharedgraphicscache.h
+++ b/src/gui/kernel/qplatformsharedgraphicscache.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformsurface.cpp b/src/gui/kernel/qplatformsurface.cpp
index 5a733afb6d..f091c04ebb 100644
--- a/src/gui/kernel/qplatformsurface.cpp
+++ b/src/gui/kernel/qplatformsurface.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformsurface.h b/src/gui/kernel/qplatformsurface.h
index 5e83179bc6..0bbe811803 100644
--- a/src/gui/kernel/qplatformsurface.h
+++ b/src/gui/kernel/qplatformsurface.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformsystemtrayicon.cpp b/src/gui/kernel/qplatformsystemtrayicon.cpp
index fe2cef1231..30db966df7 100644
--- a/src/gui/kernel/qplatformsystemtrayicon.cpp
+++ b/src/gui/kernel/qplatformsystemtrayicon.cpp
@@ -1,32 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Copyright (C) 2012 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformsystemtrayicon.h b/src/gui/kernel/qplatformsystemtrayicon.h
index 6ef2d1538f..dcd7225180 100644
--- a/src/gui/kernel/qplatformsystemtrayicon.h
+++ b/src/gui/kernel/qplatformsystemtrayicon.h
@@ -1,32 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Copyright (C) 2012 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformtheme.cpp b/src/gui/kernel/qplatformtheme.cpp
index ce8548f628..7f74959a60 100644
--- a/src/gui/kernel/qplatformtheme.cpp
+++ b/src/gui/kernel/qplatformtheme.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -682,6 +688,41 @@ QString QPlatformTheme::defaultStandardButtonText(int button)
     return QString();
 }
 
+QString QPlatformTheme::removeMnemonics(const QString &original)
+{
+    QString returnText(original.size(), 0);
+    int finalDest = 0;
+    int currPos = 0;
+    int l = original.length();
+    while (l) {
+        if (original.at(currPos) == QLatin1Char('&')
+            && (l == 1 || original.at(currPos + 1) != QLatin1Char('&'))) {
+            ++currPos;
+            --l;
+            if (l == 0)
+                break;
+        } else if (original.at(currPos) == QLatin1Char('(') && l >= 4 &&
+                   original.at(currPos + 1) == QLatin1Char('&') &&
+                   original.at(currPos + 2) != QLatin1Char('&') &&
+                   original.at(currPos + 3) == QLatin1Char(')')) {
+            /* remove mnemonics its format is "\s*(&X)" */
+            int n = 0;
+            while (finalDest > n && returnText.at(finalDest - n - 1).isSpace())
+                ++n;
+            finalDest -= n;
+            currPos += 4;
+            l -= 4;
+            continue;
+        }
+        returnText[finalDest] = original.at(currPos);
+        ++currPos;
+        ++finalDest;
+        --l;
+    }
+    returnText.truncate(finalDest);
+    return returnText;
+}
+
 unsigned QPlatformThemePrivate::currentKeyPlatforms()
 {
     const uint keyboardScheme = QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::KeyboardScheme).toInt();
diff --git a/src/gui/kernel/qplatformtheme.h b/src/gui/kernel/qplatformtheme.h
index 36fa7a65aa..c4c7482995 100644
--- a/src/gui/kernel/qplatformtheme.h
+++ b/src/gui/kernel/qplatformtheme.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -166,6 +172,7 @@ public:
         FixedFont,
         GroupBoxTitleFont,
         TabButtonFont,
+        EditorFont,
         NFonts
     };
 
@@ -240,6 +247,7 @@ public:
         MediaSeekBackward,
         MediaVolume,
         MediaVolumeMuted,
+        LineEditClearButton,
         // do not add any values below/greater than this
         CustomBase = 0xf0000000
     };
@@ -303,6 +311,7 @@ public:
 
     static QVariant defaultThemeHint(ThemeHint hint);
     static QString defaultStandardButtonText(int button);
+    static QString removeMnemonics(const QString &original);
 
 protected:
     explicit QPlatformTheme(QPlatformThemePrivate *priv);
diff --git a/src/gui/kernel/qplatformtheme_p.h b/src/gui/kernel/qplatformtheme_p.h
index 3ca17a63f7..11f9e261ef 100644
--- a/src/gui/kernel/qplatformtheme_p.h
+++ b/src/gui/kernel/qplatformtheme_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformthemefactory.cpp b/src/gui/kernel/qplatformthemefactory.cpp
index bcc37dad06..223d7344e3 100644
--- a/src/gui/kernel/qplatformthemefactory.cpp
+++ b/src/gui/kernel/qplatformthemefactory.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -42,9 +48,10 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QPlatformThemeFactoryInterface_iid, QLatin1String("/platformthemes"), Qt::CaseInsensitive))
+
+#ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader,
                           (QPlatformThemeFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
 #endif
@@ -53,21 +60,17 @@ QPlatformTheme *QPlatformThemeFactory::create(const QString& key, const QString
 {
     QStringList paramList = key.split(QLatin1Char(':'));
     const QString platform = paramList.takeFirst().toLower();
-
 #ifndef QT_NO_LIBRARY
     // Try loading the plugin from platformPluginPath first:
     if (!platformPluginPath.isEmpty()) {
         QCoreApplication::addLibraryPath(platformPluginPath);
-        if (QPlatformTheme *ret = qLoadPlugin1<QPlatformTheme, QPlatformThemePlugin>(directLoader(), platform, paramList))
+        if (QPlatformTheme *ret = qLoadPlugin<QPlatformTheme, QPlatformThemePlugin>(directLoader(), platform, paramList))
             return ret;
     }
-    if (QPlatformTheme *ret = qLoadPlugin1<QPlatformTheme, QPlatformThemePlugin>(loader(), platform, paramList))
-           return ret;
 #else
-    Q_UNUSED(key);
     Q_UNUSED(platformPluginPath);
 #endif
-    return 0;
+    return qLoadPlugin<QPlatformTheme, QPlatformThemePlugin>(loader(), platform, paramList);
 }
 
 /*!
@@ -78,14 +81,14 @@ QPlatformTheme *QPlatformThemeFactory::create(const QString& key, const QString
 */
 QStringList QPlatformThemeFactory::keys(const QString &platformPluginPath)
 {
-#ifndef QT_NO_LIBRARY
     QStringList list;
 
+#ifndef QT_NO_LIBRARY
     if (!platformPluginPath.isEmpty()) {
         QCoreApplication::addLibraryPath(platformPluginPath);
         list += directLoader()->keyMap().values();
         if (!list.isEmpty()) {
-            const QString postFix = QStringLiteral(" (from ")
+            const QString postFix = QLatin1String(" (from ")
                     + QDir::toNativeSeparators(platformPluginPath)
                     + QLatin1Char(')');
             const QStringList::iterator end = list.end();
@@ -93,12 +96,11 @@ QStringList QPlatformThemeFactory::keys(const QString &platformPluginPath)
                 (*it).append(postFix);
         }
     }
-    list += loader()->keyMap().values();
-    return list;
 #else
     Q_UNUSED(platformPluginPath);
-    return QStringList();
 #endif
+    list += loader()->keyMap().values();
+    return list;
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qplatformthemefactory_p.h b/src/gui/kernel/qplatformthemefactory_p.h
index 1df4fd0d27..abd78d544d 100644
--- a/src/gui/kernel/qplatformthemefactory_p.h
+++ b/src/gui/kernel/qplatformthemefactory_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformthemeplugin.cpp b/src/gui/kernel/qplatformthemeplugin.cpp
index 4bc325b04f..c09476bee5 100644
--- a/src/gui/kernel/qplatformthemeplugin.cpp
+++ b/src/gui/kernel/qplatformthemeplugin.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformthemeplugin.h b/src/gui/kernel/qplatformthemeplugin.h
index 48e1d9b50e..52aa09d1d5 100644
--- a/src/gui/kernel/qplatformthemeplugin.h
+++ b/src/gui/kernel/qplatformthemeplugin.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp
index 9bfda7f334..bcd3e830dd 100644
--- a/src/gui/kernel/qplatformwindow.cpp
+++ b/src/gui/kernel/qplatformwindow.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -491,10 +497,12 @@ QPlatformScreen *QPlatformWindow::screenForGeometry(const QRect &newGeometry) co
         center = mapToGlobal(center - newGeometry.topLeft());
 
     if (!parent() && currentScreen && !currentScreen->geometry().contains(center)) {
-        Q_FOREACH (QPlatformScreen* screen, currentScreen->virtualSiblings()) {
-            if (screen->geometry().contains(center))
+        const auto screens = currentScreen->virtualSiblings();
+        for (QPlatformScreen *screen : screens) {
+            const QRect screenGeometry = screen->geometry();
+            if (screenGeometry.contains(center))
                 return screen;
-            if (screen->geometry().intersects(newGeometry))
+            if (screenGeometry.intersects(newGeometry))
                 fallback = screen;
         }
     }
@@ -546,13 +554,14 @@ static inline const QScreen *effectiveScreen(const QWindow *window)
     const QScreen *screen = window->screen();
     if (!screen)
         return QGuiApplication::primaryScreen();
-    const QList<QScreen *> siblings = screen->virtualSiblings();
 #ifndef QT_NO_CURSOR
+    const QList<QScreen *> siblings = screen->virtualSiblings();
     if (siblings.size() > 1) {
         const QPoint referencePoint = window->transientParent() ? window->transientParent()->geometry().center() : QCursor::pos();
-        foreach (const QScreen *sibling, siblings)
+        for (const QScreen *sibling : siblings) {
             if (sibling->geometry().contains(referencePoint))
                 return sibling;
+        }
     }
 #endif
     return screen;
diff --git a/src/gui/kernel/qplatformwindow.h b/src/gui/kernel/qplatformwindow.h
index 850e2b4bfe..b2a19dd3d9 100644
--- a/src/gui/kernel/qplatformwindow.h
+++ b/src/gui/kernel/qplatformwindow.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qplatformwindow_p.h b/src/gui/kernel/qplatformwindow_p.h
index 2205085cf4..dc76adca86 100644
--- a/src/gui/kernel/qplatformwindow_p.h
+++ b/src/gui/kernel/qplatformwindow_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qrasterwindow.cpp b/src/gui/kernel/qrasterwindow.cpp
index fc1739ca0e..d8d448249e 100644
--- a/src/gui/kernel/qrasterwindow.cpp
+++ b/src/gui/kernel/qrasterwindow.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
  **
- ** Copyright (C) 2015 The Qt Company Ltd.
- ** Contact: http://www.qt.io/licensing/
+ ** Copyright (C) 2016 The Qt Company Ltd.
+ ** Contact: https://www.qt.io/licensing/
  **
  ** This file is part of the QtGui module of the Qt Toolkit.
  **
- ** $QT_BEGIN_LICENSE:LGPL21$
+ ** $QT_BEGIN_LICENSE:LGPL$
  ** Commercial License Usage
  ** 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 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.
+ ** and conditions see https://www.qt.io/terms-conditions. For further
+ ** information use the contact form at https://www.qt.io/contact-us.
  **
  ** 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 or version 3 as published by the Free
- ** Software Foundation and appearing in the file LICENSE.LGPLv21 and
- ** LICENSE.LGPLv3 included in the packaging of this file. Please review the
- ** following information to ensure the GNU Lesser General Public License
- ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
- ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+ ** General Public License version 3 as published by the Free Software
+ ** Foundation and appearing in the file LICENSE.LGPL3 included in the
+ ** packaging of this file. Please review the following information to
+ ** ensure the GNU Lesser General Public License version 3 requirements
+ ** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
  **
- ** 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.
+ ** GNU General Public License Usage
+ ** Alternatively, this file may be used under the terms of the GNU
+ ** General Public License version 2.0 or (at your option) the GNU General
+ ** Public license version 3 or any later version approved by the KDE Free
+ ** Qt Foundation. The licenses are as published by the Free Software
+ ** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+ ** included in the packaging of this file. Please review the following
+ ** information to ensure the GNU General Public License requirements will
+ ** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+ ** https://www.gnu.org/licenses/gpl-3.0.html.
  **
  ** $QT_END_LICENSE$
  **
@@ -67,8 +73,9 @@ public:
     void beginPaint(const QRegion &region) Q_DECL_OVERRIDE
     {
         Q_Q(QRasterWindow);
-        if (backingstore->size() != q->size()) {
-            backingstore->resize(q->size());
+        const QSize size = q->size();
+        if (backingstore->size() != size) {
+            backingstore->resize(size);
             markWindowAsDirty();
         }
         backingstore->beginPaint(region);
diff --git a/src/gui/kernel/qrasterwindow.h b/src/gui/kernel/qrasterwindow.h
index 6db6baa8f5..915aea598f 100644
--- a/src/gui/kernel/qrasterwindow.h
+++ b/src/gui/kernel/qrasterwindow.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp
index e87f58d735..bc4a25a65f 100644
--- a/src/gui/kernel/qscreen.cpp
+++ b/src/gui/kernel/qscreen.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -117,7 +123,8 @@ QScreen::~QScreen()
     bool movingFromVirtualSibling = primaryScreen && primaryScreen->handle()->virtualSiblings().contains(handle());
 
     // Move any leftover windows to the primary screen
-    foreach (QWindow *window, QGuiApplication::allWindows()) {
+    const auto allWindows = QGuiApplication::allWindows();
+    for (QWindow *window : allWindows) {
         if (!window->isTopLevel() || window->screen() != this)
             continue;
 
@@ -358,10 +365,10 @@ QRect QScreen::availableGeometry() const
 QList<QScreen *> QScreen::virtualSiblings() const
 {
     Q_D(const QScreen);
-    QList<QPlatformScreen *> platformScreens = d->platformScreen->virtualSiblings();
+    const QList<QPlatformScreen *> platformScreens = d->platformScreen->virtualSiblings();
     QList<QScreen *> screens;
     screens.reserve(platformScreens.count());
-    foreach (QPlatformScreen *platformScreen, platformScreens)
+    for (QPlatformScreen *platformScreen : platformScreens)
         screens << platformScreen->screen();
     return screens;
 }
@@ -394,7 +401,8 @@ QSize QScreen::virtualSize() const
 QRect QScreen::virtualGeometry() const
 {
     QRect result;
-    foreach (QScreen *screen, virtualSiblings())
+    const auto screens = virtualSiblings();
+    for (QScreen *screen : screens)
         result |= screen->geometry();
     return result;
 }
@@ -427,7 +435,8 @@ QSize QScreen::availableVirtualSize() const
 QRect QScreen::availableVirtualGeometry() const
 {
     QRect result;
-    foreach (QScreen *screen, virtualSiblings())
+    const auto screens = virtualSiblings();
+    for (QScreen *screen : screens)
         result |= screen->availableGeometry();
     return result;
 }
diff --git a/src/gui/kernel/qscreen.h b/src/gui/kernel/qscreen.h
index a6018128e2..af4e8f4760 100644
--- a/src/gui/kernel/qscreen.h
+++ b/src/gui/kernel/qscreen.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h
index 4492eddd45..544c29a18f 100644
--- a/src/gui/kernel/qscreen_p.h
+++ b/src/gui/kernel/qscreen_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qsessionmanager.cpp b/src/gui/kernel/qsessionmanager.cpp
index c6d23f163c..493a321c74 100644
--- a/src/gui/kernel/qsessionmanager.cpp
+++ b/src/gui/kernel/qsessionmanager.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qsessionmanager.h b/src/gui/kernel/qsessionmanager.h
index 36aa391252..54c278afbf 100644
--- a/src/gui/kernel/qsessionmanager.h
+++ b/src/gui/kernel/qsessionmanager.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qsessionmanager_p.h b/src/gui/kernel/qsessionmanager_p.h
index 894996242b..982fc801ff 100644
--- a/src/gui/kernel/qsessionmanager_p.h
+++ b/src/gui/kernel/qsessionmanager_p.h
@@ -1,32 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Samuel Gaist <samuel.gaist@edeltech.ch>
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qshapedpixmapdndwindow.cpp b/src/gui/kernel/qshapedpixmapdndwindow.cpp
index 7764dfc0a3..b54c6b67a2 100644
--- a/src/gui/kernel/qshapedpixmapdndwindow.cpp
+++ b/src/gui/kernel/qshapedpixmapdndwindow.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qshapedpixmapdndwindow_p.h b/src/gui/kernel/qshapedpixmapdndwindow_p.h
index f2d678c1b4..21cecba9e8 100644
--- a/src/gui/kernel/qshapedpixmapdndwindow_p.h
+++ b/src/gui/kernel/qshapedpixmapdndwindow_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
index 3941f7233f..6c19eab287 100644
--- a/src/gui/kernel/qshortcutmap.cpp
+++ b/src/gui/kernel/qshortcutmap.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -83,6 +89,7 @@ struct QShortcutEntry
     QObject *owner;
     QShortcutMap::ContextMatcher contextMatcher;
 };
+Q_DECLARE_TYPEINFO(QShortcutEntry, Q_MOVABLE_TYPE);
 
 #ifdef Dump_QShortcutMap
 /*! \internal
@@ -117,7 +124,7 @@ public:
     }
     QShortcutMap *q_ptr;                        // Private's parent
 
-    QList<QShortcutEntry> sequences;            // All sequences!
+    QVector<QShortcutEntry> sequences;          // All sequences!
 
     int currentId;                              // Global shortcut ID number
     int ambigCount;                             // Index of last enabled ambiguous dispatch
@@ -156,7 +163,7 @@ int QShortcutMap::addShortcut(QObject *owner, const QKeySequence &key, Qt::Short
     Q_D(QShortcutMap);
 
     QShortcutEntry newEntry(owner, key, context, --(d->currentId), true, matcher);
-    QList<QShortcutEntry>::iterator it = std::upper_bound(d->sequences.begin(), d->sequences.end(), newEntry);
+    const auto it = std::upper_bound(d->sequences.begin(), d->sequences.end(), newEntry);
     d->sequences.insert(it, newEntry); // Insert sorted
 #if defined(DEBUG_QSHORTCUTMAP)
     qDebug().nospace()
@@ -184,7 +191,7 @@ int QShortcutMap::removeShortcut(int id, QObject *owner, const QKeySequence &key
     bool allIds = id == 0;
 
     // Special case, remove everything
-    if (allOwners && allKeys && id == 0) {
+    if (allOwners && allKeys && allIds) {
         itemsRemoved = d->sequences.size();
         d->sequences.clear();
         return itemsRemoved;
@@ -346,9 +353,9 @@ bool QShortcutMap::tryShortcut(QKeyEvent *e)
         // shouldn't say that we handled the event.
         return identicalMatches > 0;
     }
-    default:
-        Q_UNREACHABLE();
     }
+    Q_UNREACHABLE();
+    return false;
 }
 
 /*! \internal
@@ -368,7 +375,7 @@ QKeySequence::SequenceMatch QShortcutMap::nextState(QKeyEvent *e)
     QKeySequence::SequenceMatch result = QKeySequence::NoMatch;
 
     // We start fresh each time..
-    d->identicals.resize(0);
+    d->identicals.clear();
 
     result = find(e);
     if (result == QKeySequence::NoMatch && (e->modifiers() & Qt::KeypadModifier)) {
@@ -402,8 +409,8 @@ bool QShortcutMap::hasShortcutForKeySequence(const QKeySequence &seq) const
 {
     Q_D(const QShortcutMap);
     QShortcutEntry entry(seq); // needed for searching
-    QList<QShortcutEntry>::ConstIterator itEnd = d->sequences.constEnd();
-    QList<QShortcutEntry>::ConstIterator it = std::lower_bound(d->sequences.constBegin(), itEnd, entry);
+    const auto itEnd = d->sequences.cend();
+    auto it = std::lower_bound(d->sequences.cbegin(), itEnd, entry);
 
     for (;it != itEnd; ++it) {
         if (matches(entry.keyseq, (*it).keyseq) == QKeySequence::ExactMatch && (*it).correctContext() && (*it).enabled) {
@@ -441,7 +448,7 @@ QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e, int ignoredModifier
     }
 
     // Looking for new identicals, scrap old
-    d->identicals.resize(0);
+    d->identicals.clear();
 
     bool partialFound = false;
     bool identicalDisabledFound = false;
@@ -449,9 +456,8 @@ QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e, int ignoredModifier
     int result = QKeySequence::NoMatch;
     for (int i = d->newEntries.count()-1; i >= 0 ; --i) {
         QShortcutEntry entry(d->newEntries.at(i)); // needed for searching
-        QList<QShortcutEntry>::ConstIterator itEnd = d->sequences.constEnd();
-        QList<QShortcutEntry>::ConstIterator it =
-             std::lower_bound(d->sequences.constBegin(), itEnd, entry);
+        const auto itEnd = d->sequences.constEnd();
+        auto it = std::lower_bound(d->sequences.constBegin(), itEnd, entry);
 
         int oneKSResult = QKeySequence::NoMatch;
         int tempRes = QKeySequence::NoMatch;
diff --git a/src/gui/kernel/qshortcutmap_p.h b/src/gui/kernel/qshortcutmap_p.h
index 16542b078a..f513863e5b 100644
--- a/src/gui/kernel/qshortcutmap_p.h
+++ b/src/gui/kernel/qshortcutmap_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp
index 00589d2303..a6ce04dc34 100644
--- a/src/gui/kernel/qsimpledrag.cpp
+++ b/src/gui/kernel/qsimpledrag.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -192,6 +198,14 @@ Qt::DropAction QBasicDrag::drag(QDrag *o)
     return m_executed_drop_action;
 }
 
+void QBasicDrag::cancelDrag()
+{
+    if (m_eventLoop) {
+        cancel();
+        m_eventLoop->quit();
+    }
+}
+
 void QBasicDrag::restoreCursor()
 {
     if (m_restoreCursor) {
diff --git a/src/gui/kernel/qsimpledrag_p.h b/src/gui/kernel/qsimpledrag_p.h
index b208c8ccc9..8924b4d08f 100644
--- a/src/gui/kernel/qsimpledrag_p.h
+++ b/src/gui/kernel/qsimpledrag_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -66,6 +72,7 @@ public:
     virtual ~QBasicDrag();
 
     virtual Qt::DropAction drag(QDrag *drag) Q_DECL_OVERRIDE;
+    void cancelDrag() Q_DECL_OVERRIDE;
 
     virtual bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE;
 
diff --git a/src/gui/kernel/qstylehints.cpp b/src/gui/kernel/qstylehints.cpp
index 7fc89112e6..ecc2886a04 100644
--- a/src/gui/kernel/qstylehints.cpp
+++ b/src/gui/kernel/qstylehints.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -48,7 +54,7 @@ static inline QVariant themeableHint(QPlatformTheme::ThemeHint th,
                                      QPlatformIntegration::StyleHint ih)
 {
     if (!QCoreApplication::instance()) {
-        qWarning() << "Must construct a QGuiApplication before accessing a platform theme hint.";
+        qWarning("Must construct a QGuiApplication before accessing a platform theme hint.");
         return QVariant();
     }
     if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) {
@@ -65,17 +71,21 @@ class QStyleHintsPrivate : public QObjectPrivate
 public:
     inline QStyleHintsPrivate()
         : m_mouseDoubleClickInterval(-1)
+        , m_mousePressAndHoldInterval(-1)
         , m_startDragDistance(-1)
         , m_startDragTime(-1)
         , m_keyboardInputInterval(-1)
         , m_cursorFlashTime(-1)
+        , m_tabFocusBehavior(-1)
         {}
 
     int m_mouseDoubleClickInterval;
+    int m_mousePressAndHoldInterval;
     int m_startDragDistance;
     int m_startDragTime;
     int m_keyboardInputInterval;
     int m_cursorFlashTime;
+    int m_tabFocusBehavior;
 };
 
 /*!
@@ -129,6 +139,21 @@ int QStyleHints::mouseDoubleClickInterval() const
 }
 
 /*!
+    Sets the \a mousePressAndHoldInterval.
+    \internal
+    \sa mousePressAndHoldInterval()
+    \since 5.7
+*/
+void QStyleHints::setMousePressAndHoldInterval(int mousePressAndHoldInterval)
+{
+    Q_D(QStyleHints);
+    if (d->m_mousePressAndHoldInterval == mousePressAndHoldInterval)
+        return;
+    d->m_mousePressAndHoldInterval = mousePressAndHoldInterval;
+    emit mousePressAndHoldIntervalChanged(mousePressAndHoldInterval);
+}
+
+/*!
     \property QStyleHints::mousePressAndHoldInterval
     \brief the time limit in milliseconds that activates
     a press and hold.
@@ -137,7 +162,10 @@ int QStyleHints::mouseDoubleClickInterval() const
 */
 int QStyleHints::mousePressAndHoldInterval() const
 {
-    return themeableHint(QPlatformTheme::MousePressAndHoldInterval, QPlatformIntegration::MousePressAndHoldInterval).toInt();
+    Q_D(const QStyleHints);
+    return d->m_mousePressAndHoldInterval >= 0 ?
+           d->m_mousePressAndHoldInterval :
+           themeableHint(QPlatformTheme::MousePressAndHoldInterval, QPlatformIntegration::MousePressAndHoldInterval).toInt();
 }
 
 /*!
@@ -390,7 +418,25 @@ bool QStyleHints::setFocusOnTouchRelease() const
 
 Qt::TabFocusBehavior QStyleHints::tabFocusBehavior() const
 {
-    return Qt::TabFocusBehavior(themeableHint(QPlatformTheme::TabFocusBehavior, QPlatformIntegration::TabFocusBehavior).toInt());
+    Q_D(const QStyleHints);
+    return Qt::TabFocusBehavior(d->m_tabFocusBehavior >= 0 ?
+                                d->m_tabFocusBehavior :
+                                themeableHint(QPlatformTheme::TabFocusBehavior, QPlatformIntegration::TabFocusBehavior).toInt());
+}
+
+/*!
+    Sets the \a tabFocusBehavior.
+    \internal
+    \sa tabFocusBehavior()
+    \since 5.7
+*/
+void QStyleHints::setTabFocusBehavior(Qt::TabFocusBehavior tabFocusBehavior)
+{
+    Q_D(QStyleHints);
+    if (d->m_tabFocusBehavior == tabFocusBehavior)
+        return;
+    d->m_tabFocusBehavior = tabFocusBehavior;
+    emit tabFocusBehaviorChanged(tabFocusBehavior);
 }
 
 /*!
diff --git a/src/gui/kernel/qstylehints.h b/src/gui/kernel/qstylehints.h
index c5b8241e07..0b07e60579 100644
--- a/src/gui/kernel/qstylehints.h
+++ b/src/gui/kernel/qstylehints.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -51,7 +57,7 @@ class Q_GUI_EXPORT QStyleHints : public QObject
     Q_PROPERTY(int keyboardAutoRepeatRate READ keyboardAutoRepeatRate STORED false CONSTANT FINAL)
     Q_PROPERTY(int keyboardInputInterval READ keyboardInputInterval NOTIFY keyboardInputIntervalChanged FINAL)
     Q_PROPERTY(int mouseDoubleClickInterval READ mouseDoubleClickInterval NOTIFY mouseDoubleClickIntervalChanged FINAL)
-    Q_PROPERTY(int mousePressAndHoldInterval READ mousePressAndHoldInterval STORED false CONSTANT FINAL)
+    Q_PROPERTY(int mousePressAndHoldInterval READ mousePressAndHoldInterval NOTIFY mousePressAndHoldIntervalChanged FINAL)
     Q_PROPERTY(QChar passwordMaskCharacter READ passwordMaskCharacter STORED false CONSTANT FINAL)
     Q_PROPERTY(int passwordMaskDelay READ passwordMaskDelay STORED false CONSTANT FINAL)
     Q_PROPERTY(bool setFocusOnTouchRelease READ setFocusOnTouchRelease STORED false CONSTANT FINAL)
@@ -61,12 +67,13 @@ class Q_GUI_EXPORT QStyleHints : public QObject
     Q_PROPERTY(int startDragTime READ startDragTime NOTIFY startDragTimeChanged FINAL)
     Q_PROPERTY(int startDragVelocity READ startDragVelocity STORED false CONSTANT FINAL)
     Q_PROPERTY(bool useRtlExtensions READ useRtlExtensions STORED false CONSTANT FINAL)
-    Q_PROPERTY(Qt::TabFocusBehavior tabFocusBehavior READ tabFocusBehavior STORED false CONSTANT FINAL)
+    Q_PROPERTY(Qt::TabFocusBehavior tabFocusBehavior READ tabFocusBehavior NOTIFY tabFocusBehaviorChanged FINAL)
     Q_PROPERTY(bool singleClickActivation READ singleClickActivation STORED false CONSTANT FINAL)
 
 public:
     void setMouseDoubleClickInterval(int mouseDoubleClickInterval);
     int mouseDoubleClickInterval() const;
+    void setMousePressAndHoldInterval(int mousePressAndHoldInterval);
     int mousePressAndHoldInterval() const;
     void setStartDragDistance(int startDragDistance);
     int startDragDistance() const;
@@ -86,14 +93,17 @@ public:
     bool useRtlExtensions() const;
     bool setFocusOnTouchRelease() const;
     Qt::TabFocusBehavior tabFocusBehavior() const;
+    void setTabFocusBehavior(Qt::TabFocusBehavior tabFocusBehavior);
     bool singleClickActivation() const;
 
 Q_SIGNALS:
     void cursorFlashTimeChanged(int cursorFlashTime);
     void keyboardInputIntervalChanged(int keyboardInputInterval);
     void mouseDoubleClickIntervalChanged(int mouseDoubleClickInterval);
+    void mousePressAndHoldIntervalChanged(int mousePressAndHoldInterval);
     void startDragDistanceChanged(int startDragDistance);
     void startDragTimeChanged(int startDragTime);
+    void tabFocusBehaviorChanged(Qt::TabFocusBehavior tabFocusBehavior);
 
 private:
     friend class QGuiApplication;
diff --git a/src/gui/kernel/qsurface.cpp b/src/gui/kernel/qsurface.cpp
index 70cefd2cde..afe4cf93e1 100644
--- a/src/gui/kernel/qsurface.cpp
+++ b/src/gui/kernel/qsurface.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qsurface.h b/src/gui/kernel/qsurface.h
index 53ede202a2..86b800a6db 100644
--- a/src/gui/kernel/qsurface.h
+++ b/src/gui/kernel/qsurface.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp
index d19690891f..000d727380 100644
--- a/src/gui/kernel/qsurfaceformat.cpp
+++ b/src/gui/kernel/qsurfaceformat.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -278,11 +284,8 @@ QSurfaceFormat::~QSurfaceFormat()
 void QSurfaceFormat::setStereo(bool enable)
 {
     QSurfaceFormat::FormatOptions newOptions = d->opts;
-    if (enable) {
-        newOptions |= QSurfaceFormat::StereoBuffers;
-    } else {
-        newOptions &= ~QSurfaceFormat::StereoBuffers;
-    }
+    newOptions.setFlag(QSurfaceFormat::StereoBuffers, enable);
+
     if (int(newOptions) != int(d->opts)) {
         detach();
         d->opts = newOptions;
diff --git a/src/gui/kernel/qsurfaceformat.h b/src/gui/kernel/qsurfaceformat.h
index c68e585371..9e8bcc91a7 100644
--- a/src/gui/kernel/qsurfaceformat.h
+++ b/src/gui/kernel/qsurfaceformat.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qt_gui_pch.h b/src/gui/kernel/qt_gui_pch.h
index 02a9649b9a..8d1455f6c8 100644
--- a/src/gui/kernel/qt_gui_pch.h
+++ b/src/gui/kernel/qt_gui_pch.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qtouchdevice.cpp b/src/gui/kernel/qtouchdevice.cpp
index 266b5308a2..97cc8d179d 100644
--- a/src/gui/kernel/qtouchdevice.cpp
+++ b/src/gui/kernel/qtouchdevice.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qtouchdevice.h b/src/gui/kernel/qtouchdevice.h
index 1c1fcc63aa..243f53d4ca 100644
--- a/src/gui/kernel/qtouchdevice.h
+++ b/src/gui/kernel/qtouchdevice.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qtouchdevice_p.h b/src/gui/kernel/qtouchdevice_p.h
index 63b83d33ec..b42b0507d9 100644
--- a/src/gui/kernel/qtouchdevice_p.h
+++ b/src/gui/kernel/qtouchdevice_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 2ff19f5175..a20f4329b1 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -214,7 +220,7 @@ void QWindowPrivate::init()
 
     // If your application aborts here, you are probably creating a QWindow
     // before the screen list is populated.
-    if (!parentWindow && !topLevelScreen) {
+    if (Q_UNLIKELY(!parentWindow && !topLevelScreen)) {
         qFatal("Cannot create window: no screens available");
         exit(1);
     }
@@ -361,7 +367,7 @@ void QWindowPrivate::emitScreenChangedRecursion(QScreen *newScreen)
 {
     Q_Q(QWindow);
     emit q->screenChanged(newScreen);
-    foreach (QObject *child, q->children()) {
+    for (QObject *child : q->children()) {
         if (child->isWindowType())
             static_cast<QWindow *>(child)->d_func()->emitScreenChangedRecursion(newScreen);
     }
@@ -394,8 +400,11 @@ void QWindowPrivate::create(bool recursive)
     if (platformWindow)
         return;
 
+    if (q->parent())
+        q->parent()->create();
+
     platformWindow = QGuiApplicationPrivate::platformIntegration()->createPlatformWindow(q);
-    Q_ASSERT(platformWindow);
+    Q_ASSERT(platformWindow || q->type() == Qt::ForeignWindow);
 
     if (!platformWindow) {
         qWarning() << "Failed to create platform window for" << q << "with flags" << q->flags();
@@ -405,13 +414,21 @@ void QWindowPrivate::create(bool recursive)
     QObjectList childObjects = q->children();
     for (int i = 0; i < childObjects.size(); i ++) {
         QObject *object = childObjects.at(i);
-        if (object->isWindowType()) {
-            QWindow *window = static_cast<QWindow *>(object);
-            if (recursive)
-                window->d_func()->create(true);
-            if (window->d_func()->platformWindow)
-                window->d_func()->platformWindow->setParent(platformWindow);
-        }
+        if (!object->isWindowType())
+            continue;
+
+        QWindow *childWindow = static_cast<QWindow *>(object);
+        if (recursive)
+            childWindow->d_func()->create(recursive);
+
+        // The child may have had deferred creation due to this window not being created
+        // at the time setVisible was called, so we re-apply the visible state, which
+        // may result in creating the child, and emitting the appropriate signals.
+        if (childWindow->isVisible())
+            childWindow->setVisible(true);
+
+        if (QPlatformWindow *childPlatformWindow = childWindow->d_func()->platformWindow)
+            childPlatformWindow->setParent(this->platformWindow);
     }
 
     QPlatformSurfaceEvent e(QPlatformSurfaceEvent::SurfaceCreated);
@@ -476,14 +493,23 @@ void QWindow::setVisible(bool visible)
 {
     Q_D(QWindow);
 
-    if (d->visible == visible)
+    if (d->visible != visible) {
+        d->visible = visible;
+        emit visibleChanged(visible);
+        d->updateVisibility();
+    } else if (d->platformWindow) {
+        // Visibility hasn't changed, and the platform window is in sync
         return;
-    d->visible = visible;
-    emit visibleChanged(visible);
-    d->updateVisibility();
+    }
 
-    if (!d->platformWindow)
-        create();
+    if (!d->platformWindow) {
+        // If we have a parent window, but the parent hasn't been created yet, we
+        // can defer creation until the parent is created or we're re-parented.
+        if (parent() && !parent()->handle())
+            return;
+        else
+            create();
+    }
 
     if (visible) {
         // remove posted quit events when showing a new window
@@ -522,6 +548,7 @@ void QWindow::setVisible(bool visible)
     if (visible && (d->hasCursor || QGuiApplication::overrideCursor()))
         d->applyCursor();
 #endif
+
     d->platformWindow->setVisible(visible);
 
     if (!visible) {
@@ -618,12 +645,17 @@ void QWindow::setParent(QWindow *parent)
     else
         d->connectToScreen(newScreen);
 
+    // If we were set visible, but not created because we were a child, and we're now
+    // re-parented into a created parent, or to being a top level, we need re-apply the
+    // visibility state, which will also create.
+    if (isVisible() && (!parent || parent->handle()))
+        setVisible(true);
+
     if (d->platformWindow) {
-        if (parent && parent->d_func()->platformWindow) {
-            d->platformWindow->setParent(parent->d_func()->platformWindow);
-        } else {
-            d->platformWindow->setParent(0);
-        }
+        if (parent)
+            parent->create();
+
+        d->platformWindow->setParent(parent ? parent->d_func()->platformWindow : 0);
     }
 
     QGuiApplicationPrivate::updateBlockedStatus(this);
@@ -972,7 +1004,7 @@ QRegion QWindow::mask() const
 /*!
     Requests the window to be activated, i.e. receive keyboard focus.
 
-    \sa isActive(), QGuiApplication::focusWindow()
+    \sa isActive(), QGuiApplication::focusWindow(), QWindowsWindowFunctions::setWindowActivationBehavior()
 */
 void QWindow::requestActivate()
 {
@@ -1115,7 +1147,7 @@ qreal QWindow::devicePixelRatio() const
 void QWindow::setWindowState(Qt::WindowState state)
 {
     if (state == Qt::WindowActive) {
-        qWarning() << "QWindow::setWindowState does not accept Qt::WindowActive";
+        qWarning("QWindow::setWindowState does not accept Qt::WindowActive");
         return;
     }
 
@@ -1439,9 +1471,9 @@ void QWindow::setGeometry(const QRect &rect)
 {
     Q_D(QWindow);
     d->positionAutomatic = false;
-    if (rect == geometry())
+    const QRect oldRect = geometry();
+    if (rect == oldRect)
         return;
-    QRect oldRect = geometry();
 
     d->positionPolicy = QWindowPrivate::WindowFrameExclusive;
     if (d->platformWindow) {
@@ -1479,7 +1511,8 @@ QScreen *QWindowPrivate::screenForGeometry(const QRect &newGeometry)
     QScreen *fallback = currentScreen;
     QPoint center = newGeometry.center();
     if (!q->parent() && currentScreen && !currentScreen->geometry().contains(center)) {
-        Q_FOREACH (QScreen* screen, currentScreen->virtualSiblings()) {
+        const auto screens = currentScreen->virtualSiblings();
+        for (QScreen* screen : screens) {
             if (screen->geometry().contains(center))
                 return screen;
             if (screen->geometry().intersects(newGeometry))
@@ -1656,8 +1689,10 @@ void QWindow::destroy()
         QGuiApplicationPrivate::currentMouseWindow = parent();
     if (QGuiApplicationPrivate::currentMousePressWindow == this)
         QGuiApplicationPrivate::currentMousePressWindow = parent();
-    if (QGuiApplicationPrivate::tabletPressTarget == this)
-        QGuiApplicationPrivate::tabletPressTarget = parent();
+
+    for (int i = 0; i < QGuiApplicationPrivate::tabletDevicePoints.size(); ++i)
+        if (QGuiApplicationPrivate::tabletDevicePoints.at(i).target == this)
+            QGuiApplicationPrivate::tabletDevicePoints[i].target = parent();
 
     bool wasVisible = isVisible();
     d->visibilityOnDestroy = wasVisible && d->platformWindow;
@@ -2402,7 +2437,8 @@ QWindow *QWindowPrivate::topLevelWindow() const
     This can be used, on platforms which support it, to embed a QWindow inside a
     native window, or to embed a native window inside a QWindow.
 
-    If foreign windows are not supported, this function returns 0.
+    If foreign windows are not supported or embedding the native window
+    failed in the platform plugin, this function returns 0.
 
     \note The resulting QWindow should not be used to manipulate the underlying
     native window (besides re-parenting), or to observe state changes of the
@@ -2415,7 +2451,7 @@ QWindow *QWindowPrivate::topLevelWindow() const
 QWindow *QWindow::fromWinId(WId id)
 {
     if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ForeignWindows)) {
-        qWarning() << "QWindow::fromWinId(): platform plugin does not support foreign windows.";
+        qWarning("QWindow::fromWinId(): platform plugin does not support foreign windows.");
         return 0;
     }
 
@@ -2423,6 +2459,10 @@ QWindow *QWindow::fromWinId(WId id)
     window->setFlags(Qt::ForeignWindow);
     window->setProperty("_q_foreignWinId", QVariant::fromValue(id));
     window->create();
+    if (!window->handle()) {
+        delete window;
+        return nullptr;
+    }
     return window;
 }
 
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index b29e7aaae7..06bd788262 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h
index 6880edaada..4020376feb 100644
--- a/src/gui/kernel/qwindow_p.h
+++ b/src/gui/kernel/qwindow_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -119,8 +125,14 @@ public:
     QPoint globalPosition() const {
         Q_Q(const QWindow);
         QPoint offset = q->position();
-        for (const QWindow *p = q->parent(); p; p = p->parent())
-            offset += p->position();
+        for (const QWindow *p = q->parent(); p; p = p->parent()) {
+            if (p->type() != Qt::ForeignWindow) {
+                offset += p->position();
+            } else { // QTBUG-43252, mapToGlobal() for foreign children.
+                offset += p->mapToGlobal(QPoint(0, 0));
+                break;
+            }
+        }
         return offset;
     }
 
diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h
index f9df68edb9..fb6b1831af 100644
--- a/src/gui/kernel/qwindowdefs.h
+++ b/src/gui/kernel/qwindowdefs.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qwindowdefs_win.h b/src/gui/kernel/qwindowdefs_win.h
index 6308977802..d1000856bb 100644
--- a/src/gui/kernel/qwindowdefs_win.h
+++ b/src/gui/kernel/qwindowdefs_win.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp
index f1c43110e3..1b7edb1278 100644
--- a/src/gui/kernel/qwindowsysteminterface.cpp
+++ b/src/gui/kernel/qwindowsysteminterface.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -48,6 +54,7 @@ QT_BEGIN_NAMESPACE
 
 QElapsedTimer QWindowSystemInterfacePrivate::eventTime;
 bool QWindowSystemInterfacePrivate::synchronousWindowSystemEvents = false;
+bool QWindowSystemInterfacePrivate::TabletEvent::platformSynthesizesMouse = true;
 QWaitCondition QWindowSystemInterfacePrivate::eventsFlushed;
 QMutex QWindowSystemInterfacePrivate::flushEventMutex;
 QAtomicInt QWindowSystemInterfacePrivate::eventAccepted;
@@ -309,11 +316,9 @@ void QWindowSystemInterface::handleWheelEvent(QWindow *w, const QPointF & local,
     handleWheelEvent(w, time, local, global, pixelDelta, angleDelta, mods, phase, source);
 }
 
-void QWindowSystemInterface::handleWheelEvent(QWindow *tlw, ulong timestamp, const QPointF & local, const QPointF & global, QPoint pixelDelta, QPoint angleDelta, Qt::KeyboardModifiers mods, Qt::ScrollPhase phase, Qt::MouseEventSource source)
+void QWindowSystemInterface::handleWheelEvent(QWindow *tlw, ulong timestamp, const QPointF & local, const QPointF & global, QPoint pixelDelta, QPoint angleDelta, Qt::KeyboardModifiers mods, Qt::ScrollPhase phase,
+                                              Qt::MouseEventSource source, bool invertedScrolling)
 {
-    if (!QGuiApplicationPrivate::scrollNoPhaseAllowed && phase == Qt::NoScrollPhase)
-        phase = Qt::ScrollUpdate;
-
     // Qt 4 sends two separate wheel events for horizontal and vertical
     // deltas. For Qt 5 we want to send the deltas in one event, but at the
     // same time preserve source and behavior compatibility with Qt 4.
@@ -330,14 +335,15 @@ void QWindowSystemInterface::handleWheelEvent(QWindow *tlw, ulong timestamp, con
 
     // Simple case: vertical deltas only:
     if (angleDelta.y() != 0 && angleDelta.x() == 0) {
-        e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromNativeLocalPosition(local, tlw), QHighDpi::fromNativePixels(global, tlw), pixelDelta, angleDelta, angleDelta.y(), Qt::Vertical, mods, phase, source);
+        e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromNativeLocalPosition(local, tlw), QHighDpi::fromNativePixels(global, tlw), pixelDelta, angleDelta, angleDelta.y(), Qt::Vertical,
+                                                          mods, phase, source, invertedScrolling);
         QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
         return;
     }
 
     // Simple case: horizontal deltas only:
     if (angleDelta.y() == 0 && angleDelta.x() != 0) {
-        e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromNativeLocalPosition(local, tlw), QHighDpi::fromNativePixels(global, tlw), pixelDelta, angleDelta, angleDelta.x(), Qt::Horizontal, mods, phase, source);
+        e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromNativeLocalPosition(local, tlw), QHighDpi::fromNativePixels(global, tlw), pixelDelta, angleDelta, angleDelta.x(), Qt::Horizontal, mods, phase, source, invertedScrolling);
         QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
         return;
     }
@@ -345,12 +351,12 @@ void QWindowSystemInterface::handleWheelEvent(QWindow *tlw, ulong timestamp, con
     // Both horizontal and vertical deltas: Send two wheel events.
     // The first event contains the Qt 5 pixel and angle delta as points,
     // and in addition the Qt 4 compatibility vertical angle delta.
-    e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromNativeLocalPosition(local, tlw), QHighDpi::fromNativePixels(global, tlw), pixelDelta, angleDelta, angleDelta.y(), Qt::Vertical, mods, phase, source);
+    e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromNativeLocalPosition(local, tlw), QHighDpi::fromNativePixels(global, tlw), pixelDelta, angleDelta, angleDelta.y(), Qt::Vertical, mods, phase, source, invertedScrolling);
     QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
 
     // The second event contains null pixel and angle points and the
     // Qt 4 compatibility horizontal angle delta.
-    e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromNativeLocalPosition(local, tlw), QHighDpi::fromNativePixels(global, tlw), QPoint(), QPoint(), angleDelta.x(), Qt::Horizontal, mods, phase, source);
+    e = new QWindowSystemInterfacePrivate::WheelEvent(tlw, timestamp, QHighDpi::fromNativeLocalPosition(local, tlw), QHighDpi::fromNativePixels(global, tlw), QPoint(), QPoint(), angleDelta.x(), Qt::Horizontal, mods, phase, source, invertedScrolling);
     QWindowSystemInterfacePrivate::handleWindowSystemEvent(e);
 }
 
@@ -506,7 +512,7 @@ QList<QWindowSystemInterface::TouchPoint>
 {
     QList<QWindowSystemInterface::TouchPoint> newList;
     newList.reserve(pointList.size());
-    foreach (const QTouchEvent::TouchPoint &pt, pointList) {
+    for (const QTouchEvent::TouchPoint &pt : pointList) {
         QWindowSystemInterface::TouchPoint p;
         p.id = pt.id();
         p.flags = pt.flags();
@@ -939,12 +945,15 @@ bool QWindowSystemEventHandler::sendEvent(QWindowSystemInterfacePrivate::WindowS
 }
 
 QWindowSystemInterfacePrivate::WheelEvent::WheelEvent(QWindow *w, ulong time, const QPointF &local, const QPointF &global, QPoint pixelD,
-        QPoint angleD, int qt4D, Qt::Orientation qt4O, Qt::KeyboardModifiers mods, Qt::ScrollPhase phase, Qt::MouseEventSource src)
+        QPoint angleD, int qt4D, Qt::Orientation qt4O, Qt::KeyboardModifiers mods, Qt::ScrollPhase phase, Qt::MouseEventSource src, bool inverted)
     : InputEvent(w, time, Wheel, mods), pixelDelta(pixelD), angleDelta(angleD), qt4Delta(qt4D),
-      qt4Orientation(qt4O), localPos(local), globalPos(global),
-      phase(!QGuiApplicationPrivate::scrollNoPhaseAllowed && phase == Qt::NoScrollPhase ? Qt::ScrollUpdate : phase),
-      source(src)
+      qt4Orientation(qt4O), localPos(local), globalPos(global), phase(phase), source(src), inverted(inverted)
+{
+}
+
+void QWindowSystemInterfacePrivate::TabletEvent::setPlatformSynthesizesMouse(bool v)
 {
+    platformSynthesizesMouse = v;
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qwindowsysteminterface.h b/src/gui/kernel/qwindowsysteminterface.h
index b4f6020fe2..6bf87439b9 100644
--- a/src/gui/kernel/qwindowsysteminterface.h
+++ b/src/gui/kernel/qwindowsysteminterface.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -103,7 +109,8 @@ public:
                                  QPoint pixelDelta, QPoint angleDelta,
                                  Qt::KeyboardModifiers mods = Qt::NoModifier,
                                  Qt::ScrollPhase phase = Qt::NoScrollPhase,
-                                 Qt::MouseEventSource source = Qt::MouseEventNotSynthesized);
+                                 Qt::MouseEventSource source = Qt::MouseEventNotSynthesized,
+                                 bool inverted = false);
 
     // Wheel event compatibility functions. Will be removed: do not use.
     static void handleWheelEvent(QWindow *w, const QPointF & local, const QPointF & global, int d, Qt::Orientation o, Qt::KeyboardModifiers mods = Qt::NoModifier);
diff --git a/src/gui/kernel/qwindowsysteminterface_p.h b/src/gui/kernel/qwindowsysteminterface_p.h
index b3c6d0d96d..b218c1c68c 100644
--- a/src/gui/kernel/qwindowsysteminterface_p.h
+++ b/src/gui/kernel/qwindowsysteminterface_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -236,7 +242,7 @@ public:
     class WheelEvent : public InputEvent {
     public:
         WheelEvent(QWindow *w, ulong time, const QPointF & local, const QPointF & global, QPoint pixelD, QPoint angleD, int qt4D, Qt::Orientation qt4O,
-                   Qt::KeyboardModifiers mods, Qt::ScrollPhase phase = Qt::NoScrollPhase, Qt::MouseEventSource src = Qt::MouseEventNotSynthesized);
+                   Qt::KeyboardModifiers mods, Qt::ScrollPhase phase = Qt::NoScrollPhase, Qt::MouseEventSource src = Qt::MouseEventNotSynthesized, bool inverted = false);
         QPoint pixelDelta;
         QPoint angleDelta;
         int qt4Delta;
@@ -245,6 +251,7 @@ public:
         QPointF globalPos;
         Qt::ScrollPhase phase;
         Qt::MouseEventSource source;
+        bool inverted;
     };
 
     class KeyEvent : public InputEvent {
@@ -345,6 +352,7 @@ public:
                                       int device, int pointerType, Qt::MouseButtons buttons, qreal pressure, int xTilt, int yTilt,
                                       qreal tangentialPressure, qreal rotation, int z, qint64 uid,
                                       Qt::KeyboardModifiers modifiers = Qt::NoModifier);
+        static void setPlatformSynthesizesMouse(bool v);
 
         TabletEvent(QWindow *w, ulong time, const QPointF &local, const QPointF &global,
                     int device, int pointerType, Qt::MouseButtons b, qreal pressure, int xTilt, int yTilt, qreal tpressure,
@@ -365,6 +373,7 @@ public:
         qreal rotation;
         int z;
         qint64 uid;
+        static bool platformSynthesizesMouse;
     };
 
     class TabletEnterProximityEvent : public InputEvent {
diff --git a/src/gui/math3d/qgenericmatrix.cpp b/src/gui/math3d/qgenericmatrix.cpp
index 2c9dfd8bb5..95312bcbe4 100644
--- a/src/gui/math3d/qgenericmatrix.cpp
+++ b/src/gui/math3d/qgenericmatrix.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h
index 19809056fd..5e22fa6730 100644
--- a/src/gui/math3d/qgenericmatrix.h
+++ b/src/gui/math3d/qgenericmatrix.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -97,6 +103,17 @@ private:
     friend class QGenericMatrix;
 #endif
 };
+template <int N, int M, typename T>
+class QTypeInfo<QGenericMatrix<N, M, T> >
+    : public QTypeInfoMerger<QGenericMatrix<N, M, T>, T>
+{
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+public:
+    enum {
+        isStatic = true,
+    }; // at least Q_RELOCATABLE_TYPE, for BC during Qt 5
+#endif
+};
 
 template <int N, int M, typename T>
 Q_INLINE_TEMPLATE QGenericMatrix<N, M, T>::QGenericMatrix()
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index 9d363dc895..b6381e1d8f 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h
index cd5686be94..bdcf4555d7 100644
--- a/src/gui/math3d/qmatrix4x4.h
+++ b/src/gui/math3d/qmatrix4x4.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp
index 0e73f79ac0..e3262c8830 100644
--- a/src/gui/math3d/qquaternion.cpp
+++ b/src/gui/math3d/qquaternion.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h
index 3716220a60..d4c91c430a 100644
--- a/src/gui/math3d/qquaternion.h
+++ b/src/gui/math3d/qquaternion.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/math3d/qvector2d.cpp b/src/gui/math3d/qvector2d.cpp
index 2d8a1d3a0f..7c02b5ad5d 100644
--- a/src/gui/math3d/qvector2d.cpp
+++ b/src/gui/math3d/qvector2d.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h
index c4e62710d9..697360bd5b 100644
--- a/src/gui/math3d/qvector2d.h
+++ b/src/gui/math3d/qvector2d.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp
index 19aa4facdb..8aaf1b0eaa 100644
--- a/src/gui/math3d/qvector3d.cpp
+++ b/src/gui/math3d/qvector3d.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h
index b62d33da71..c3b335cf7c 100644
--- a/src/gui/math3d/qvector3d.h
+++ b/src/gui/math3d/qvector3d.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/math3d/qvector4d.cpp b/src/gui/math3d/qvector4d.cpp
index 494e6f97f0..331144ba33 100644
--- a/src/gui/math3d/qvector4d.cpp
+++ b/src/gui/math3d/qvector4d.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h
index 0543f0fbe3..28a438f3ac 100644
--- a/src/gui/math3d/qvector4d.h
+++ b/src/gui/math3d/qvector4d.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopengl.cpp b/src/gui/opengl/qopengl.cpp
index 3dedd7d7be..1a8fc599ce 100644
--- a/src/gui/opengl/qopengl.cpp
+++ b/src/gui/opengl/qopengl.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -132,22 +138,6 @@ QDebug operator<<(QDebug d, const QOpenGLConfig::Gpu &g)
 enum Operator { NotEqual, LessThan, LessEqualThan, Equals, GreaterThan, GreaterEqualThan };
 static const char operators[][3] = {"!=", "<", "<=", "=", ">", ">="};
 
-static inline QString valueKey()         { return QStringLiteral("value"); }
-static inline QString opKey()            { return QStringLiteral("op"); }
-static inline QString versionKey()       { return QStringLiteral("version"); }
-static inline QString releaseKey()       { return QStringLiteral("release"); }
-static inline QString typeKey()          { return QStringLiteral("type"); }
-static inline QString osKey()            { return QStringLiteral("os"); }
-static inline QString vendorIdKey()      { return QStringLiteral("vendor_id"); }
-static inline QString glVendorKey()      { return QStringLiteral("gl_vendor"); }
-static inline QString deviceIdKey()      { return QStringLiteral("device_id"); }
-static inline QString driverVersionKey() { return QStringLiteral("driver_version"); }
-static inline QString driverDescriptionKey() { return QStringLiteral("driver_description"); }
-static inline QString featuresKey()      { return QStringLiteral("features"); }
-static inline QString idKey()            { return QStringLiteral("id"); }
-static inline QString descriptionKey()   { return QStringLiteral("description"); }
-static inline QString exceptionsKey()    { return QStringLiteral("exceptions"); }
-
 typedef QJsonArray::ConstIterator JsonArrayConstIt;
 
 static inline bool contains(const QJsonArray &haystack, unsigned needle)
@@ -210,8 +200,8 @@ VersionTerm VersionTerm::fromJson(const QJsonValue &v)
     if (!v.isObject())
         return result;
     const QJsonObject o = v.toObject();
-    result.number = QVersionNumber::fromString(o.value(valueKey()).toString());
-    const QString opS = o.value(opKey()).toString();
+    result.number = QVersionNumber::fromString(o.value(QLatin1String("value")).toString());
+    const QString opS = o.value(QLatin1String("op")).toString();
     for (size_t i = 0; i < sizeof(operators) / sizeof(operators[0]); ++i) {
         if (opS == QLatin1String(operators[i])) {
             result.op = static_cast<Operator>(i);
@@ -286,9 +276,9 @@ OsTypeTerm OsTypeTerm::fromJson(const QJsonValue &v)
     if (!v.isObject())
         return result;
     const QJsonObject o = v.toObject();
-    result.type = o.value(typeKey()).toString();
-    result.versionTerm = VersionTerm::fromJson(o.value(versionKey()));
-    result.release = o.value(releaseKey()).toArray();
+    result.type = o.value(QLatin1String("type")).toString();
+    result.versionTerm = VersionTerm::fromJson(o.value(QLatin1String("version")));
+    result.release = o.value(QLatin1String("release")).toArray();
     return result;
 }
 
@@ -312,8 +302,8 @@ QString OsTypeTerm::hostOs()
 static QString msgSyntaxWarning(const QJsonObject &object, const QString &what)
 {
     QString result;
-    QTextStream(&result) << "Id " << object.value(idKey()).toInt()
-        << " (\"" << object.value(descriptionKey()).toString()
+    QTextStream(&result) << "Id " << object.value(QLatin1String("id")).toInt()
+        << " (\"" << object.value(QLatin1String("description")).toString()
         << "\"): " << what;
     return result;
 }
@@ -327,11 +317,11 @@ static bool matches(const QJsonObject &object,
                     const QString &osRelease,
                     const QOpenGLConfig::Gpu &gpu)
 {
-    const OsTypeTerm os = OsTypeTerm::fromJson(object.value(osKey()));
+    const OsTypeTerm os = OsTypeTerm::fromJson(object.value(QLatin1String("os")));
     if (!os.isNull() && !os.matches(osName, kernelVersion, osRelease))
         return false;
 
-    const QJsonValue exceptionsV = object.value(exceptionsKey());
+    const QJsonValue exceptionsV = object.value(QLatin1String("exceptions"));
     if (exceptionsV.isArray()) {
         const QJsonArray exceptionsA = exceptionsV.toArray();
         for (JsonArrayConstIt it = exceptionsA.constBegin(), cend = exceptionsA.constEnd(); it != cend; ++it) {
@@ -340,20 +330,20 @@ static bool matches(const QJsonObject &object,
         }
     }
 
-    const QJsonValue vendorV = object.value(vendorIdKey());
+    const QJsonValue vendorV = object.value(QLatin1String("vendor_id"));
     if (vendorV.isString()) {
         if (gpu.vendorId != vendorV.toString().toUInt(Q_NULLPTR, /* base */ 0))
             return false;
     } else {
-        if (object.contains(glVendorKey())) {
-            const QByteArray glVendorV = object.value(glVendorKey()).toString().toUtf8();
+        if (object.contains(QLatin1String("gl_vendor"))) {
+            const QByteArray glVendorV = object.value(QLatin1String("gl_vendor")).toString().toUtf8();
             if (!gpu.glVendor.contains(glVendorV))
                 return false;
         }
     }
 
     if (gpu.deviceId) {
-        const QJsonValue deviceIdV = object.value(deviceIdKey());
+        const QJsonValue deviceIdV = object.value(QLatin1String("device_id"));
         switch (deviceIdV.type()) {
         case QJsonValue::Array:
             if (!contains(deviceIdV.toArray(), gpu.deviceId))
@@ -369,7 +359,7 @@ static bool matches(const QJsonObject &object,
         }
     }
     if (!gpu.driverVersion.isNull()) {
-        const QJsonValue driverVersionV = object.value(driverVersionKey());
+        const QJsonValue driverVersionV = object.value(QLatin1String("driver_version"));
         switch (driverVersionV.type()) {
         case QJsonValue::Object:
             if (!VersionTerm::fromJson(driverVersionV).matches(gpu.driverVersion))
@@ -386,7 +376,7 @@ static bool matches(const QJsonObject &object,
     }
 
     if (!gpu.driverDescription.isEmpty()) {
-        const QJsonValue driverDescriptionV = object.value(driverDescriptionKey());
+        const QJsonValue driverDescriptionV = object.value(QLatin1String("driver_description"));
         if (driverDescriptionV.isString()) {
             if (!gpu.driverDescription.contains(driverDescriptionV.toString().toUtf8()))
                 return false;
@@ -406,7 +396,7 @@ static bool readGpuFeatures(const QOpenGLConfig::Gpu &gpu,
 {
     result->clear();
     errorMessage->clear();
-    const QJsonValue entriesV = doc.object().value(QStringLiteral("entries"));
+    const QJsonValue entriesV = doc.object().value(QLatin1String("entries"));
     if (!entriesV.isArray()) {
         *errorMessage = QLatin1String("No entries read.");
         return false;
@@ -417,7 +407,7 @@ static bool readGpuFeatures(const QOpenGLConfig::Gpu &gpu,
         if (eit->isObject()) {
             const QJsonObject object = eit->toObject();
             if (matches(object, osName, kernelVersion, osRelease, gpu)) {
-                const QJsonValue featuresListV = object.value(featuresKey());
+                const QJsonValue featuresListV = object.value(QLatin1String("features"));
                 if (featuresListV.isArray()) {
                     const QJsonArray featuresListA = featuresListV.toArray();
                     for (JsonArrayConstIt fit = featuresListA.constBegin(), fcend = featuresListA.constEnd(); fit != fcend; ++fit)
@@ -542,7 +532,7 @@ Q_GUI_EXPORT std::set<QByteArray> *qgpu_features(const QString &filename)
 {
     const QSet<QString> features = QOpenGLConfig::gpuFeatures(QOpenGLConfig::Gpu::fromContext(), filename);
     std::set<QByteArray> *result = new std::set<QByteArray>;
-    foreach (const QString &feature, features)
+    for (const QString &feature : features)
         result->insert(feature.toUtf8());
     return result;
 }
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h
index a060949c17..5f9d78b780 100644
--- a/src/gui/opengl/qopengl.h
+++ b/src/gui/opengl/qopengl.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -94,6 +100,9 @@ typedef void* GLeglImageOES;
 #  elif defined(QT_OPENGL_ES_3)
 #   include <GLES3/gl3.h>
 #  else
+#   ifndef GL_GLEXT_PROTOTYPES
+#     define GL_GLEXT_PROTOTYPES
+#   endif
 #   include <GLES2/gl2.h>
 #endif
 
diff --git a/src/gui/opengl/qopengl2pexvertexarray.cpp b/src/gui/opengl/qopengl2pexvertexarray.cpp
index c873ef00b4..04781f63c7 100644
--- a/src/gui/opengl/qopengl2pexvertexarray.cpp
+++ b/src/gui/opengl/qopengl2pexvertexarray.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopengl2pexvertexarray_p.h b/src/gui/opengl/qopengl2pexvertexarray_p.h
index 9049752763..22397391dd 100644
--- a/src/gui/opengl/qopengl2pexvertexarray_p.h
+++ b/src/gui/opengl/qopengl2pexvertexarray_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopengl_p.h b/src/gui/opengl/qopengl_p.h
index 6b66a3ba57..042b903625 100644
--- a/src/gui/opengl/qopengl_p.h
+++ b/src/gui/opengl/qopengl_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglbuffer.cpp b/src/gui/opengl/qopenglbuffer.cpp
index 4155a28989..66cc2b5ce8 100644
--- a/src/gui/opengl/qopenglbuffer.cpp
+++ b/src/gui/opengl/qopenglbuffer.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglbuffer.h b/src/gui/opengl/qopenglbuffer.h
index ca3d85d8e0..bd947bc1d8 100644
--- a/src/gui/opengl/qopenglbuffer.h
+++ b/src/gui/opengl/qopenglbuffer.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglcustomshaderstage.cpp b/src/gui/opengl/qopenglcustomshaderstage.cpp
index e5504e6195..baa44f86b0 100644
--- a/src/gui/opengl/qopenglcustomshaderstage.cpp
+++ b/src/gui/opengl/qopenglcustomshaderstage.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglcustomshaderstage_p.h b/src/gui/opengl/qopenglcustomshaderstage_p.h
index 9b3c9fbce1..2342991e5e 100644
--- a/src/gui/opengl/qopenglcustomshaderstage_p.h
+++ b/src/gui/opengl/qopenglcustomshaderstage_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopengldebug.cpp b/src/gui/opengl/qopengldebug.cpp
index 19ceaaf815..f6c3af37dd 100644
--- a/src/gui/opengl/qopengldebug.cpp
+++ b/src/gui/opengl/qopengldebug.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -171,8 +177,8 @@ QT_BEGIN_NAMESPACE
 
     \code
 
-    QList<QOpenGLDebugMessage> messages = logger->loggedMessages();
-    foreach (const QOpenGLDebugMessage &message, messages)
+    const QList<QOpenGLDebugMessage> messages = logger->loggedMessages();
+    for (const QOpenGLDebugMessage &message : messages)
         qDebug() << message;
 
     \endcode
@@ -1271,9 +1277,9 @@ void QOpenGLDebugLoggerPrivate::controlDebugMessages(QOpenGLDebugMessage::Source
     // Unfortunately, some bugged drivers do NOT ignore it, so pass NULL in case.
     const GLuint * const idPtr = idCount ? ids.constData() : 0;
 
-    foreach (GLenum source, glSources)
-        foreach (GLenum type, glTypes)
-            foreach (GLenum severity, glSeverities)
+    for (GLenum source : glSources)
+        for (GLenum type : glTypes)
+            for (GLenum severity : glSeverities)
                 glDebugMessageControl(source, type, severity, idCount, idPtr, GLboolean(enable));
 }
 
@@ -1407,7 +1413,7 @@ bool QOpenGLDebugLogger::initialize()
 
 #define GET_DEBUG_PROC_ADDRESS(procName) \
     d->procName = reinterpret_cast< qt_ ## procName ## _t >( \
-        d->context->getProcAddress(QByteArrayLiteral( #procName )) \
+        d->context->getProcAddress(#procName) \
     );
 
     GET_DEBUG_PROC_ADDRESS(glDebugMessageControl);
@@ -1416,19 +1422,7 @@ bool QOpenGLDebugLogger::initialize()
     GET_DEBUG_PROC_ADDRESS(glGetDebugMessageLog);
     GET_DEBUG_PROC_ADDRESS(glPushDebugGroup);
     GET_DEBUG_PROC_ADDRESS(glPopDebugGroup);
-
-    // Windows' Desktop GL doesn't allow resolution of "basic GL entry points"
-    // through wglGetProcAddress
-#if defined(Q_OS_WIN) && !defined(QT_OPENGL_ES_2)
-    {
-        HMODULE handle = static_cast<HMODULE>(QOpenGLContext::openGLModuleHandle());
-        if (!handle)
-            handle = GetModuleHandleA("opengl32.dll");
-        d->glGetPointerv = reinterpret_cast<qt_glGetPointerv_t>(GetProcAddress(handle, QByteArrayLiteral("glGetPointerv")));
-    }
-#else
     GET_DEBUG_PROC_ADDRESS(glGetPointerv)
-#endif
 
 #undef GET_DEBUG_PROC_ADDRESS
 
diff --git a/src/gui/opengl/qopengldebug.h b/src/gui/opengl/qopengldebug.h
index 3e93ad4120..90e12fb8b1 100644
--- a/src/gui/opengl/qopengldebug.h
+++ b/src/gui/opengl/qopengldebug.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglengineshadermanager.cpp b/src/gui/opengl/qopenglengineshadermanager.cpp
index 40f4ce94c2..4e3d14ba37 100644
--- a/src/gui/opengl/qopenglengineshadermanager.cpp
+++ b/src/gui/opengl/qopenglengineshadermanager.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -39,6 +45,8 @@
 #include <QtGui/private/qopenglcontext_p.h>
 #include <QtCore/qthreadstorage.h>
 
+#include <algorithm>
+
 #if defined(QT_DEBUG)
 #include <QMetaEnum>
 #endif
@@ -191,7 +199,7 @@ QOpenGLEngineSharedShaders::QOpenGLEngineSharedShaders(QOpenGLContext* context)
 #if defined(QT_DEBUG)
         // Check that all the elements have been filled:
         for (int i = 0; i < TotalSnippetCount; ++i) {
-            if (qShaderSnippets[i] == 0) {
+            if (Q_UNLIKELY(!qShaderSnippets[i])) {
                 qFatal("Shader snippet for %s (#%d) is missing!",
                        snippetNameStr(SnippetName(i)).constData(), i);
             }
@@ -240,11 +248,11 @@ QOpenGLEngineSharedShaders::QOpenGLEngineSharedShaders(QOpenGLContext* context)
 
     simpleShaderProg->link();
 
-    if (simpleShaderProg->isLinked()) {
+    if (Q_UNLIKELY(!simpleShaderProg->isLinked())) {
+        qCritical("Errors linking simple shader: %s", qPrintable(simpleShaderProg->log()));
+    } else {
         if (!inCache)
             simpleShaderCache.store(simpleShaderProg, context);
-    } else {
-        qCritical("Errors linking simple shader: %s", qPrintable(simpleShaderProg->log()));
     }
 
     // Compile the blit shader:
@@ -281,11 +289,11 @@ QOpenGLEngineSharedShaders::QOpenGLEngineSharedShaders(QOpenGLContext* context)
     }
 
     blitShaderProg->link();
-    if (blitShaderProg->isLinked()) {
+    if (Q_UNLIKELY(!blitShaderProg->isLinked())) {
+        qCritical("Errors linking blit shader: %s", qPrintable(blitShaderProg->log()));
+    } else {
         if (!inCache)
             blitShaderCache.store(blitShaderProg, context);
-    } else {
-        qCritical("Errors linking blit shader: %s", qPrintable(blitShaderProg->log()));
     }
 
 #ifdef QT_GL_SHARED_SHADER_DEBUG
@@ -469,15 +477,16 @@ QOpenGLEngineShaderProg *QOpenGLEngineSharedShaders::findProgramInCache(const QO
 
 void QOpenGLEngineSharedShaders::cleanupCustomStage(QOpenGLCustomShaderStage* stage)
 {
-    // Remove any shader programs which has this as the custom shader src:
-    for (int i = 0; i < cachedPrograms.size(); ++i) {
-        QOpenGLEngineShaderProg *cachedProg = cachedPrograms[i];
+    auto hasStageAsCustomShaderSouce = [stage](QOpenGLEngineShaderProg *cachedProg) -> bool {
         if (cachedProg->customStageSource == stage->source()) {
             delete cachedProg;
-            cachedPrograms.removeAt(i);
-            i--;
+            return true;
         }
-    }
+        return false;
+    };
+    cachedPrograms.erase(std::remove_if(cachedPrograms.begin(), cachedPrograms.end(),
+                                        hasStageAsCustomShaderSouce),
+                         cachedPrograms.end());
 }
 
 
diff --git a/src/gui/opengl/qopenglengineshadermanager_p.h b/src/gui/opengl/qopenglengineshadermanager_p.h
index 481ecee6a6..a5e190a48d 100644
--- a/src/gui/opengl/qopenglengineshadermanager_p.h
+++ b/src/gui/opengl/qopenglengineshadermanager_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglengineshadersource_p.h b/src/gui/opengl/qopenglengineshadersource_p.h
index 1f7f2f19ce..876d2775d3 100644
--- a/src/gui/opengl/qopenglengineshadersource_p.h
+++ b/src/gui/opengl/qopenglengineshadersource_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglextensions_p.h b/src/gui/opengl/qopenglextensions_p.h
index aa2a08242d..894b6f2dc6 100644
--- a/src/gui/opengl/qopenglextensions_p.h
+++ b/src/gui/opengl/qopenglextensions_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -46,204 +52,11 @@
 //
 
 #include "qopenglextrafunctions.h"
-#include <QtCore/qlibrary.h>
 
 QT_BEGIN_NAMESPACE
 
 class QOpenGLExtensionsPrivate;
 
-class QOpenGLES3Helper
-{
-public:
-    QOpenGLES3Helper();
-
-    // GLES3
-    void (QOPENGLF_APIENTRYP ReadBuffer)(GLenum mode);
-    void (QOPENGLF_APIENTRYP DrawRangeElements)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
-    void (QOPENGLF_APIENTRYP TexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
-    void (QOPENGLF_APIENTRYP TexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
-    void (QOPENGLF_APIENTRYP CopyTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP CompressedTexImage3D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
-    void (QOPENGLF_APIENTRYP CompressedTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
-    void (QOPENGLF_APIENTRYP GenQueries)(GLsizei n, GLuint *ids);
-    void (QOPENGLF_APIENTRYP DeleteQueries)(GLsizei n, const GLuint *ids);
-    GLboolean (QOPENGLF_APIENTRYP IsQuery)(GLuint id);
-    void (QOPENGLF_APIENTRYP BeginQuery)(GLenum target, GLuint id);
-    void (QOPENGLF_APIENTRYP EndQuery)(GLenum target);
-    void (QOPENGLF_APIENTRYP GetQueryiv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetQueryObjectuiv)(GLuint id, GLenum pname, GLuint *params);
-    GLboolean (QOPENGLF_APIENTRYP UnmapBuffer)(GLenum target);
-    void (QOPENGLF_APIENTRYP GetBufferPointerv)(GLenum target, GLenum pname, void **params);
-    void (QOPENGLF_APIENTRYP DrawBuffers)(GLsizei n, const GLenum *bufs);
-    void (QOPENGLF_APIENTRYP UniformMatrix2x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix3x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix2x4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix4x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix3x4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix4x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-    void (QOPENGLF_APIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP FramebufferTextureLayer)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-    void *(QOPENGLF_APIENTRYP MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-    void (QOPENGLF_APIENTRYP FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length);
-    void (QOPENGLF_APIENTRYP BindVertexArray)(GLuint array);
-    void (QOPENGLF_APIENTRYP DeleteVertexArrays)(GLsizei n, const GLuint *arrays);
-    void (QOPENGLF_APIENTRYP GenVertexArrays)(GLsizei n, GLuint *arrays);
-    GLboolean (QOPENGLF_APIENTRYP IsVertexArray)(GLuint array);
-    void (QOPENGLF_APIENTRYP GetIntegeri_v)(GLenum target, GLuint index, GLint *data);
-    void (QOPENGLF_APIENTRYP BeginTransformFeedback)(GLenum primitiveMode);
-    void (QOPENGLF_APIENTRYP EndTransformFeedback)(void);
-    void (QOPENGLF_APIENTRYP BindBufferRange)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-    void (QOPENGLF_APIENTRYP BindBufferBase)(GLenum target, GLuint index, GLuint buffer);
-    void (QOPENGLF_APIENTRYP TransformFeedbackVaryings)(GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
-    void (QOPENGLF_APIENTRYP GetTransformFeedbackVarying)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-    void (QOPENGLF_APIENTRYP VertexAttribIPointer)(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
-    void (QOPENGLF_APIENTRYP GetVertexAttribIiv)(GLuint index, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetVertexAttribIuiv)(GLuint index, GLenum pname, GLuint *params);
-    void (QOPENGLF_APIENTRYP VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w);
-    void (QOPENGLF_APIENTRYP VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-    void (QOPENGLF_APIENTRYP VertexAttribI4iv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI4uiv)(GLuint index, const GLuint *v);
-    void (QOPENGLF_APIENTRYP GetUniformuiv)(GLuint program, GLint location, GLuint *params);
-    GLint (QOPENGLF_APIENTRYP GetFragDataLocation)(GLuint program, const GLchar *name);
-    void (QOPENGLF_APIENTRYP Uniform1ui)(GLint location, GLuint v0);
-    void (QOPENGLF_APIENTRYP Uniform2ui)(GLint location, GLuint v0, GLuint v1);
-    void (QOPENGLF_APIENTRYP Uniform3ui)(GLint location, GLuint v0, GLuint v1, GLuint v2);
-    void (QOPENGLF_APIENTRYP Uniform4ui)(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-    void (QOPENGLF_APIENTRYP Uniform1uiv)(GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP Uniform2uiv)(GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP Uniform3uiv)(GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP Uniform4uiv)(GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ClearBufferiv)(GLenum buffer, GLint drawbuffer, const GLint *value);
-    void (QOPENGLF_APIENTRYP ClearBufferuiv)(GLenum buffer, GLint drawbuffer, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ClearBufferfv)(GLenum buffer, GLint drawbuffer, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ClearBufferfi)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-    const GLubyte *(QOPENGLF_APIENTRYP GetStringi)(GLenum name, GLuint index);
-    void (QOPENGLF_APIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-    void (QOPENGLF_APIENTRYP GetUniformIndices)(GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices);
-    void (QOPENGLF_APIENTRYP GetActiveUniformsiv)(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
-    GLuint (QOPENGLF_APIENTRYP GetUniformBlockIndex)(GLuint program, const GLchar *uniformBlockName);
-    void (QOPENGLF_APIENTRYP GetActiveUniformBlockiv)(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetActiveUniformBlockName)(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
-    void (QOPENGLF_APIENTRYP UniformBlockBinding)(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-    void (QOPENGLF_APIENTRYP DrawArraysInstanced)(GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
-    void (QOPENGLF_APIENTRYP DrawElementsInstanced)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
-    GLsync (QOPENGLF_APIENTRYP FenceSync)(GLenum condition, GLbitfield flags);
-    GLboolean (QOPENGLF_APIENTRYP IsSync)(GLsync sync);
-    void (QOPENGLF_APIENTRYP DeleteSync)(GLsync sync);
-    GLenum (QOPENGLF_APIENTRYP ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout);
-    void (QOPENGLF_APIENTRYP WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout);
-    void (QOPENGLF_APIENTRYP GetInteger64v)(GLenum pname, GLint64 *data);
-    void (QOPENGLF_APIENTRYP GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-    void (QOPENGLF_APIENTRYP GetInteger64i_v)(GLenum target, GLuint index, GLint64 *data);
-    void (QOPENGLF_APIENTRYP GetBufferParameteri64v)(GLenum target, GLenum pname, GLint64 *params);
-    void (QOPENGLF_APIENTRYP GenSamplers)(GLsizei count, GLuint *samplers);
-    void (QOPENGLF_APIENTRYP DeleteSamplers)(GLsizei count, const GLuint *samplers);
-    GLboolean (QOPENGLF_APIENTRYP IsSampler)(GLuint sampler);
-    void (QOPENGLF_APIENTRYP BindSampler)(GLuint unit, GLuint sampler);
-    void (QOPENGLF_APIENTRYP SamplerParameteri)(GLuint sampler, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint *param);
-    void (QOPENGLF_APIENTRYP SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat *param);
-    void (QOPENGLF_APIENTRYP GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP VertexAttribDivisor)(GLuint index, GLuint divisor);
-    void (QOPENGLF_APIENTRYP BindTransformFeedback)(GLenum target, GLuint id);
-    void (QOPENGLF_APIENTRYP DeleteTransformFeedbacks)(GLsizei n, const GLuint *ids);
-    void (QOPENGLF_APIENTRYP GenTransformFeedbacks)(GLsizei n, GLuint *ids);
-    GLboolean (QOPENGLF_APIENTRYP IsTransformFeedback)(GLuint id);
-    void (QOPENGLF_APIENTRYP PauseTransformFeedback)(void);
-    void (QOPENGLF_APIENTRYP ResumeTransformFeedback)(void);
-    void (QOPENGLF_APIENTRYP GetProgramBinary)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
-    void (QOPENGLF_APIENTRYP ProgramBinary)(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
-    void (QOPENGLF_APIENTRYP ProgramParameteri)(GLuint program, GLenum pname, GLint value);
-    void (QOPENGLF_APIENTRYP InvalidateFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum *attachments);
-    void (QOPENGLF_APIENTRYP InvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-    void (QOPENGLF_APIENTRYP GetInternalformativ)(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
-
-    // GLES 3.1
-    void (QOPENGLF_APIENTRYP DispatchCompute)(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
-    void (QOPENGLF_APIENTRYP DispatchComputeIndirect)(GLintptr indirect);
-    void (QOPENGLF_APIENTRYP DrawArraysIndirect)(GLenum mode, const void *indirect);
-    void (QOPENGLF_APIENTRYP DrawElementsIndirect)(GLenum mode, GLenum type, const void *indirect);
-    void (QOPENGLF_APIENTRYP FramebufferParameteri)(GLenum target, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP GetFramebufferParameteriv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetProgramInterfaceiv)(GLuint program, GLenum programInterface, GLenum pname, GLint *params);
-    GLuint (QOPENGLF_APIENTRYP GetProgramResourceIndex)(GLuint program, GLenum programInterface, const GLchar *name);
-    void (QOPENGLF_APIENTRYP GetProgramResourceName)(GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
-    void (QOPENGLF_APIENTRYP GetProgramResourceiv)(GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params);
-    GLint (QOPENGLF_APIENTRYP GetProgramResourceLocation)(GLuint program, GLenum programInterface, const GLchar *name);
-    void (QOPENGLF_APIENTRYP UseProgramStages)(GLuint pipeline, GLbitfield stages, GLuint program);
-    void (QOPENGLF_APIENTRYP ActiveShaderProgram)(GLuint pipeline, GLuint program);
-    GLuint (QOPENGLF_APIENTRYP CreateShaderProgramv)(GLenum type, GLsizei count, const GLchar *const*strings);
-    void (QOPENGLF_APIENTRYP BindProgramPipeline)(GLuint pipeline);
-    void (QOPENGLF_APIENTRYP DeleteProgramPipelines)(GLsizei n, const GLuint *pipelines);
-    void (QOPENGLF_APIENTRYP GenProgramPipelines)(GLsizei n, GLuint *pipelines);
-    GLboolean (QOPENGLF_APIENTRYP IsProgramPipeline)(GLuint pipeline);
-    void (QOPENGLF_APIENTRYP GetProgramPipelineiv)(GLuint pipeline, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP ProgramUniform1i)(GLuint program, GLint location, GLint v0);
-    void (QOPENGLF_APIENTRYP ProgramUniform2i)(GLuint program, GLint location, GLint v0, GLint v1);
-    void (QOPENGLF_APIENTRYP ProgramUniform3i)(GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-    void (QOPENGLF_APIENTRYP ProgramUniform4i)(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-    void (QOPENGLF_APIENTRYP ProgramUniform1ui)(GLuint program, GLint location, GLuint v0);
-    void (QOPENGLF_APIENTRYP ProgramUniform2ui)(GLuint program, GLint location, GLuint v0, GLuint v1);
-    void (QOPENGLF_APIENTRYP ProgramUniform3ui)(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-    void (QOPENGLF_APIENTRYP ProgramUniform4ui)(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-    void (QOPENGLF_APIENTRYP ProgramUniform1f)(GLuint program, GLint location, GLfloat v0);
-    void (QOPENGLF_APIENTRYP ProgramUniform2f)(GLuint program, GLint location, GLfloat v0, GLfloat v1);
-    void (QOPENGLF_APIENTRYP ProgramUniform3f)(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-    void (QOPENGLF_APIENTRYP ProgramUniform4f)(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-    void (QOPENGLF_APIENTRYP ProgramUniform1iv)(GLuint program, GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform2iv)(GLuint program, GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform3iv)(GLuint program, GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform4iv)(GLuint program, GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform1uiv)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform2uiv)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform3uiv)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform4uiv)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform1fv)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform2fv)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform3fv)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform4fv)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix2x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix3x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix2x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix4x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix3x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix4x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ValidateProgramPipeline)(GLuint pipeline);
-    void (QOPENGLF_APIENTRYP GetProgramPipelineInfoLog)(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-    void (QOPENGLF_APIENTRYP BindImageTexture)(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
-    void (QOPENGLF_APIENTRYP GetBooleani_v)(GLenum target, GLuint index, GLboolean *data);
-    void (QOPENGLF_APIENTRYP MemoryBarrierFunc)(GLbitfield barriers);
-    void (QOPENGLF_APIENTRYP MemoryBarrierByRegion)(GLbitfield barriers);
-    void (QOPENGLF_APIENTRYP TexStorage2DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-    void (QOPENGLF_APIENTRYP GetMultisamplefv)(GLenum pname, GLuint index, GLfloat *val);
-    void (QOPENGLF_APIENTRYP SampleMaski)(GLuint maskNumber, GLbitfield mask);
-    void (QOPENGLF_APIENTRYP GetTexLevelParameteriv)(GLenum target, GLint level, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetTexLevelParameterfv)(GLenum target, GLint level, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP BindVertexBuffer)(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
-    void (QOPENGLF_APIENTRYP VertexAttribFormat)(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
-    void (QOPENGLF_APIENTRYP VertexAttribIFormat)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
-    void (QOPENGLF_APIENTRYP VertexAttribBinding)(GLuint attribindex, GLuint bindingindex);
-    void (QOPENGLF_APIENTRYP VertexBindingDivisor)(GLuint bindingindex, GLuint divisor);
-
-    QPair<int, int> supportedVersion() const { return m_supportedVersion; }
-
-private:
-    bool init();
-    QFunctionPointer resolve(const char *name);
-#ifndef QT_NO_LIBRARY
-    QLibrary m_gl;
-#endif
-    QPair<int, int> m_supportedVersion;
-};
-
 class Q_GUI_EXPORT QOpenGLExtensions : public QOpenGLExtraFunctions
 {
     Q_DECLARE_PRIVATE(QOpenGLExtensions)
@@ -287,10 +100,10 @@ public:
     void glGetBufferSubData(GLenum target, qopengl_GLintptr offset, qopengl_GLsizeiptr size, GLvoid *data);
     void glDiscardFramebufferEXT (GLenum target, GLsizei numAttachments, const GLenum *attachments);
 
-    QOpenGLES3Helper *gles3Helper();
-
     void flushShared();
 
+    QOpenGLExtensionsPrivate *d() const;
+
 private:
     static bool isInitialized(const QOpenGLFunctionsPrivate *d) { return d != 0; }
 };
@@ -310,6 +123,11 @@ public:
     bool flushIsSufficientToSyncContexts;
 };
 
+inline QOpenGLExtensionsPrivate *QOpenGLExtensions::d() const
+{
+    return static_cast<QOpenGLExtensionsPrivate *>(d_ptr);
+}
+
 inline GLvoid *QOpenGLExtensions::glMapBuffer(GLenum target, GLenum access)
 {
     Q_D(QOpenGLExtensions);
diff --git a/src/gui/opengl/qopenglextrafunctions.h b/src/gui/opengl/qopenglextrafunctions.h
index c53c3efba7..aa29d685bc 100644
--- a/src/gui/opengl/qopenglextrafunctions.h
+++ b/src/gui/opengl/qopenglextrafunctions.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -40,6 +46,12 @@
 
 #include <QtGui/qopenglfunctions.h>
 
+// MemoryBarrier is a macro on some architectures on Windows
+#ifdef Q_OS_WIN
+#pragma push_macro("MemoryBarrier")
+#undef MemoryBarrier
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QOpenGLExtraFunctionsPrivate;
@@ -407,186 +419,204 @@ private:
     static bool isInitialized(const QOpenGLExtraFunctionsPrivate *d) { return d != Q_NULLPTR; }
 };
 
+
+#define QT_OPENGL_DECLARE_FUNCTIONS(ret, name, args) \
+    ret (QOPENGLF_APIENTRYP name)args;
+#define QT_OPENGL_COUNT_FUNCTIONS(ret, name, args) +1
+
+#define QT_OPENGL_DECLARE(FUNCTIONS) \
+public: \
+    struct Functions { \
+        FUNCTIONS(QT_OPENGL_DECLARE_FUNCTIONS) \
+    }; \
+    union { \
+        QFunctionPointer functions[FUNCTIONS(QT_OPENGL_COUNT_FUNCTIONS)]; \
+        Functions f; \
+    }; \
+private: \
+    void init(QOpenGLContext *context);
+
 class QOpenGLExtraFunctionsPrivate : public QOpenGLFunctionsPrivate
 {
 public:
     QOpenGLExtraFunctionsPrivate(QOpenGLContext *ctx);
 
     // GLES3
-    void (QOPENGLF_APIENTRYP ReadBuffer)(GLenum mode);
-    void (QOPENGLF_APIENTRYP DrawRangeElements)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
-    void (QOPENGLF_APIENTRYP TexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
-    void (QOPENGLF_APIENTRYP TexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
-    void (QOPENGLF_APIENTRYP CopyTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP CompressedTexImage3D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
-    void (QOPENGLF_APIENTRYP CompressedTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
-    void (QOPENGLF_APIENTRYP GenQueries)(GLsizei n, GLuint *ids);
-    void (QOPENGLF_APIENTRYP DeleteQueries)(GLsizei n, const GLuint *ids);
-    GLboolean (QOPENGLF_APIENTRYP IsQuery)(GLuint id);
-    void (QOPENGLF_APIENTRYP BeginQuery)(GLenum target, GLuint id);
-    void (QOPENGLF_APIENTRYP EndQuery)(GLenum target);
-    void (QOPENGLF_APIENTRYP GetQueryiv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetQueryObjectuiv)(GLuint id, GLenum pname, GLuint *params);
-    GLboolean (QOPENGLF_APIENTRYP UnmapBuffer)(GLenum target);
-    void (QOPENGLF_APIENTRYP GetBufferPointerv)(GLenum target, GLenum pname, void **params);
-    void (QOPENGLF_APIENTRYP DrawBuffers)(GLsizei n, const GLenum *bufs);
-    void (QOPENGLF_APIENTRYP UniformMatrix2x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix3x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix2x4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix4x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix3x4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix4x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-    void (QOPENGLF_APIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP FramebufferTextureLayer)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-    void *(QOPENGLF_APIENTRYP MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-    void (QOPENGLF_APIENTRYP FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length);
-    void (QOPENGLF_APIENTRYP BindVertexArray)(GLuint array);
-    void (QOPENGLF_APIENTRYP DeleteVertexArrays)(GLsizei n, const GLuint *arrays);
-    void (QOPENGLF_APIENTRYP GenVertexArrays)(GLsizei n, GLuint *arrays);
-    GLboolean (QOPENGLF_APIENTRYP IsVertexArray)(GLuint array);
-    void (QOPENGLF_APIENTRYP GetIntegeri_v)(GLenum target, GLuint index, GLint *data);
-    void (QOPENGLF_APIENTRYP BeginTransformFeedback)(GLenum primitiveMode);
-    void (QOPENGLF_APIENTRYP EndTransformFeedback)(void);
-    void (QOPENGLF_APIENTRYP BindBufferRange)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-    void (QOPENGLF_APIENTRYP BindBufferBase)(GLenum target, GLuint index, GLuint buffer);
-    void (QOPENGLF_APIENTRYP TransformFeedbackVaryings)(GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
-    void (QOPENGLF_APIENTRYP GetTransformFeedbackVarying)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-    void (QOPENGLF_APIENTRYP VertexAttribIPointer)(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
-    void (QOPENGLF_APIENTRYP GetVertexAttribIiv)(GLuint index, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetVertexAttribIuiv)(GLuint index, GLenum pname, GLuint *params);
-    void (QOPENGLF_APIENTRYP VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w);
-    void (QOPENGLF_APIENTRYP VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-    void (QOPENGLF_APIENTRYP VertexAttribI4iv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI4uiv)(GLuint index, const GLuint *v);
-    void (QOPENGLF_APIENTRYP GetUniformuiv)(GLuint program, GLint location, GLuint *params);
-    GLint (QOPENGLF_APIENTRYP GetFragDataLocation)(GLuint program, const GLchar *name);
-    void (QOPENGLF_APIENTRYP Uniform1ui)(GLint location, GLuint v0);
-    void (QOPENGLF_APIENTRYP Uniform2ui)(GLint location, GLuint v0, GLuint v1);
-    void (QOPENGLF_APIENTRYP Uniform3ui)(GLint location, GLuint v0, GLuint v1, GLuint v2);
-    void (QOPENGLF_APIENTRYP Uniform4ui)(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-    void (QOPENGLF_APIENTRYP Uniform1uiv)(GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP Uniform2uiv)(GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP Uniform3uiv)(GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP Uniform4uiv)(GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ClearBufferiv)(GLenum buffer, GLint drawbuffer, const GLint *value);
-    void (QOPENGLF_APIENTRYP ClearBufferuiv)(GLenum buffer, GLint drawbuffer, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ClearBufferfv)(GLenum buffer, GLint drawbuffer, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ClearBufferfi)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-    const GLubyte *(QOPENGLF_APIENTRYP GetStringi)(GLenum name, GLuint index);
-    void (QOPENGLF_APIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-    void (QOPENGLF_APIENTRYP GetUniformIndices)(GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices);
-    void (QOPENGLF_APIENTRYP GetActiveUniformsiv)(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
-    GLuint (QOPENGLF_APIENTRYP GetUniformBlockIndex)(GLuint program, const GLchar *uniformBlockName);
-    void (QOPENGLF_APIENTRYP GetActiveUniformBlockiv)(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetActiveUniformBlockName)(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
-    void (QOPENGLF_APIENTRYP UniformBlockBinding)(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-    void (QOPENGLF_APIENTRYP DrawArraysInstanced)(GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
-    void (QOPENGLF_APIENTRYP DrawElementsInstanced)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
-    GLsync (QOPENGLF_APIENTRYP FenceSync)(GLenum condition, GLbitfield flags);
-    GLboolean (QOPENGLF_APIENTRYP IsSync)(GLsync sync);
-    void (QOPENGLF_APIENTRYP DeleteSync)(GLsync sync);
-    GLenum (QOPENGLF_APIENTRYP ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout);
-    void (QOPENGLF_APIENTRYP WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout);
-    void (QOPENGLF_APIENTRYP GetInteger64v)(GLenum pname, GLint64 *data);
-    void (QOPENGLF_APIENTRYP GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-    void (QOPENGLF_APIENTRYP GetInteger64i_v)(GLenum target, GLuint index, GLint64 *data);
-    void (QOPENGLF_APIENTRYP GetBufferParameteri64v)(GLenum target, GLenum pname, GLint64 *params);
-    void (QOPENGLF_APIENTRYP GenSamplers)(GLsizei count, GLuint *samplers);
-    void (QOPENGLF_APIENTRYP DeleteSamplers)(GLsizei count, const GLuint *samplers);
-    GLboolean (QOPENGLF_APIENTRYP IsSampler)(GLuint sampler);
-    void (QOPENGLF_APIENTRYP BindSampler)(GLuint unit, GLuint sampler);
-    void (QOPENGLF_APIENTRYP SamplerParameteri)(GLuint sampler, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint *param);
-    void (QOPENGLF_APIENTRYP SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat *param);
-    void (QOPENGLF_APIENTRYP GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP VertexAttribDivisor)(GLuint index, GLuint divisor);
-    void (QOPENGLF_APIENTRYP BindTransformFeedback)(GLenum target, GLuint id);
-    void (QOPENGLF_APIENTRYP DeleteTransformFeedbacks)(GLsizei n, const GLuint *ids);
-    void (QOPENGLF_APIENTRYP GenTransformFeedbacks)(GLsizei n, GLuint *ids);
-    GLboolean (QOPENGLF_APIENTRYP IsTransformFeedback)(GLuint id);
-    void (QOPENGLF_APIENTRYP PauseTransformFeedback)(void);
-    void (QOPENGLF_APIENTRYP ResumeTransformFeedback)(void);
-    void (QOPENGLF_APIENTRYP GetProgramBinary)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
-    void (QOPENGLF_APIENTRYP ProgramBinary)(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
-    void (QOPENGLF_APIENTRYP ProgramParameteri)(GLuint program, GLenum pname, GLint value);
-    void (QOPENGLF_APIENTRYP InvalidateFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum *attachments);
-    void (QOPENGLF_APIENTRYP InvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-    void (QOPENGLF_APIENTRYP GetInternalformativ)(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
-
-    // GLES 3.1
-    void (QOPENGLF_APIENTRYP DispatchCompute)(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
-    void (QOPENGLF_APIENTRYP DispatchComputeIndirect)(GLintptr indirect);
-    void (QOPENGLF_APIENTRYP DrawArraysIndirect)(GLenum mode, const void *indirect);
-    void (QOPENGLF_APIENTRYP DrawElementsIndirect)(GLenum mode, GLenum type, const void *indirect);
-    void (QOPENGLF_APIENTRYP FramebufferParameteri)(GLenum target, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP GetFramebufferParameteriv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetProgramInterfaceiv)(GLuint program, GLenum programInterface, GLenum pname, GLint *params);
-    GLuint (QOPENGLF_APIENTRYP GetProgramResourceIndex)(GLuint program, GLenum programInterface, const GLchar *name);
-    void (QOPENGLF_APIENTRYP GetProgramResourceName)(GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
-    void (QOPENGLF_APIENTRYP GetProgramResourceiv)(GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params);
-    GLint (QOPENGLF_APIENTRYP GetProgramResourceLocation)(GLuint program, GLenum programInterface, const GLchar *name);
-    void (QOPENGLF_APIENTRYP UseProgramStages)(GLuint pipeline, GLbitfield stages, GLuint program);
-    void (QOPENGLF_APIENTRYP ActiveShaderProgram)(GLuint pipeline, GLuint program);
-    GLuint (QOPENGLF_APIENTRYP CreateShaderProgramv)(GLenum type, GLsizei count, const GLchar *const*strings);
-    void (QOPENGLF_APIENTRYP BindProgramPipeline)(GLuint pipeline);
-    void (QOPENGLF_APIENTRYP DeleteProgramPipelines)(GLsizei n, const GLuint *pipelines);
-    void (QOPENGLF_APIENTRYP GenProgramPipelines)(GLsizei n, GLuint *pipelines);
-    GLboolean (QOPENGLF_APIENTRYP IsProgramPipeline)(GLuint pipeline);
-    void (QOPENGLF_APIENTRYP GetProgramPipelineiv)(GLuint pipeline, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP ProgramUniform1i)(GLuint program, GLint location, GLint v0);
-    void (QOPENGLF_APIENTRYP ProgramUniform2i)(GLuint program, GLint location, GLint v0, GLint v1);
-    void (QOPENGLF_APIENTRYP ProgramUniform3i)(GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-    void (QOPENGLF_APIENTRYP ProgramUniform4i)(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-    void (QOPENGLF_APIENTRYP ProgramUniform1ui)(GLuint program, GLint location, GLuint v0);
-    void (QOPENGLF_APIENTRYP ProgramUniform2ui)(GLuint program, GLint location, GLuint v0, GLuint v1);
-    void (QOPENGLF_APIENTRYP ProgramUniform3ui)(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-    void (QOPENGLF_APIENTRYP ProgramUniform4ui)(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-    void (QOPENGLF_APIENTRYP ProgramUniform1f)(GLuint program, GLint location, GLfloat v0);
-    void (QOPENGLF_APIENTRYP ProgramUniform2f)(GLuint program, GLint location, GLfloat v0, GLfloat v1);
-    void (QOPENGLF_APIENTRYP ProgramUniform3f)(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-    void (QOPENGLF_APIENTRYP ProgramUniform4f)(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-    void (QOPENGLF_APIENTRYP ProgramUniform1iv)(GLuint program, GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform2iv)(GLuint program, GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform3iv)(GLuint program, GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform4iv)(GLuint program, GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform1uiv)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform2uiv)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform3uiv)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform4uiv)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform1fv)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform2fv)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform3fv)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform4fv)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix2x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix3x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix2x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix4x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix3x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix4x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ValidateProgramPipeline)(GLuint pipeline);
-    void (QOPENGLF_APIENTRYP GetProgramPipelineInfoLog)(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-    void (QOPENGLF_APIENTRYP BindImageTexture)(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
-    void (QOPENGLF_APIENTRYP GetBooleani_v)(GLenum target, GLuint index, GLboolean *data);
-    void (QOPENGLF_APIENTRYP MemoryBarrierFunc)(GLbitfield barriers);
-    void (QOPENGLF_APIENTRYP MemoryBarrierByRegion)(GLbitfield barriers);
-    void (QOPENGLF_APIENTRYP TexStorage2DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-    void (QOPENGLF_APIENTRYP GetMultisamplefv)(GLenum pname, GLuint index, GLfloat *val);
-    void (QOPENGLF_APIENTRYP SampleMaski)(GLuint maskNumber, GLbitfield mask);
-    void (QOPENGLF_APIENTRYP GetTexLevelParameteriv)(GLenum target, GLint level, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetTexLevelParameterfv)(GLenum target, GLint level, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP BindVertexBuffer)(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
-    void (QOPENGLF_APIENTRYP VertexAttribFormat)(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
-    void (QOPENGLF_APIENTRYP VertexAttribIFormat)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
-    void (QOPENGLF_APIENTRYP VertexAttribBinding)(GLuint attribindex, GLuint bindingindex);
-    void (QOPENGLF_APIENTRYP VertexBindingDivisor)(GLuint bindingindex, GLuint divisor);
+#define QT_OPENGL_EXTRA_FUNCTIONS(F) \
+    F(void, ReadBuffer, (GLenum mode)) \
+    F(void, DrawRangeElements, (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices)) \
+    F(void, TexImage3D, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels)) \
+    F(void, TexSubImage3D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)) \
+    F(void, CopyTexSubImage3D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)) \
+    F(void, CompressedTexImage3D, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)) \
+    F(void, CompressedTexSubImage3D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)) \
+    F(void, GenQueries, (GLsizei n, GLuint *ids)) \
+    F(void, DeleteQueries, (GLsizei n, const GLuint *ids)) \
+    F(GLboolean, IsQuery, (GLuint id)) \
+    F(void, BeginQuery, (GLenum target, GLuint id)) \
+    F(void, EndQuery, (GLenum target)) \
+    F(void, GetQueryiv, (GLenum target, GLenum pname, GLint *params)) \
+    F(void, GetQueryObjectuiv, (GLuint id, GLenum pname, GLuint *params)) \
+    F(GLboolean, UnmapBuffer, (GLenum target)) \
+    F(void, GetBufferPointerv, (GLenum target, GLenum pname, void **params)) \
+    F(void, DrawBuffers, (GLsizei n, const GLenum *bufs)) \
+    F(void, UniformMatrix2x3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, UniformMatrix3x2fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, UniformMatrix2x4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, UniformMatrix4x2fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, UniformMatrix3x4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, UniformMatrix4x3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, BlitFramebuffer, (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)) \
+    F(void, RenderbufferStorageMultisample, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)) \
+    F(void, FramebufferTextureLayer, (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)) \
+    F(void *,MapBufferRange, (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)) \
+    F(void, FlushMappedBufferRange, (GLenum target, GLintptr offset, GLsizeiptr length)) \
+    F(void, BindVertexArray, (GLuint array)) \
+    F(void, DeleteVertexArrays, (GLsizei n, const GLuint *arrays)) \
+    F(void, GenVertexArrays, (GLsizei n, GLuint *arrays)) \
+    F(GLboolean, IsVertexArray, (GLuint array)) \
+    F(void, GetIntegeri_v, (GLenum target, GLuint index, GLint *data)) \
+    F(void, BeginTransformFeedback, (GLenum primitiveMode)) \
+    F(void, EndTransformFeedback, (void)) \
+    F(void, BindBufferRange, (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)) \
+    F(void, BindBufferBase, (GLenum target, GLuint index, GLuint buffer)) \
+    F(void, TransformFeedbackVaryings, (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode)) \
+    F(void, GetTransformFeedbackVarying, (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)) \
+    F(void, VertexAttribIPointer, (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)) \
+    F(void, GetVertexAttribIiv, (GLuint index, GLenum pname, GLint *params)) \
+    F(void, GetVertexAttribIuiv, (GLuint index, GLenum pname, GLuint *params)) \
+    F(void, VertexAttribI4i, (GLuint index, GLint x, GLint y, GLint z, GLint w)) \
+    F(void, VertexAttribI4ui, (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)) \
+    F(void, VertexAttribI4iv, (GLuint index, const GLint *v)) \
+    F(void, VertexAttribI4uiv, (GLuint index, const GLuint *v)) \
+    F(void, GetUniformuiv, (GLuint program, GLint location, GLuint *params)) \
+    F(GLint, GetFragDataLocation, (GLuint program, const GLchar *name)) \
+    F(void, Uniform1ui, (GLint location, GLuint v0)) \
+    F(void, Uniform2ui, (GLint location, GLuint v0, GLuint v1)) \
+    F(void, Uniform3ui, (GLint location, GLuint v0, GLuint v1, GLuint v2)) \
+    F(void, Uniform4ui, (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)) \
+    F(void, Uniform1uiv, (GLint location, GLsizei count, const GLuint *value)) \
+    F(void, Uniform2uiv, (GLint location, GLsizei count, const GLuint *value)) \
+    F(void, Uniform3uiv, (GLint location, GLsizei count, const GLuint *value)) \
+    F(void, Uniform4uiv, (GLint location, GLsizei count, const GLuint *value)) \
+    F(void, ClearBufferiv, (GLenum buffer, GLint drawbuffer, const GLint *value)) \
+    F(void, ClearBufferuiv, (GLenum buffer, GLint drawbuffer, const GLuint *value)) \
+    F(void, ClearBufferfv, (GLenum buffer, GLint drawbuffer, const GLfloat *value)) \
+    F(void, ClearBufferfi, (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)) \
+    F(const GLubyte *, GetStringi, (GLenum name, GLuint index)) \
+    F(void, CopyBufferSubData, (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)) \
+    F(void, GetUniformIndices, (GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices)) \
+    F(void, GetActiveUniformsiv, (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)) \
+    F(GLuint, GetUniformBlockIndex, (GLuint program, const GLchar *uniformBlockName)) \
+    F(void, GetActiveUniformBlockiv, (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)) \
+    F(void, GetActiveUniformBlockName, (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)) \
+    F(void, UniformBlockBinding, (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)) \
+    F(void, DrawArraysInstanced, (GLenum mode, GLint first, GLsizei count, GLsizei instancecount)) \
+    F(void, DrawElementsInstanced, (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount)) \
+    F(GLsync, FenceSync, (GLenum condition, GLbitfield flags)) \
+    F(GLboolean, IsSync, (GLsync sync)) \
+    F(void, DeleteSync, (GLsync sync)) \
+    F(GLenum, ClientWaitSync, (GLsync sync, GLbitfield flags, GLuint64 timeout)) \
+    F(void, WaitSync, (GLsync sync, GLbitfield flags, GLuint64 timeout)) \
+    F(void, GetInteger64v, (GLenum pname, GLint64 *data)) \
+    F(void, GetSynciv, (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)) \
+    F(void, GetInteger64i_v, (GLenum target, GLuint index, GLint64 *data)) \
+    F(void, GetBufferParameteri64v, (GLenum target, GLenum pname, GLint64 *params)) \
+    F(void, GenSamplers, (GLsizei count, GLuint *samplers)) \
+    F(void, DeleteSamplers, (GLsizei count, const GLuint *samplers)) \
+    F(GLboolean, IsSampler, (GLuint sampler)) \
+    F(void, BindSampler, (GLuint unit, GLuint sampler)) \
+    F(void, SamplerParameteri, (GLuint sampler, GLenum pname, GLint param)) \
+    F(void, SamplerParameteriv, (GLuint sampler, GLenum pname, const GLint *param)) \
+    F(void, SamplerParameterf, (GLuint sampler, GLenum pname, GLfloat param)) \
+    F(void, SamplerParameterfv, (GLuint sampler, GLenum pname, const GLfloat *param)) \
+    F(void, GetSamplerParameteriv, (GLuint sampler, GLenum pname, GLint *params)) \
+    F(void, GetSamplerParameterfv, (GLuint sampler, GLenum pname, GLfloat *params)) \
+    F(void, VertexAttribDivisor, (GLuint index, GLuint divisor)) \
+    F(void, BindTransformFeedback, (GLenum target, GLuint id)) \
+    F(void, DeleteTransformFeedbacks, (GLsizei n, const GLuint *ids)) \
+    F(void, GenTransformFeedbacks, (GLsizei n, GLuint *ids)) \
+    F(GLboolean, IsTransformFeedback, (GLuint id)) \
+    F(void, PauseTransformFeedback, (void)) \
+    F(void, ResumeTransformFeedback, (void)) \
+    F(void, GetProgramBinary, (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary)) \
+    F(void, ProgramBinary, (GLuint program, GLenum binaryFormat, const void *binary, GLsizei length)) \
+    F(void, ProgramParameteri, (GLuint program, GLenum pname, GLint value)) \
+    F(void, InvalidateFramebuffer, (GLenum target, GLsizei numAttachments, const GLenum *attachments)) \
+    F(void, InvalidateSubFramebuffer, (GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height)) \
+    F(void, TexStorage2D, (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)) \
+    F(void, TexStorage3D, (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)) \
+    F(void, GetInternalformativ, (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params)) \
+    F(void, DispatchCompute, (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z)) \
+    F(void, DispatchComputeIndirect, (GLintptr indirect)) \
+    F(void, DrawArraysIndirect, (GLenum mode, const void *indirect)) \
+    F(void, DrawElementsIndirect, (GLenum mode, GLenum type, const void *indirect)) \
+    F(void, FramebufferParameteri, (GLenum target, GLenum pname, GLint param)) \
+    F(void, GetFramebufferParameteriv, (GLenum target, GLenum pname, GLint *params)) \
+    F(void, GetProgramInterfaceiv, (GLuint program, GLenum programInterface, GLenum pname, GLint *params)) \
+    F(GLuint, GetProgramResourceIndex, (GLuint program, GLenum programInterface, const GLchar *name)) \
+    F(void, GetProgramResourceName, (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name)) \
+    F(void, GetProgramResourceiv, (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params)) \
+    F(GLint, GetProgramResourceLocation, (GLuint program, GLenum programInterface, const GLchar *name)) \
+    F(void, UseProgramStages, (GLuint pipeline, GLbitfield stages, GLuint program)) \
+    F(void, ActiveShaderProgram, (GLuint pipeline, GLuint program)) \
+    F(GLuint, CreateShaderProgramv, (GLenum type, GLsizei count, const GLchar *const*strings)) \
+    F(void, BindProgramPipeline, (GLuint pipeline)) \
+    F(void, DeleteProgramPipelines, (GLsizei n, const GLuint *pipelines)) \
+    F(void, GenProgramPipelines, (GLsizei n, GLuint *pipelines)) \
+    F(GLboolean, IsProgramPipeline, (GLuint pipeline)) \
+    F(void, GetProgramPipelineiv, (GLuint pipeline, GLenum pname, GLint *params)) \
+    F(void, ProgramUniform1i, (GLuint program, GLint location, GLint v0)) \
+    F(void, ProgramUniform2i, (GLuint program, GLint location, GLint v0, GLint v1)) \
+    F(void, ProgramUniform3i, (GLuint program, GLint location, GLint v0, GLint v1, GLint v2)) \
+    F(void, ProgramUniform4i, (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)) \
+    F(void, ProgramUniform1ui, (GLuint program, GLint location, GLuint v0)) \
+    F(void, ProgramUniform2ui, (GLuint program, GLint location, GLuint v0, GLuint v1)) \
+    F(void, ProgramUniform3ui, (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)) \
+    F(void, ProgramUniform4ui, (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)) \
+    F(void, ProgramUniform1f, (GLuint program, GLint location, GLfloat v0)) \
+    F(void, ProgramUniform2f, (GLuint program, GLint location, GLfloat v0, GLfloat v1)) \
+    F(void, ProgramUniform3f, (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)) \
+    F(void, ProgramUniform4f, (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)) \
+    F(void, ProgramUniform1iv, (GLuint program, GLint location, GLsizei count, const GLint *value)) \
+    F(void, ProgramUniform2iv, (GLuint program, GLint location, GLsizei count, const GLint *value)) \
+    F(void, ProgramUniform3iv, (GLuint program, GLint location, GLsizei count, const GLint *value)) \
+    F(void, ProgramUniform4iv, (GLuint program, GLint location, GLsizei count, const GLint *value)) \
+    F(void, ProgramUniform1uiv, (GLuint program, GLint location, GLsizei count, const GLuint *value)) \
+    F(void, ProgramUniform2uiv, (GLuint program, GLint location, GLsizei count, const GLuint *value)) \
+    F(void, ProgramUniform3uiv, (GLuint program, GLint location, GLsizei count, const GLuint *value)) \
+    F(void, ProgramUniform4uiv, (GLuint program, GLint location, GLsizei count, const GLuint *value)) \
+    F(void, ProgramUniform1fv, (GLuint program, GLint location, GLsizei count, const GLfloat *value)) \
+    F(void, ProgramUniform2fv, (GLuint program, GLint location, GLsizei count, const GLfloat *value)) \
+    F(void, ProgramUniform3fv, (GLuint program, GLint location, GLsizei count, const GLfloat *value)) \
+    F(void, ProgramUniform4fv, (GLuint program, GLint location, GLsizei count, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix2fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix3fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix4fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix2x3fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix3x2fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix2x4fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix4x2fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix3x4fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix4x3fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ValidateProgramPipeline, (GLuint pipeline)) \
+    F(void, GetProgramPipelineInfoLog, (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog)) \
+    F(void, BindImageTexture, (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format)) \
+    F(void, GetBooleani_v, (GLenum target, GLuint index, GLboolean *data)) \
+    F(void, MemoryBarrier, (GLbitfield barriers)) \
+    F(void, MemoryBarrierByRegion, (GLbitfield barriers)) \
+    F(void, TexStorage2DMultisample, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)) \
+    F(void, GetMultisamplefv, (GLenum pname, GLuint index, GLfloat *val)) \
+    F(void, SampleMaski, (GLuint maskNumber, GLbitfield mask)) \
+    F(void, GetTexLevelParameteriv, (GLenum target, GLint level, GLenum pname, GLint *params)) \
+    F(void, GetTexLevelParameterfv, (GLenum target, GLint level, GLenum pname, GLfloat *params)) \
+    F(void, BindVertexBuffer, (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride)) \
+    F(void, VertexAttribFormat, (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset)) \
+    F(void, VertexAttribIFormat, (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)) \
+    F(void, VertexAttribBinding, (GLuint attribindex, GLuint bindingindex)) \
+    F(void, VertexBindingDivisor, (GLuint bindingindex, GLuint divisor)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_EXTRA_FUNCTIONS)
 };
 
 // GLES 3.0 and 3.1
@@ -595,7 +625,7 @@ inline void QOpenGLExtraFunctions::glBeginQuery(GLenum target, GLuint id)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->BeginQuery(target, id);
+    d->f.BeginQuery(target, id);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -603,7 +633,7 @@ inline void QOpenGLExtraFunctions::glBeginTransformFeedback(GLenum primitiveMode
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->BeginTransformFeedback(primitiveMode);
+    d->f.BeginTransformFeedback(primitiveMode);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -611,7 +641,7 @@ inline void QOpenGLExtraFunctions::glBindBufferBase(GLenum target, GLuint index,
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->BindBufferBase(target, index, buffer);
+    d->f.BindBufferBase(target, index, buffer);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -619,7 +649,7 @@ inline void QOpenGLExtraFunctions::glBindBufferRange(GLenum target, GLuint index
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->BindBufferRange(target, index, buffer, offset, size);
+    d->f.BindBufferRange(target, index, buffer, offset, size);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -627,7 +657,7 @@ inline void QOpenGLExtraFunctions::glBindSampler(GLuint unit, GLuint sampler)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->BindSampler(unit, sampler);
+    d->f.BindSampler(unit, sampler);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -635,7 +665,7 @@ inline void QOpenGLExtraFunctions::glBindTransformFeedback(GLenum target, GLuint
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->BindTransformFeedback(target, id);
+    d->f.BindTransformFeedback(target, id);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -643,7 +673,7 @@ inline void QOpenGLExtraFunctions::glBindVertexArray(GLuint array)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->BindVertexArray(array);
+    d->f.BindVertexArray(array);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -651,7 +681,7 @@ inline void QOpenGLExtraFunctions::glBlitFramebuffer(GLint srcX0, GLint srcY0, G
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -659,7 +689,7 @@ inline void QOpenGLExtraFunctions::glClearBufferfi(GLenum buffer, GLint drawbuff
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -667,7 +697,7 @@ inline void QOpenGLExtraFunctions::glClearBufferfv(GLenum buffer, GLint drawbuff
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ClearBufferfv(buffer, drawbuffer, value);
+    d->f.ClearBufferfv(buffer, drawbuffer, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -675,7 +705,7 @@ inline void QOpenGLExtraFunctions::glClearBufferiv(GLenum buffer, GLint drawbuff
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ClearBufferiv(buffer, drawbuffer, value);
+    d->f.ClearBufferiv(buffer, drawbuffer, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -683,7 +713,7 @@ inline void QOpenGLExtraFunctions::glClearBufferuiv(GLenum buffer, GLint drawbuf
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ClearBufferuiv(buffer, drawbuffer, value);
+    d->f.ClearBufferuiv(buffer, drawbuffer, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -691,7 +721,7 @@ inline GLenum QOpenGLExtraFunctions::glClientWaitSync(GLsync sync, GLbitfield fl
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    GLenum result = d->ClientWaitSync(sync, flags, timeout);
+    GLenum result = d->f.ClientWaitSync(sync, flags, timeout);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -700,7 +730,7 @@ inline void QOpenGLExtraFunctions::glCompressedTexImage3D(GLenum target, GLint l
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -708,7 +738,7 @@ inline void QOpenGLExtraFunctions::glCompressedTexSubImage3D(GLenum target, GLin
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -716,7 +746,7 @@ inline void QOpenGLExtraFunctions::glCopyBufferSubData(GLenum readTarget, GLenum
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -724,7 +754,7 @@ inline void QOpenGLExtraFunctions::glCopyTexSubImage3D(GLenum target, GLint leve
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -732,7 +762,7 @@ inline void QOpenGLExtraFunctions::glDeleteQueries(GLsizei n, const GLuint * ids
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->DeleteQueries(n, ids);
+    d->f.DeleteQueries(n, ids);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -740,7 +770,7 @@ inline void QOpenGLExtraFunctions::glDeleteSamplers(GLsizei count, const GLuint
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->DeleteSamplers(count, samplers);
+    d->f.DeleteSamplers(count, samplers);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -748,7 +778,7 @@ inline void QOpenGLExtraFunctions::glDeleteSync(GLsync sync)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->DeleteSync(sync);
+    d->f.DeleteSync(sync);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -756,7 +786,7 @@ inline void QOpenGLExtraFunctions::glDeleteTransformFeedbacks(GLsizei n, const G
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->DeleteTransformFeedbacks(n, ids);
+    d->f.DeleteTransformFeedbacks(n, ids);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -764,7 +794,7 @@ inline void QOpenGLExtraFunctions::glDeleteVertexArrays(GLsizei n, const GLuint
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->DeleteVertexArrays(n, arrays);
+    d->f.DeleteVertexArrays(n, arrays);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -772,7 +802,7 @@ inline void QOpenGLExtraFunctions::glDrawArraysInstanced(GLenum mode, GLint firs
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->DrawArraysInstanced(mode, first, count, instancecount);
+    d->f.DrawArraysInstanced(mode, first, count, instancecount);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -780,7 +810,7 @@ inline void QOpenGLExtraFunctions::glDrawBuffers(GLsizei n, const GLenum * bufs)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->DrawBuffers(n, bufs);
+    d->f.DrawBuffers(n, bufs);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -788,7 +818,7 @@ inline void QOpenGLExtraFunctions::glDrawElementsInstanced(GLenum mode, GLsizei
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -796,7 +826,7 @@ inline void QOpenGLExtraFunctions::glDrawRangeElements(GLenum mode, GLuint start
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->DrawRangeElements(mode, start, end, count, type, indices);
+    d->f.DrawRangeElements(mode, start, end, count, type, indices);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -804,7 +834,7 @@ inline void QOpenGLExtraFunctions::glEndQuery(GLenum target)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->EndQuery(target);
+    d->f.EndQuery(target);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -812,7 +842,7 @@ inline void QOpenGLExtraFunctions::glEndTransformFeedback()
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->EndTransformFeedback();
+    d->f.EndTransformFeedback();
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -820,7 +850,7 @@ inline GLsync QOpenGLExtraFunctions::glFenceSync(GLenum condition, GLbitfield fl
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    GLsync result = d->FenceSync(condition, flags);
+    GLsync result = d->f.FenceSync(condition, flags);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -829,7 +859,7 @@ inline void QOpenGLExtraFunctions::glFlushMappedBufferRange(GLenum target, GLint
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->FlushMappedBufferRange(target, offset, length);
+    d->f.FlushMappedBufferRange(target, offset, length);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -837,7 +867,7 @@ inline void QOpenGLExtraFunctions::glFramebufferTextureLayer(GLenum target, GLen
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -845,7 +875,7 @@ inline void QOpenGLExtraFunctions::glGenQueries(GLsizei n, GLuint* ids)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GenQueries(n, ids);
+    d->f.GenQueries(n, ids);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -853,7 +883,7 @@ inline void QOpenGLExtraFunctions::glGenSamplers(GLsizei count, GLuint* samplers
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GenSamplers(count, samplers);
+    d->f.GenSamplers(count, samplers);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -861,7 +891,7 @@ inline void QOpenGLExtraFunctions::glGenTransformFeedbacks(GLsizei n, GLuint* id
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GenTransformFeedbacks(n, ids);
+    d->f.GenTransformFeedbacks(n, ids);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -869,7 +899,7 @@ inline void QOpenGLExtraFunctions::glGenVertexArrays(GLsizei n, GLuint* arrays)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GenVertexArrays(n, arrays);
+    d->f.GenVertexArrays(n, arrays);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -877,7 +907,7 @@ inline void QOpenGLExtraFunctions::glGetActiveUniformBlockName(GLuint program, G
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -885,7 +915,7 @@ inline void QOpenGLExtraFunctions::glGetActiveUniformBlockiv(GLuint program, GLu
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -893,7 +923,7 @@ inline void QOpenGLExtraFunctions::glGetActiveUniformsiv(GLuint program, GLsizei
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -901,7 +931,7 @@ inline void QOpenGLExtraFunctions::glGetBufferParameteri64v(GLenum target, GLenu
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetBufferParameteri64v(target, pname, params);
+    d->f.GetBufferParameteri64v(target, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -909,7 +939,7 @@ inline void QOpenGLExtraFunctions::glGetBufferPointerv(GLenum target, GLenum pna
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetBufferPointerv(target, pname, params);
+    d->f.GetBufferPointerv(target, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -917,7 +947,7 @@ inline GLint QOpenGLExtraFunctions::glGetFragDataLocation(GLuint program, const
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    GLint result = d->GetFragDataLocation(program, name);
+    GLint result = d->f.GetFragDataLocation(program, name);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -926,7 +956,7 @@ inline void QOpenGLExtraFunctions::glGetInteger64i_v(GLenum target, GLuint index
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetInteger64i_v(target, index, data);
+    d->f.GetInteger64i_v(target, index, data);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -934,7 +964,7 @@ inline void QOpenGLExtraFunctions::glGetInteger64v(GLenum pname, GLint64* data)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetInteger64v(pname, data);
+    d->f.GetInteger64v(pname, data);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -942,7 +972,7 @@ inline void QOpenGLExtraFunctions::glGetIntegeri_v(GLenum target, GLuint index,
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetIntegeri_v(target, index, data);
+    d->f.GetIntegeri_v(target, index, data);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -950,7 +980,7 @@ inline void QOpenGLExtraFunctions::glGetInternalformativ(GLenum target, GLenum i
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetInternalformativ(target, internalformat, pname, bufSize, params);
+    d->f.GetInternalformativ(target, internalformat, pname, bufSize, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -958,7 +988,7 @@ inline void QOpenGLExtraFunctions::glGetProgramBinary(GLuint program, GLsizei bu
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetProgramBinary(program, bufSize, length, binaryFormat, binary);
+    d->f.GetProgramBinary(program, bufSize, length, binaryFormat, binary);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -966,7 +996,7 @@ inline void QOpenGLExtraFunctions::glGetQueryObjectuiv(GLuint id, GLenum pname,
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetQueryObjectuiv(id, pname, params);
+    d->f.GetQueryObjectuiv(id, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -974,7 +1004,7 @@ inline void QOpenGLExtraFunctions::glGetQueryiv(GLenum target, GLenum pname, GLi
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetQueryiv(target, pname, params);
+    d->f.GetQueryiv(target, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -982,7 +1012,7 @@ inline void QOpenGLExtraFunctions::glGetSamplerParameterfv(GLuint sampler, GLenu
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetSamplerParameterfv(sampler, pname, params);
+    d->f.GetSamplerParameterfv(sampler, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -990,7 +1020,7 @@ inline void QOpenGLExtraFunctions::glGetSamplerParameteriv(GLuint sampler, GLenu
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetSamplerParameteriv(sampler, pname, params);
+    d->f.GetSamplerParameteriv(sampler, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -998,7 +1028,7 @@ inline const GLubyte * QOpenGLExtraFunctions::glGetStringi(GLenum name, GLuint i
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    const GLubyte * result = d->GetStringi(name, index);
+    const GLubyte * result = d->f.GetStringi(name, index);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -1007,7 +1037,7 @@ inline void QOpenGLExtraFunctions::glGetSynciv(GLsync sync, GLenum pname, GLsize
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetSynciv(sync, pname, bufSize, length, values);
+    d->f.GetSynciv(sync, pname, bufSize, length, values);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1015,7 +1045,7 @@ inline void QOpenGLExtraFunctions::glGetTransformFeedbackVarying(GLuint program,
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1023,7 +1053,7 @@ inline GLuint QOpenGLExtraFunctions::glGetUniformBlockIndex(GLuint program, cons
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    GLuint result = d->GetUniformBlockIndex(program, uniformBlockName);
+    GLuint result = d->f.GetUniformBlockIndex(program, uniformBlockName);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -1032,7 +1062,7 @@ inline void QOpenGLExtraFunctions::glGetUniformIndices(GLuint program, GLsizei u
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1040,7 +1070,7 @@ inline void QOpenGLExtraFunctions::glGetUniformuiv(GLuint program, GLint locatio
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetUniformuiv(program, location, params);
+    d->f.GetUniformuiv(program, location, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1048,7 +1078,7 @@ inline void QOpenGLExtraFunctions::glGetVertexAttribIiv(GLuint index, GLenum pna
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetVertexAttribIiv(index, pname, params);
+    d->f.GetVertexAttribIiv(index, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1056,7 +1086,7 @@ inline void QOpenGLExtraFunctions::glGetVertexAttribIuiv(GLuint index, GLenum pn
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetVertexAttribIuiv(index, pname, params);
+    d->f.GetVertexAttribIuiv(index, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1064,7 +1094,7 @@ inline void QOpenGLExtraFunctions::glInvalidateFramebuffer(GLenum target, GLsize
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->InvalidateFramebuffer(target, numAttachments, attachments);
+    d->f.InvalidateFramebuffer(target, numAttachments, attachments);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1072,7 +1102,7 @@ inline void QOpenGLExtraFunctions::glInvalidateSubFramebuffer(GLenum target, GLs
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
+    d->f.InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1080,7 +1110,7 @@ inline GLboolean QOpenGLExtraFunctions::glIsQuery(GLuint id)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    GLboolean result = d->IsQuery(id);
+    GLboolean result = d->f.IsQuery(id);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -1089,7 +1119,7 @@ inline GLboolean QOpenGLExtraFunctions::glIsSampler(GLuint sampler)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    GLboolean result = d->IsSampler(sampler);
+    GLboolean result = d->f.IsSampler(sampler);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -1098,7 +1128,7 @@ inline GLboolean QOpenGLExtraFunctions::glIsSync(GLsync sync)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    GLboolean result = d->IsSync(sync);
+    GLboolean result = d->f.IsSync(sync);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -1107,7 +1137,7 @@ inline GLboolean QOpenGLExtraFunctions::glIsTransformFeedback(GLuint id)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    GLboolean result = d->IsTransformFeedback(id);
+    GLboolean result = d->f.IsTransformFeedback(id);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -1116,7 +1146,7 @@ inline GLboolean QOpenGLExtraFunctions::glIsVertexArray(GLuint array)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    GLboolean result = d->IsVertexArray(array);
+    GLboolean result = d->f.IsVertexArray(array);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -1125,7 +1155,7 @@ inline void * QOpenGLExtraFunctions::glMapBufferRange(GLenum target, GLintptr of
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    void *result = d->MapBufferRange(target, offset, length, access);
+    void *result = d->f.MapBufferRange(target, offset, length, access);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -1134,7 +1164,7 @@ inline void QOpenGLExtraFunctions::glPauseTransformFeedback()
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->PauseTransformFeedback();
+    d->f.PauseTransformFeedback();
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1142,7 +1172,7 @@ inline void QOpenGLExtraFunctions::glProgramBinary(GLuint program, GLenum binary
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramBinary(program, binaryFormat, binary, length);
+    d->f.ProgramBinary(program, binaryFormat, binary, length);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1150,7 +1180,7 @@ inline void QOpenGLExtraFunctions::glProgramParameteri(GLuint program, GLenum pn
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramParameteri(program, pname, value);
+    d->f.ProgramParameteri(program, pname, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1158,7 +1188,7 @@ inline void QOpenGLExtraFunctions::glReadBuffer(GLenum src)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ReadBuffer(src);
+    d->f.ReadBuffer(src);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1166,7 +1196,7 @@ inline void QOpenGLExtraFunctions::glRenderbufferStorageMultisample(GLenum targe
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1174,7 +1204,7 @@ inline void QOpenGLExtraFunctions::glResumeTransformFeedback()
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ResumeTransformFeedback();
+    d->f.ResumeTransformFeedback();
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1182,7 +1212,7 @@ inline void QOpenGLExtraFunctions::glSamplerParameterf(GLuint sampler, GLenum pn
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->SamplerParameterf(sampler, pname, param);
+    d->f.SamplerParameterf(sampler, pname, param);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1190,7 +1220,7 @@ inline void QOpenGLExtraFunctions::glSamplerParameterfv(GLuint sampler, GLenum p
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->SamplerParameterfv(sampler, pname, param);
+    d->f.SamplerParameterfv(sampler, pname, param);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1198,7 +1228,7 @@ inline void QOpenGLExtraFunctions::glSamplerParameteri(GLuint sampler, GLenum pn
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->SamplerParameteri(sampler, pname, param);
+    d->f.SamplerParameteri(sampler, pname, param);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1206,7 +1236,7 @@ inline void QOpenGLExtraFunctions::glSamplerParameteriv(GLuint sampler, GLenum p
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->SamplerParameteriv(sampler, pname, param);
+    d->f.SamplerParameteriv(sampler, pname, param);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1214,7 +1244,7 @@ inline void QOpenGLExtraFunctions::glTexImage3D(GLenum target, GLint level, GLin
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1222,7 +1252,7 @@ inline void QOpenGLExtraFunctions::glTexStorage2D(GLenum target, GLsizei levels,
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->TexStorage2D(target, levels, internalformat, width, height);
+    d->f.TexStorage2D(target, levels, internalformat, width, height);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1230,7 +1260,7 @@ inline void QOpenGLExtraFunctions::glTexStorage3D(GLenum target, GLsizei levels,
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->TexStorage3D(target, levels, internalformat, width, height, depth);
+    d->f.TexStorage3D(target, levels, internalformat, width, height, depth);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1238,7 +1268,7 @@ inline void QOpenGLExtraFunctions::glTexSubImage3D(GLenum target, GLint level, G
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1246,7 +1276,7 @@ inline void QOpenGLExtraFunctions::glTransformFeedbackVaryings(GLuint program, G
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1254,7 +1284,7 @@ inline void QOpenGLExtraFunctions::glUniform1ui(GLint location, GLuint v0)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->Uniform1ui(location, v0);
+    d->f.Uniform1ui(location, v0);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1262,7 +1292,7 @@ inline void QOpenGLExtraFunctions::glUniform1uiv(GLint location, GLsizei count,
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->Uniform1uiv(location, count, value);
+    d->f.Uniform1uiv(location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1270,7 +1300,7 @@ inline void QOpenGLExtraFunctions::glUniform2ui(GLint location, GLuint v0, GLuin
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->Uniform2ui(location, v0, v1);
+    d->f.Uniform2ui(location, v0, v1);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1278,7 +1308,7 @@ inline void QOpenGLExtraFunctions::glUniform2uiv(GLint location, GLsizei count,
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->Uniform2uiv(location, count, value);
+    d->f.Uniform2uiv(location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1286,7 +1316,7 @@ inline void QOpenGLExtraFunctions::glUniform3ui(GLint location, GLuint v0, GLuin
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->Uniform3ui(location, v0, v1, v2);
+    d->f.Uniform3ui(location, v0, v1, v2);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1294,7 +1324,7 @@ inline void QOpenGLExtraFunctions::glUniform3uiv(GLint location, GLsizei count,
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->Uniform3uiv(location, count, value);
+    d->f.Uniform3uiv(location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1302,7 +1332,7 @@ inline void QOpenGLExtraFunctions::glUniform4ui(GLint location, GLuint v0, GLuin
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->Uniform4ui(location, v0, v1, v2, v3);
+    d->f.Uniform4ui(location, v0, v1, v2, v3);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1310,7 +1340,7 @@ inline void QOpenGLExtraFunctions::glUniform4uiv(GLint location, GLsizei count,
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->Uniform4uiv(location, count, value);
+    d->f.Uniform4uiv(location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1318,7 +1348,7 @@ inline void QOpenGLExtraFunctions::glUniformBlockBinding(GLuint program, GLuint
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1326,7 +1356,7 @@ inline void QOpenGLExtraFunctions::glUniformMatrix2x3fv(GLint location, GLsizei
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->UniformMatrix2x3fv(location, count, transpose, value);
+    d->f.UniformMatrix2x3fv(location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1334,7 +1364,7 @@ inline void QOpenGLExtraFunctions::glUniformMatrix2x4fv(GLint location, GLsizei
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->UniformMatrix2x4fv(location, count, transpose, value);
+    d->f.UniformMatrix2x4fv(location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1342,7 +1372,7 @@ inline void QOpenGLExtraFunctions::glUniformMatrix3x2fv(GLint location, GLsizei
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->UniformMatrix3x2fv(location, count, transpose, value);
+    d->f.UniformMatrix3x2fv(location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1350,7 +1380,7 @@ inline void QOpenGLExtraFunctions::glUniformMatrix3x4fv(GLint location, GLsizei
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->UniformMatrix3x4fv(location, count, transpose, value);
+    d->f.UniformMatrix3x4fv(location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1358,7 +1388,7 @@ inline void QOpenGLExtraFunctions::glUniformMatrix4x2fv(GLint location, GLsizei
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->UniformMatrix4x2fv(location, count, transpose, value);
+    d->f.UniformMatrix4x2fv(location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1366,7 +1396,7 @@ inline void QOpenGLExtraFunctions::glUniformMatrix4x3fv(GLint location, GLsizei
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->UniformMatrix4x3fv(location, count, transpose, value);
+    d->f.UniformMatrix4x3fv(location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1374,7 +1404,7 @@ inline GLboolean QOpenGLExtraFunctions::glUnmapBuffer(GLenum target)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    GLboolean result = d->UnmapBuffer(target);
+    GLboolean result = d->f.UnmapBuffer(target);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -1383,7 +1413,7 @@ inline void QOpenGLExtraFunctions::glVertexAttribDivisor(GLuint index, GLuint di
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->VertexAttribDivisor(index, divisor);
+    d->f.VertexAttribDivisor(index, divisor);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1391,7 +1421,7 @@ inline void QOpenGLExtraFunctions::glVertexAttribI4i(GLuint index, GLint x, GLin
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->VertexAttribI4i(index, x, y, z, w);
+    d->f.VertexAttribI4i(index, x, y, z, w);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1399,7 +1429,7 @@ inline void QOpenGLExtraFunctions::glVertexAttribI4iv(GLuint index, const GLint
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->VertexAttribI4iv(index, v);
+    d->f.VertexAttribI4iv(index, v);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1407,7 +1437,7 @@ inline void QOpenGLExtraFunctions::glVertexAttribI4ui(GLuint index, GLuint x, GL
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->VertexAttribI4ui(index, x, y, z, w);
+    d->f.VertexAttribI4ui(index, x, y, z, w);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1415,7 +1445,7 @@ inline void QOpenGLExtraFunctions::glVertexAttribI4uiv(GLuint index, const GLuin
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->VertexAttribI4uiv(index, v);
+    d->f.VertexAttribI4uiv(index, v);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1423,7 +1453,7 @@ inline void QOpenGLExtraFunctions::glVertexAttribIPointer(GLuint index, GLint si
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->VertexAttribIPointer(index, size, type, stride, pointer);
+    d->f.VertexAttribIPointer(index, size, type, stride, pointer);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1431,7 +1461,7 @@ inline void QOpenGLExtraFunctions::glWaitSync(GLsync sync, GLbitfield flags, GLu
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->WaitSync(sync, flags, timeout);
+    d->f.WaitSync(sync, flags, timeout);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1439,7 +1469,7 @@ inline void QOpenGLExtraFunctions::glActiveShaderProgram(GLuint pipeline, GLuint
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ActiveShaderProgram(pipeline, program);
+    d->f.ActiveShaderProgram(pipeline, program);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1447,7 +1477,7 @@ inline void QOpenGLExtraFunctions::glBindImageTexture(GLuint unit, GLuint textur
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->BindImageTexture(unit, texture, level, layered, layer, access, format);
+    d->f.BindImageTexture(unit, texture, level, layered, layer, access, format);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1455,7 +1485,7 @@ inline void QOpenGLExtraFunctions::glBindProgramPipeline(GLuint pipeline)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->BindProgramPipeline(pipeline);
+    d->f.BindProgramPipeline(pipeline);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1463,7 +1493,7 @@ inline void QOpenGLExtraFunctions::glBindVertexBuffer(GLuint bindingindex, GLuin
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->BindVertexBuffer(bindingindex, buffer, offset, stride);
+    d->f.BindVertexBuffer(bindingindex, buffer, offset, stride);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1471,7 +1501,7 @@ inline GLuint QOpenGLExtraFunctions::glCreateShaderProgramv(GLenum type, GLsizei
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    GLuint result = d->CreateShaderProgramv(type, count, strings);
+    GLuint result = d->f.CreateShaderProgramv(type, count, strings);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -1480,7 +1510,7 @@ inline void QOpenGLExtraFunctions::glDeleteProgramPipelines(GLsizei n, const GLu
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->DeleteProgramPipelines(n, pipelines);
+    d->f.DeleteProgramPipelines(n, pipelines);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1488,7 +1518,7 @@ inline void QOpenGLExtraFunctions::glDispatchCompute(GLuint num_groups_x, GLuint
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
+    d->f.DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1496,7 +1526,7 @@ inline void QOpenGLExtraFunctions::glDispatchComputeIndirect(GLintptr indirect)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->DispatchComputeIndirect(indirect);
+    d->f.DispatchComputeIndirect(indirect);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1504,7 +1534,7 @@ inline void QOpenGLExtraFunctions::glDrawArraysIndirect(GLenum mode, const void
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->DrawArraysIndirect(mode, indirect);
+    d->f.DrawArraysIndirect(mode, indirect);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1512,7 +1542,7 @@ inline void QOpenGLExtraFunctions::glDrawElementsIndirect(GLenum mode, GLenum ty
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->DrawElementsIndirect(mode, type, indirect);
+    d->f.DrawElementsIndirect(mode, type, indirect);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1520,7 +1550,7 @@ inline void QOpenGLExtraFunctions::glFramebufferParameteri(GLenum target, GLenum
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->FramebufferParameteri(target, pname, param);
+    d->f.FramebufferParameteri(target, pname, param);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1528,7 +1558,7 @@ inline void QOpenGLExtraFunctions::glGenProgramPipelines(GLsizei n, GLuint* pipe
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GenProgramPipelines(n, pipelines);
+    d->f.GenProgramPipelines(n, pipelines);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1536,7 +1566,7 @@ inline void QOpenGLExtraFunctions::glGetBooleani_v(GLenum target, GLuint index,
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetBooleani_v(target, index, data);
+    d->f.GetBooleani_v(target, index, data);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1544,7 +1574,7 @@ inline void QOpenGLExtraFunctions::glGetFramebufferParameteriv(GLenum target, GL
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetFramebufferParameteriv(target, pname, params);
+    d->f.GetFramebufferParameteriv(target, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1552,7 +1582,7 @@ inline void QOpenGLExtraFunctions::glGetMultisamplefv(GLenum pname, GLuint index
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetMultisamplefv(pname, index, val);
+    d->f.GetMultisamplefv(pname, index, val);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1560,7 +1590,7 @@ inline void QOpenGLExtraFunctions::glGetProgramInterfaceiv(GLuint program, GLenu
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetProgramInterfaceiv(program, programInterface, pname, params);
+    d->f.GetProgramInterfaceiv(program, programInterface, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1568,7 +1598,7 @@ inline void QOpenGLExtraFunctions::glGetProgramPipelineInfoLog(GLuint pipeline,
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
+    d->f.GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1576,7 +1606,7 @@ inline void QOpenGLExtraFunctions::glGetProgramPipelineiv(GLuint pipeline, GLenu
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetProgramPipelineiv(pipeline, pname, params);
+    d->f.GetProgramPipelineiv(pipeline, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1584,7 +1614,7 @@ inline GLuint QOpenGLExtraFunctions::glGetProgramResourceIndex(GLuint program, G
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    GLuint result = d->GetProgramResourceIndex(program, programInterface, name);
+    GLuint result = d->f.GetProgramResourceIndex(program, programInterface, name);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -1593,7 +1623,7 @@ inline GLint QOpenGLExtraFunctions::glGetProgramResourceLocation(GLuint program,
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    GLint result = d->GetProgramResourceLocation(program, programInterface, name);
+    GLint result = d->f.GetProgramResourceLocation(program, programInterface, name);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -1602,7 +1632,7 @@ inline void QOpenGLExtraFunctions::glGetProgramResourceName(GLuint program, GLen
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetProgramResourceName(program, programInterface, index, bufSize, length, name);
+    d->f.GetProgramResourceName(program, programInterface, index, bufSize, length, name);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1610,7 +1640,7 @@ inline void QOpenGLExtraFunctions::glGetProgramResourceiv(GLuint program, GLenum
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
+    d->f.GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1618,7 +1648,7 @@ inline void QOpenGLExtraFunctions::glGetTexLevelParameterfv(GLenum target, GLint
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetTexLevelParameterfv(target, level, pname, params);
+    d->f.GetTexLevelParameterfv(target, level, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1626,7 +1656,7 @@ inline void QOpenGLExtraFunctions::glGetTexLevelParameteriv(GLenum target, GLint
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->GetTexLevelParameteriv(target, level, pname, params);
+    d->f.GetTexLevelParameteriv(target, level, pname, params);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1634,7 +1664,7 @@ inline GLboolean QOpenGLExtraFunctions::glIsProgramPipeline(GLuint pipeline)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    GLboolean result = d->IsProgramPipeline(pipeline);
+    GLboolean result = d->f.IsProgramPipeline(pipeline);
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
 }
@@ -1643,7 +1673,7 @@ inline void QOpenGLExtraFunctions::glMemoryBarrier(GLbitfield barriers)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->MemoryBarrierFunc(barriers);
+    d->f.MemoryBarrier(barriers);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1651,7 +1681,7 @@ inline void QOpenGLExtraFunctions::glMemoryBarrierByRegion(GLbitfield barriers)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->MemoryBarrierByRegion(barriers);
+    d->f.MemoryBarrierByRegion(barriers);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1659,7 +1689,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform1f(GLuint program, GLint loca
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform1f(program, location, v0);
+    d->f.ProgramUniform1f(program, location, v0);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1667,7 +1697,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform1fv(GLuint program, GLint loc
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform1fv(program, location, count, value);
+    d->f.ProgramUniform1fv(program, location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1675,7 +1705,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform1i(GLuint program, GLint loca
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform1i(program, location, v0);
+    d->f.ProgramUniform1i(program, location, v0);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1683,7 +1713,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform1iv(GLuint program, GLint loc
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform1iv(program, location, count, value);
+    d->f.ProgramUniform1iv(program, location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1691,7 +1721,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform1ui(GLuint program, GLint loc
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform1ui(program, location, v0);
+    d->f.ProgramUniform1ui(program, location, v0);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1699,7 +1729,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform1uiv(GLuint program, GLint lo
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform1uiv(program, location, count, value);
+    d->f.ProgramUniform1uiv(program, location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1707,7 +1737,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform2f(GLuint program, GLint loca
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform2f(program, location, v0, v1);
+    d->f.ProgramUniform2f(program, location, v0, v1);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1715,7 +1745,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform2fv(GLuint program, GLint loc
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform2fv(program, location, count, value);
+    d->f.ProgramUniform2fv(program, location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1723,7 +1753,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform2i(GLuint program, GLint loca
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform2i(program, location, v0, v1);
+    d->f.ProgramUniform2i(program, location, v0, v1);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1731,7 +1761,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform2iv(GLuint program, GLint loc
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform2iv(program, location, count, value);
+    d->f.ProgramUniform2iv(program, location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1739,7 +1769,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform2ui(GLuint program, GLint loc
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform2ui(program, location, v0, v1);
+    d->f.ProgramUniform2ui(program, location, v0, v1);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1747,7 +1777,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform2uiv(GLuint program, GLint lo
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform2uiv(program, location, count, value);
+    d->f.ProgramUniform2uiv(program, location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1755,7 +1785,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform3f(GLuint program, GLint loca
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform3f(program, location, v0, v1, v2);
+    d->f.ProgramUniform3f(program, location, v0, v1, v2);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1763,7 +1793,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform3fv(GLuint program, GLint loc
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform3fv(program, location, count, value);
+    d->f.ProgramUniform3fv(program, location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1771,7 +1801,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform3i(GLuint program, GLint loca
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform3i(program, location, v0, v1, v2);
+    d->f.ProgramUniform3i(program, location, v0, v1, v2);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1779,7 +1809,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform3iv(GLuint program, GLint loc
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform3iv(program, location, count, value);
+    d->f.ProgramUniform3iv(program, location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1787,7 +1817,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform3ui(GLuint program, GLint loc
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform3ui(program, location, v0, v1, v2);
+    d->f.ProgramUniform3ui(program, location, v0, v1, v2);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1795,7 +1825,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform3uiv(GLuint program, GLint lo
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform3uiv(program, location, count, value);
+    d->f.ProgramUniform3uiv(program, location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1803,7 +1833,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform4f(GLuint program, GLint loca
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform4f(program, location, v0, v1, v2, v3);
+    d->f.ProgramUniform4f(program, location, v0, v1, v2, v3);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1811,7 +1841,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform4fv(GLuint program, GLint loc
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform4fv(program, location, count, value);
+    d->f.ProgramUniform4fv(program, location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1819,7 +1849,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform4i(GLuint program, GLint loca
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform4i(program, location, v0, v1, v2, v3);
+    d->f.ProgramUniform4i(program, location, v0, v1, v2, v3);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1827,7 +1857,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform4iv(GLuint program, GLint loc
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform4iv(program, location, count, value);
+    d->f.ProgramUniform4iv(program, location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1835,7 +1865,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform4ui(GLuint program, GLint loc
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform4ui(program, location, v0, v1, v2, v3);
+    d->f.ProgramUniform4ui(program, location, v0, v1, v2, v3);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1843,7 +1873,7 @@ inline void QOpenGLExtraFunctions::glProgramUniform4uiv(GLuint program, GLint lo
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniform4uiv(program, location, count, value);
+    d->f.ProgramUniform4uiv(program, location, count, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1851,7 +1881,7 @@ inline void QOpenGLExtraFunctions::glProgramUniformMatrix2fv(GLuint program, GLi
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniformMatrix2fv(program, location, count, transpose, value);
+    d->f.ProgramUniformMatrix2fv(program, location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1859,7 +1889,7 @@ inline void QOpenGLExtraFunctions::glProgramUniformMatrix2x3fv(GLuint program, G
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
+    d->f.ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1867,7 +1897,7 @@ inline void QOpenGLExtraFunctions::glProgramUniformMatrix2x4fv(GLuint program, G
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
+    d->f.ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1875,7 +1905,7 @@ inline void QOpenGLExtraFunctions::glProgramUniformMatrix3fv(GLuint program, GLi
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniformMatrix3fv(program, location, count, transpose, value);
+    d->f.ProgramUniformMatrix3fv(program, location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1883,7 +1913,7 @@ inline void QOpenGLExtraFunctions::glProgramUniformMatrix3x2fv(GLuint program, G
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
+    d->f.ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1891,7 +1921,7 @@ inline void QOpenGLExtraFunctions::glProgramUniformMatrix3x4fv(GLuint program, G
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
+    d->f.ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1899,7 +1929,7 @@ inline void QOpenGLExtraFunctions::glProgramUniformMatrix4fv(GLuint program, GLi
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniformMatrix4fv(program, location, count, transpose, value);
+    d->f.ProgramUniformMatrix4fv(program, location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1907,7 +1937,7 @@ inline void QOpenGLExtraFunctions::glProgramUniformMatrix4x2fv(GLuint program, G
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
+    d->f.ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1915,7 +1945,7 @@ inline void QOpenGLExtraFunctions::glProgramUniformMatrix4x3fv(GLuint program, G
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
+    d->f.ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1923,7 +1953,7 @@ inline void QOpenGLExtraFunctions::glSampleMaski(GLuint maskNumber, GLbitfield m
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->SampleMaski(maskNumber, mask);
+    d->f.SampleMaski(maskNumber, mask);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1931,7 +1961,7 @@ inline void QOpenGLExtraFunctions::glTexStorage2DMultisample(GLenum target, GLsi
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d->f.TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1939,7 +1969,7 @@ inline void QOpenGLExtraFunctions::glUseProgramStages(GLuint pipeline, GLbitfiel
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->UseProgramStages(pipeline, stages, program);
+    d->f.UseProgramStages(pipeline, stages, program);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1947,7 +1977,7 @@ inline void QOpenGLExtraFunctions::glValidateProgramPipeline(GLuint pipeline)
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->ValidateProgramPipeline(pipeline);
+    d->f.ValidateProgramPipeline(pipeline);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1955,7 +1985,7 @@ inline void QOpenGLExtraFunctions::glVertexAttribBinding(GLuint attribindex, GLu
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->VertexAttribBinding(attribindex, bindingindex);
+    d->f.VertexAttribBinding(attribindex, bindingindex);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1963,7 +1993,7 @@ inline void QOpenGLExtraFunctions::glVertexAttribFormat(GLuint attribindex, GLin
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
+    d->f.VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1971,7 +2001,7 @@ inline void QOpenGLExtraFunctions::glVertexAttribIFormat(GLuint attribindex, GLi
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->VertexAttribIFormat(attribindex, size, type, relativeoffset);
+    d->f.VertexAttribIFormat(attribindex, size, type, relativeoffset);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
@@ -1979,12 +2009,20 @@ inline void QOpenGLExtraFunctions::glVertexBindingDivisor(GLuint bindingindex, G
 {
     Q_D(QOpenGLExtraFunctions);
     Q_ASSERT(QOpenGLExtraFunctions::isInitialized(d));
-    d->VertexBindingDivisor(bindingindex, divisor);
+    d->f.VertexBindingDivisor(bindingindex, divisor);
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
 QT_END_NAMESPACE
 
+#undef QT_OPENGL_DECLARE_FUNCTIONS
+#undef QT_OPENGL_COUNT_FUNCTIONS
+#undef QT_OPENGL_DECLARE
+
+#ifdef Q_OS_WIN
+#pragma pop_macro("MemoryBarrier")
+#endif
+
 #endif // QT_NO_OPENGL
 
 #endif
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp
index b1b580f85b..d9d4288ec8 100644
--- a/src/gui/opengl/qopenglframebufferobject.cpp
+++ b/src/gui/opengl/qopenglframebufferobject.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -937,7 +943,7 @@ QOpenGLFramebufferObject::~QOpenGLFramebufferObject()
     if (isBound())
         release();
 
-    foreach (const QOpenGLFramebufferObjectPrivate::ColorAttachment &color, d->colorAttachments) {
+    for (const auto &color : qAsConst(d->colorAttachments)) {
         if (color.guard)
             color.guard->free();
     }
@@ -1073,7 +1079,7 @@ bool QOpenGLFramebufferObject::bind()
     if (d->format.samples() == 0) {
         // Create new textures to replace the ones stolen via takeTexture().
         for (int i = 0; i < d->colorAttachments.count(); ++i) {
-            if (!d->colorAttachments[i].guard)
+            if (!d->colorAttachments.at(i).guard)
                 d->initTexture(i);
         }
     }
@@ -1153,7 +1159,7 @@ QVector<GLuint> QOpenGLFramebufferObject::textures() const
     if (d->format.samples() != 0)
         return ids;
     ids.reserve(d->colorAttachments.count());
-    foreach (const QOpenGLFramebufferObjectPrivate::ColorAttachment &color, d->colorAttachments)
+    for (const auto &color : d->colorAttachments)
         ids.append(color.guard ? color.guard->id() : 0);
     return ids;
 }
@@ -1208,10 +1214,11 @@ GLuint QOpenGLFramebufferObject::takeTexture(int colorAttachmentIndex)
         QOpenGLContext *current = QOpenGLContext::currentContext();
         if (current && current->shareGroup() == d->fbo_guard->group() && isBound())
             release();
-        id = d->colorAttachments[colorAttachmentIndex].guard ? d->colorAttachments[colorAttachmentIndex].guard->id() : 0;
+        auto &guard = d->colorAttachments[colorAttachmentIndex].guard;
+        id = guard ? guard->id() : 0;
         // Do not call free() on texture_guard, just null it out.
         // This way the texture will not be deleted when the guard is destroyed.
-        d->colorAttachments[colorAttachmentIndex].guard = 0;
+        guard = 0;
     }
     return id;
 }
@@ -1237,7 +1244,7 @@ QVector<QSize> QOpenGLFramebufferObject::sizes() const
     Q_D(const QOpenGLFramebufferObject);
     QVector<QSize> sz;
     sz.reserve(d->colorAttachments.size());
-    foreach (const QOpenGLFramebufferObjectPrivate::ColorAttachment &color, d->colorAttachments)
+    for (const auto &color : d->colorAttachments)
         sz.append(color.size);
     return sz;
 }
@@ -1636,6 +1643,29 @@ void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target,
 }
 
 /*!
+    \enum QOpenGLFramebufferObject::FramebufferRestorePolicy
+    \since 5.7
+
+    This enum type is used to configure the behavior related to restoring
+    framebuffer bindings when calling blitFramebuffer().
+
+    \value DontRestoreFramebufferBinding        Do not restore the previous framebuffer binding.
+                                                The caller is responsible for tracking and setting
+                                                the framebuffer binding as needed.
+
+    \value RestoreFramebufferBindingToDefault   After the blit operation, bind the default
+                                                framebuffer.
+
+    \value RestoreFrameBufferBinding            Restore the previously bound framebuffer. This is
+                                                potentially expensive because of the need to
+                                                query the currently bound framebuffer.
+
+    \sa blitFramebuffer()
+*/
+
+/*!
+    \since 5.7
+
     Blits from the \a sourceRect rectangle in the \a source framebuffer
     object to the \a targetRect rectangle in the \a target framebuffer object.
 
@@ -1667,6 +1697,13 @@ void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target,
     drawColorAttachmentIndex specify the index of the color attachments in the
     source and destination framebuffers.
 
+    The \a restorePolicy determines if the framebuffer that was bound prior to
+    calling this function should be restored, or if the default framebuffer
+    should be bound before returning, of if the caller is responsible for
+    tracking and setting the bound framebuffer. Restoring the previous
+    framebuffer can be relatively expensive due to the call to \c{glGetIntegerv}
+    which on some OpenGL drivers may imply a pipeline stall.
+
     \sa hasOpenGLFramebufferBlit()
 */
 void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
@@ -1674,7 +1711,8 @@ void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target,
                                                GLbitfield buffers,
                                                GLenum filter,
                                                int readColorAttachmentIndex,
-                                               int drawColorAttachmentIndex)
+                                               int drawColorAttachmentIndex,
+                                               QOpenGLFramebufferObject::FramebufferRestorePolicy restorePolicy)
 {
     QOpenGLContext *ctx = QOpenGLContext::currentContext();
     if (!ctx)
@@ -1685,7 +1723,8 @@ void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target,
         return;
 
     GLuint prevFbo = 0;
-    ctx->functions()->glGetIntegerv(GL_FRAMEBUFFER_BINDING, (GLint *) &prevFbo);
+    if (restorePolicy == RestoreFrameBufferBinding)
+        ctx->functions()->glGetIntegerv(GL_FRAMEBUFFER_BINDING, (GLint *) &prevFbo);
 
     const int sx0 = sourceRect.left();
     const int sx1 = sourceRect.left() + sourceRect.width();
@@ -1702,7 +1741,8 @@ void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target,
     extensions.glBindFramebuffer(GL_READ_FRAMEBUFFER, source ? source->handle() : defaultFboId);
     extensions.glBindFramebuffer(GL_DRAW_FRAMEBUFFER, target ? target->handle() : defaultFboId);
 
-    if (extensions.hasOpenGLFeature(QOpenGLFunctions::MultipleRenderTargets)) {
+    const bool supportsMRT = extensions.hasOpenGLFeature(QOpenGLFunctions::MultipleRenderTargets);
+    if (supportsMRT) {
         extensions.glReadBuffer(GL_COLOR_ATTACHMENT0 + readColorAttachmentIndex);
         if (target) {
             GLenum drawBuf = GL_COLOR_ATTACHMENT0 + drawColorAttachmentIndex;
@@ -1714,10 +1754,44 @@ void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target,
                                  tx0, ty0, tx1, ty1,
                                  buffers, filter);
 
-    if (extensions.hasOpenGLFeature(QOpenGLFunctions::MultipleRenderTargets))
+    if (supportsMRT)
         extensions.glReadBuffer(GL_COLOR_ATTACHMENT0);
 
-    ctx->functions()->glBindFramebuffer(GL_FRAMEBUFFER, prevFbo); // sets both READ and DRAW
+    switch (restorePolicy) {
+    case RestoreFrameBufferBinding:
+        ctx->functions()->glBindFramebuffer(GL_FRAMEBUFFER, prevFbo); // sets both READ and DRAW
+        break;
+
+    case RestoreFramebufferBindingToDefault:
+        ctx->functions()->glBindFramebuffer(GL_FRAMEBUFFER, ctx->defaultFramebufferObject()); // sets both READ and DRAW
+        break;
+
+    case DontRestoreFramebufferBinding:
+        break;
+    }
+}
+
+/*!
+   \overload
+
+    Convenience overload to blit between two framebuffer objects and
+    to restore the previous framebuffer binding. Equivalent to calling
+    blitFramebuffer(target, targetRect, source, sourceRect, buffers, filter,
+    readColorAttachmentIndex, drawColorAttachmentIndex,
+    RestoreFrameBufferBinding).
+*/
+void QOpenGLFramebufferObject::blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
+                                               QOpenGLFramebufferObject *source, const QRect &sourceRect,
+                                               GLbitfield buffers,
+                                               GLenum filter,
+                                               int readColorAttachmentIndex,
+                                               int drawColorAttachmentIndex)
+{
+    blitFramebuffer(target, targetRect, source, sourceRect,
+                    buffers, filter,
+                    readColorAttachmentIndex,
+                    drawColorAttachmentIndex,
+                    RestoreFrameBufferBinding);
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/opengl/qopenglframebufferobject.h b/src/gui/opengl/qopenglframebufferobject.h
index cead4ad10f..b22726cafb 100644
--- a/src/gui/opengl/qopenglframebufferobject.h
+++ b/src/gui/opengl/qopenglframebufferobject.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -108,6 +114,20 @@ public:
     static bool hasOpenGLFramebufferObjects();
 
     static bool hasOpenGLFramebufferBlit();
+
+    enum FramebufferRestorePolicy {
+        DontRestoreFramebufferBinding,
+        RestoreFramebufferBindingToDefault,
+        RestoreFrameBufferBinding
+    };
+
+    static void blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
+                                QOpenGLFramebufferObject *source, const QRect &sourceRect,
+                                GLbitfield buffers,
+                                GLenum filter,
+                                int readColorAttachmentIndex,
+                                int drawColorAttachmentIndex,
+                                FramebufferRestorePolicy restorePolicy);
     static void blitFramebuffer(QOpenGLFramebufferObject *target, const QRect &targetRect,
                                 QOpenGLFramebufferObject *source, const QRect &sourceRect,
                                 GLbitfield buffers,
diff --git a/src/gui/opengl/qopenglframebufferobject_p.h b/src/gui/opengl/qopenglframebufferobject_p.h
index 6c45fda57f..c677b5e344 100644
--- a/src/gui/opengl/qopenglframebufferobject_p.h
+++ b/src/gui/opengl/qopenglframebufferobject_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp
index be1a979c37..e4e7c6d1b5 100644
--- a/src/gui/opengl/qopenglfunctions.cpp
+++ b/src/gui/opengl/qopenglfunctions.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -41,8 +47,8 @@
 #include <qpa/qplatformintegration.h>
 #include <QtCore/qloggingcategory.h>
 
-#ifdef Q_OS_IOS
-#include <dlfcn.h>
+#ifdef Q_OS_INTEGRITY
+#include <EGL/egl.h>
 #endif
 
 #ifndef GL_FRAMEBUFFER_SRGB_CAPABLE_EXT
@@ -53,6 +59,23 @@ QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(lcGLES3, "qt.opengl.es3")
 
+
+#define QT_OPENGL_COUNT_FUNCTIONS(ret, name, args) +1
+#define QT_OPENGL_FUNCTION_NAMES(ret, name, args) \
+    "gl"#name"\0"
+#define QT_OPENGL_FLAGS(ret, name, args) \
+    0,
+#define QT_OPENGL_IMPLEMENT(CLASS, FUNCTIONS) \
+void CLASS::init(QOpenGLContext *context) \
+{ \
+    const char *names = FUNCTIONS(QT_OPENGL_FUNCTION_NAMES); \
+    const char *name = names; \
+    for (int i = 0; i < FUNCTIONS(QT_OPENGL_COUNT_FUNCTIONS); ++i) { \
+        functions[i] = QT_PREPEND_NAMESPACE(getProcAddress(context, name)); \
+        name += strlen(name) + 1; \
+    } \
+}
+
 /*!
     \class QOpenGLFunctions
     \brief The QOpenGLFunctions class provides cross-platform access to the OpenGL ES 2.0 API.
@@ -254,7 +277,7 @@ QOpenGLFunctions::QOpenGLFunctions(QOpenGLContext *context)
     if (context && QOpenGLContextGroup::currentContextGroup() == context->shareGroup())
         d_ptr = qt_gl_functions(context);
     else
-        qWarning() << "QOpenGLFunctions created with non-current context";
+        qWarning("QOpenGLFunctions created with non-current context");
 }
 
 QOpenGLExtensions::QOpenGLExtensions()
@@ -2079,867 +2102,68 @@ void QOpenGLFunctions::initializeOpenGLFunctions()
 
 namespace {
 
-enum ResolvePolicy
-{
-    ResolveOES = 0x1,
-    ResolveEXT = 0x2,
-    ResolveANGLE = 0x4,
-    ResolveNV = 0x8
-};
-
-template <typename Base, typename FuncType, int Policy, typename ReturnType>
-class Resolver
-{
-public:
-    Resolver(FuncType Base::*func, FuncType fallback, const char *name, const char *alternateName = 0)
-        : funcPointerName(func)
-        , fallbackFuncPointer(fallback)
-        , funcName(name)
-        , alternateFuncName(alternateName)
-    {
-    }
-
-    ReturnType operator()();
-
-    template <typename P1>
-    ReturnType operator()(P1 p1);
-
-    template <typename P1, typename P2>
-    ReturnType operator()(P1 p1, P2 p2);
-
-    template <typename P1, typename P2, typename P3>
-    ReturnType operator()(P1 p1, P2 p2, P3 p3);
-
-    template <typename P1, typename P2, typename P3, typename P4>
-    ReturnType operator()(P1 p1, P2 p2, P3 p3, P4 p4);
-
-    template <typename P1, typename P2, typename P3, typename P4, typename P5>
-    ReturnType operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5);
-
-    template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
-    ReturnType operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6);
-
-    template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7>
-    ReturnType operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7);
-
-    template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8>
-    ReturnType operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8);
-
-    template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9>
-    ReturnType operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9);
-
-    template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10>
-    ReturnType operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10);
-
-    template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10, typename P11>
-    ReturnType operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10, P11 p11);
-
-private:
-    FuncType Base::*funcPointerName;
-    FuncType fallbackFuncPointer;
-    QByteArray funcName;
-    QByteArray alternateFuncName;
-};
-
-template <typename Base, typename FuncType, int Policy>
-class Resolver<Base, FuncType, Policy, void>
-{
-public:
-    Resolver(FuncType Base::*func, FuncType fallback, const char *name, const char *alternateName = 0)
-        : funcPointerName(func)
-        , fallbackFuncPointer(fallback)
-        , funcName(name)
-        , alternateFuncName(alternateName)
-    {
-    }
-
-    void operator()();
-
-    template <typename P1>
-    void operator()(P1 p1);
-
-    template <typename P1, typename P2>
-    void operator()(P1 p1, P2 p2);
-
-    template <typename P1, typename P2, typename P3>
-    void operator()(P1 p1, P2 p2, P3 p3);
-
-    template <typename P1, typename P2, typename P3, typename P4>
-    void operator()(P1 p1, P2 p2, P3 p3, P4 p4);
-
-    template <typename P1, typename P2, typename P3, typename P4, typename P5>
-    void operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5);
-
-    template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
-    void operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6);
-
-    template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7>
-    void operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7);
-
-    template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8>
-    void operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8);
-
-    template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9>
-    void operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9);
-
-    template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10>
-    void operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10);
-
-    template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10, typename P11>
-    void operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10, P11 p11);
-
-private:
-    FuncType Base::*funcPointerName;
-    FuncType fallbackFuncPointer;
-    QByteArray funcName;
-    QByteArray alternateFuncName;
-};
-
-#define RESOLVER_COMMON \
-    QOpenGLContext *context = QOpenGLContext::currentContext(); \
-    Base *funcs = qt_gl_functions(context); \
- \
-    FuncType old = funcs->*funcPointerName; \
- \
-    funcs->*funcPointerName = (FuncType)context->getProcAddress(funcName); \
- \
-    if ((Policy & ResolveOES) && !(funcs->*funcPointerName)) \
-        funcs->*funcPointerName = (FuncType)context->getProcAddress(funcName + "OES"); \
- \
-    if (!(funcs->*funcPointerName)) \
-        funcs->*funcPointerName = (FuncType)context->getProcAddress(funcName + "ARB"); \
- \
-    if ((Policy & ResolveEXT) && !(funcs->*funcPointerName)) \
-        funcs->*funcPointerName = (FuncType)context->getProcAddress(funcName + "EXT"); \
- \
-    if ((Policy & ResolveANGLE) && !(funcs->*funcPointerName)) \
-        funcs->*funcPointerName = (FuncType)context->getProcAddress(funcName + "ANGLE"); \
- \
-    if ((Policy & ResolveNV) && !(funcs->*funcPointerName)) \
-        funcs->*funcPointerName = (FuncType)context->getProcAddress(funcName + "NV"); \
- \
-    if (!alternateFuncName.isEmpty() && !(funcs->*funcPointerName)) { \
-        funcs->*funcPointerName = (FuncType)context->getProcAddress(alternateFuncName); \
- \
-        if ((Policy & ResolveOES) && !(funcs->*funcPointerName)) \
-            funcs->*funcPointerName = (FuncType)context->getProcAddress(alternateFuncName + "OES"); \
- \
-        if (!(funcs->*funcPointerName)) \
-            funcs->*funcPointerName = (FuncType)context->getProcAddress(alternateFuncName + "ARB"); \
- \
-        if ((Policy & ResolveEXT) && !(funcs->*funcPointerName)) \
-            funcs->*funcPointerName = (FuncType)context->getProcAddress(alternateFuncName + "EXT"); \
- \
-        if ((Policy & ResolveANGLE) && !(funcs->*funcPointerName)) \
-            funcs->*funcPointerName = (FuncType)context->getProcAddress(funcName + "ANGLE"); \
- \
-        if ((Policy & ResolveNV) && !(funcs->*funcPointerName)) \
-            funcs->*funcPointerName = (FuncType)context->getProcAddress(funcName + "NV"); \
-    }
-
-#define RESOLVER_COMMON_NON_VOID \
-    RESOLVER_COMMON \
- \
-    if (!(funcs->*funcPointerName)) { \
-        if (fallbackFuncPointer) { \
-            funcs->*funcPointerName = fallbackFuncPointer; \
-        } else { \
-            funcs->*funcPointerName = old; \
-            return ReturnType(); \
-        } \
-    }
+// this function tries hard to get the opengl function we're looking for by also
+// trying to resolve it with some of the common extensions if the generic name
+// can't be found.
+static QFunctionPointer getProcAddress(QOpenGLContext *context, const char *funcName)
+{
+    QFunctionPointer function = context->getProcAddress(funcName);
+
+    static const struct {
+        const char *name;
+        int len; // includes trailing \0
+    } extensions[] = {
+        { "ARB", 4 },
+        { "OES", 4 },
+        { "EXT", 4 },
+        { "ANGLE", 6 },
+        { "NV", 3 },
+    };
 
-#define RESOLVER_COMMON_VOID \
-    RESOLVER_COMMON \
- \
-    if (!(funcs->*funcPointerName)) { \
-        if (fallbackFuncPointer) { \
-            funcs->*funcPointerName = fallbackFuncPointer; \
-        } else { \
-            funcs->*funcPointerName = old; \
-            return; \
-        } \
+    if (!function) {
+        char fn[512];
+        size_t size = strlen(funcName);
+        Q_ASSERT(size < 500);
+        memcpy(fn, funcName, size);
+        char *ext = fn + size;
+
+        for (const auto &e : extensions) {
+            memcpy(ext, e.name, e.len);
+            function = context->getProcAddress(fn);
+            if (function)
+                break;
+        }
     }
 
-template <typename Base, typename FuncType, int Policy, typename ReturnType>
-ReturnType Resolver<Base, FuncType, Policy, ReturnType>::operator()()
-{
-    RESOLVER_COMMON_NON_VOID
-
-    return (funcs->*funcPointerName)();
+    return function;
 }
 
-template <typename Base, typename FuncType, int Policy, typename ReturnType> template <typename P1>
-ReturnType Resolver<Base, FuncType, Policy, ReturnType>::operator()(P1 p1)
+template <typename Func>
+Func resolve(QOpenGLContext *context, const char *name, Func)
 {
-    RESOLVER_COMMON_NON_VOID
-
-    return (funcs->*funcPointerName)(p1);
+    return reinterpret_cast<Func>(getProcAddress(context, name));
 }
 
-template <typename Base, typename FuncType, int Policy, typename ReturnType> template <typename P1, typename P2>
-ReturnType Resolver<Base, FuncType, Policy, ReturnType>::operator()(P1 p1, P2 p2)
-{
-    RESOLVER_COMMON_NON_VOID
-
-    return (funcs->*funcPointerName)(p1, p2);
 }
 
-template <typename Base, typename FuncType, int Policy, typename ReturnType> template <typename P1, typename P2, typename P3>
-ReturnType Resolver<Base, FuncType, Policy, ReturnType>::operator()(P1 p1, P2 p2, P3 p3)
-{
-    RESOLVER_COMMON_NON_VOID
-
-    return (funcs->*funcPointerName)(p1, p2, p3);
-}
-
-template <typename Base, typename FuncType, int Policy, typename ReturnType> template <typename P1, typename P2, typename P3, typename P4>
-ReturnType Resolver<Base, FuncType, Policy, ReturnType>::operator()(P1 p1, P2 p2, P3 p3, P4 p4)
-{
-    RESOLVER_COMMON_NON_VOID
-
-    return (funcs->*funcPointerName)(p1, p2, p3, p4);
-}
-
-template <typename Base, typename FuncType, int Policy, typename ReturnType> template <typename P1, typename P2, typename P3, typename P4, typename P5>
-ReturnType Resolver<Base, FuncType, Policy, ReturnType>::operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5)
-{
-    RESOLVER_COMMON_NON_VOID
-
-    return (funcs->*funcPointerName)(p1, p2, p3, p4, p5);
-}
-
-template <typename Base, typename FuncType, int Policy, typename ReturnType> template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
-ReturnType Resolver<Base, FuncType, Policy, ReturnType>::operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6)
-{
-    RESOLVER_COMMON_NON_VOID
-
-    return (funcs->*funcPointerName)(p1, p2, p3, p4, p5, p6);
-}
-
-template <typename Base, typename FuncType, int Policy, typename ReturnType> template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7>
-ReturnType Resolver<Base, FuncType, Policy, ReturnType>::operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7)
-{
-    RESOLVER_COMMON_NON_VOID
-
-    return (funcs->*funcPointerName)(p1, p2, p3, p4, p5, p6, p7);
-}
-
-template <typename Base, typename FuncType, int Policy, typename ReturnType> template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8>
-ReturnType Resolver<Base, FuncType, Policy, ReturnType>::operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8)
-{
-    RESOLVER_COMMON_NON_VOID
-
-    return (funcs->*funcPointerName)(p1, p2, p3, p4, p5, p6, p7, p8);
-}
-
-template <typename Base, typename FuncType, int Policy, typename ReturnType> template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9>
-ReturnType Resolver<Base, FuncType, Policy, ReturnType>::operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9)
-{
-    RESOLVER_COMMON_NON_VOID
-
-    return (funcs->*funcPointerName)(p1, p2, p3, p4, p5, p6, p7, p8, p9);
-}
-
-template <typename Base, typename FuncType, int Policy, typename ReturnType> template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10>
-ReturnType Resolver<Base, FuncType, Policy, ReturnType>::operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10)
-{
-    RESOLVER_COMMON_NON_VOID
-
-    return (funcs->*funcPointerName)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
-}
-
-template <typename Base, typename FuncType, int Policy>
-void Resolver<Base, FuncType, Policy, void>::operator()()
-{
-    RESOLVER_COMMON_VOID
-
-    (funcs->*funcPointerName)();
-}
-
-template <typename Base, typename FuncType, int Policy> template <typename P1>
-void Resolver<Base, FuncType, Policy, void>::operator()(P1 p1)
-{
-    RESOLVER_COMMON_VOID
-
-    (funcs->*funcPointerName)(p1);
-}
-
-template <typename Base, typename FuncType, int Policy> template <typename P1, typename P2>
-void Resolver<Base, FuncType, Policy, void>::operator()(P1 p1, P2 p2)
-{
-    RESOLVER_COMMON_VOID
-
-    (funcs->*funcPointerName)(p1, p2);
-}
-
-template <typename Base, typename FuncType, int Policy> template <typename P1, typename P2, typename P3>
-void Resolver<Base, FuncType, Policy, void>::operator()(P1 p1, P2 p2, P3 p3)
-{
-    RESOLVER_COMMON_VOID
-
-    (funcs->*funcPointerName)(p1, p2, p3);
-}
-
-template <typename Base, typename FuncType, int Policy> template <typename P1, typename P2, typename P3, typename P4>
-void Resolver<Base, FuncType, Policy, void>::operator()(P1 p1, P2 p2, P3 p3, P4 p4)
-{
-    RESOLVER_COMMON_VOID
-
-    (funcs->*funcPointerName)(p1, p2, p3, p4);
-}
-
-template <typename Base, typename FuncType, int Policy> template <typename P1, typename P2, typename P3, typename P4, typename P5>
-void Resolver<Base, FuncType, Policy, void>::operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5)
-{
-    RESOLVER_COMMON_VOID
-
-    (funcs->*funcPointerName)(p1, p2, p3, p4, p5);
-}
-
-template <typename Base, typename FuncType, int Policy> template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
-void Resolver<Base, FuncType, Policy, void>::operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6)
-{
-    RESOLVER_COMMON_VOID
-
-    (funcs->*funcPointerName)(p1, p2, p3, p4, p5, p6);
-}
-
-template <typename Base, typename FuncType, int Policy> template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7>
-void Resolver<Base, FuncType, Policy, void>::operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7)
-{
-    RESOLVER_COMMON_VOID
-
-    (funcs->*funcPointerName)(p1, p2, p3, p4, p5, p6, p7);
-}
-
-template <typename Base, typename FuncType, int Policy> template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8>
-void Resolver<Base, FuncType, Policy, void>::operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8)
-{
-    RESOLVER_COMMON_VOID
-
-    (funcs->*funcPointerName)(p1, p2, p3, p4, p5, p6, p7, p8);
-}
-
-template <typename Base, typename FuncType, int Policy> template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9>
-void Resolver<Base, FuncType, Policy, void>::operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9)
-{
-    RESOLVER_COMMON_VOID
-
-    (funcs->*funcPointerName)(p1, p2, p3, p4, p5, p6, p7, p8, p9);
-}
-
-template <typename Base, typename FuncType, int Policy> template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10>
-void Resolver<Base, FuncType, Policy, void>::operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10)
-{
-    RESOLVER_COMMON_VOID
-
-    (funcs->*funcPointerName)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
-}
-
-template <typename Base, typename FuncType, int Policy> template <typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10, typename P11>
-void Resolver<Base, FuncType, Policy, void>::operator()(P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10, P11 p11)
-{
-    RESOLVER_COMMON_VOID
-
-    (funcs->*funcPointerName)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11);
-}
-
-template <typename ReturnType, int Policy, typename Base, typename FuncType>
-Resolver<Base, FuncType, Policy, ReturnType> functionResolverWithFallback(FuncType Base::*func, FuncType fallback, const char *name, const char *alternate = 0)
-{
-    return Resolver<Base, FuncType, Policy, ReturnType>(func, fallback, name, alternate);
-}
-
-template <typename ReturnType, int Policy, typename Base, typename FuncType>
-Resolver<Base, FuncType, Policy, ReturnType> functionResolver(FuncType Base::*func, const char *name, const char *alternate = 0)
-{
-    return Resolver<Base, FuncType, Policy, ReturnType>(func, 0, name, alternate);
-}
-
-} // namespace
-
-#define RESOLVE_FUNC(RETURN_TYPE, POLICY, NAME) \
-    return functionResolver<RETURN_TYPE, POLICY>(&QOpenGLExtensionsPrivate::NAME, "gl" #NAME)
-
-#define RESOLVE_FUNC_VOID(POLICY, NAME) \
-    functionResolver<void, POLICY>(&QOpenGLExtensionsPrivate::NAME, "gl" #NAME)
-
-#define RESOLVE_FUNC_SPECIAL(RETURN_TYPE, POLICY, NAME) \
-    return functionResolverWithFallback<RETURN_TYPE, POLICY>(&QOpenGLExtensionsPrivate::NAME, qopenglfSpecial##NAME, "gl" #NAME)
-
-#define RESOLVE_FUNC_SPECIAL_VOID(POLICY, NAME) \
-    functionResolverWithFallback<void, POLICY>(&QOpenGLExtensionsPrivate::NAME, qopenglfSpecial##NAME, "gl" #NAME)
-
-#define RESOLVE_FUNC_WITH_ALTERNATE(RETURN_TYPE, POLICY, NAME, ALTERNATE) \
-    return functionResolver<RETURN_TYPE, POLICY>(&QOpenGLExtensionsPrivate::NAME, "gl" #NAME, "gl" #ALTERNATE)
-
-#define RESOLVE_FUNC_VOID_WITH_ALTERNATE(POLICY, NAME, ALTERNATE) \
-    functionResolver<void, POLICY>(&QOpenGLExtensionsPrivate::NAME, "gl" #NAME, "gl" #ALTERNATE)
+#define RESOLVE(name) \
+    resolve(context, "gl"#name, name)
 
 #ifndef QT_OPENGL_ES_2
 
-// GLES2 + OpenGL1 common subset. These are normally not resolvable,
-// but the underlying platform code may hide this limitation.
-
-static void QOPENGLF_APIENTRY qopenglfResolveBindTexture(GLenum target, GLuint texture)
-{
-    RESOLVE_FUNC_VOID(0, BindTexture)(target, texture);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBlendFunc(GLenum sfactor, GLenum dfactor)
-{
-    RESOLVE_FUNC_VOID(0, BlendFunc)(sfactor, dfactor);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveClear(GLbitfield mask)
-{
-    RESOLVE_FUNC_VOID(0, Clear)(mask);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
-{
-    RESOLVE_FUNC_VOID(0, ClearColor)(red, green, blue, alpha);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveClearDepthf(GLclampf depth)
-{
-    if (QOpenGLContext::currentContext()->isOpenGLES()) {
-        RESOLVE_FUNC_VOID(0, ClearDepthf)(depth);
-    } else {
-        RESOLVE_FUNC_VOID(0, ClearDepth)((GLdouble) depth);
-    }
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveClearStencil(GLint s)
-{
-    RESOLVE_FUNC_VOID(0, ClearStencil)(s);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
+// some fallback functions
+static void QOPENGLF_APIENTRY qopenglfSpecialClearDepthf(GLclampf depth)
 {
-    RESOLVE_FUNC_VOID(0, ColorMask)(red, green, blue, alpha);
+    QOpenGLContext *context = QOpenGLContext::currentContext();
+    QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
+    funcs->f.ClearDepth((GLdouble) depth);
 }
 
-static void QOPENGLF_APIENTRY qopenglfResolveCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
+static void QOPENGLF_APIENTRY qopenglfSpecialDepthRangef(GLclampf zNear, GLclampf zFar)
 {
-    RESOLVE_FUNC_VOID(0, CopyTexImage2D)(target, level, internalformat, x, y, width, height, border);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
-{
-    RESOLVE_FUNC_VOID(0, CopyTexSubImage2D)(target, level, xoffset, yoffset, x, y, width, height);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveCullFace(GLenum mode)
-{
-    RESOLVE_FUNC_VOID(0, CullFace)(mode);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDeleteTextures(GLsizei n, const GLuint* textures)
-{
-    RESOLVE_FUNC_VOID(0, DeleteTextures)(n, textures);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDepthFunc(GLenum func)
-{
-    RESOLVE_FUNC_VOID(0, DepthFunc)(func);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDepthMask(GLboolean flag)
-{
-    RESOLVE_FUNC_VOID(0, DepthMask)(flag);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDepthRangef(GLclampf zNear, GLclampf zFar)
-{
-    if (QOpenGLContext::currentContext()->isOpenGLES()) {
-        RESOLVE_FUNC_VOID(0, DepthRangef)(zNear, zFar);
-    } else {
-        RESOLVE_FUNC_VOID(0, DepthRange)((GLdouble) zNear, (GLdouble) zFar);
-    }
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDisable(GLenum cap)
-{
-    RESOLVE_FUNC_VOID(0, Disable)(cap);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDrawArrays(GLenum mode, GLint first, GLsizei count)
-{
-    RESOLVE_FUNC_VOID(0, DrawArrays)(mode, first, count);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices)
-{
-    RESOLVE_FUNC_VOID(0, DrawElements)(mode, count, type, indices);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveEnable(GLenum cap)
-{
-    RESOLVE_FUNC_VOID(0, Enable)(cap);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveFinish()
-{
-    RESOLVE_FUNC_VOID(0, Finish)();
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveFlush()
-{
-    RESOLVE_FUNC_VOID(0, Flush)();
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveFrontFace(GLenum mode)
-{
-    RESOLVE_FUNC_VOID(0, FrontFace)(mode);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGenTextures(GLsizei n, GLuint* textures)
-{
-    RESOLVE_FUNC_VOID(0, GenTextures)(n, textures);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetBooleanv(GLenum pname, GLboolean* params)
-{
-    RESOLVE_FUNC_VOID(0, GetBooleanv)(pname, params);
-}
-
-static GLenum QOPENGLF_APIENTRY qopenglfResolveGetError()
-{
-    RESOLVE_FUNC(GLenum, 0, GetError)();
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetFloatv(GLenum pname, GLfloat* params)
-{
-    RESOLVE_FUNC_VOID(0, GetFloatv)(pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetIntegerv(GLenum pname, GLint* params)
-{
-    RESOLVE_FUNC_VOID(0, GetIntegerv)(pname, params);
-}
-
-static const GLubyte * QOPENGLF_APIENTRY qopenglfResolveGetString(GLenum name)
-{
-    RESOLVE_FUNC(const GLubyte *, 0, GetString)(name);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetTexParameterfv(GLenum target, GLenum pname, GLfloat* params)
-{
-    RESOLVE_FUNC_VOID(0, GetTexParameterfv)(target, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetTexParameteriv(GLenum target, GLenum pname, GLint* params)
-{
-    RESOLVE_FUNC_VOID(0, GetTexParameteriv)(target, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveHint(GLenum target, GLenum mode)
-{
-    RESOLVE_FUNC_VOID(0, Hint)(target, mode);
-}
-
-static GLboolean QOPENGLF_APIENTRY qopenglfResolveIsEnabled(GLenum cap)
-{
-    RESOLVE_FUNC(GLboolean, 0, IsEnabled)(cap);
-}
-
-static GLboolean QOPENGLF_APIENTRY qopenglfResolveIsTexture(GLuint texture)
-{
-    RESOLVE_FUNC(GLboolean, 0, IsTexture)(texture);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveLineWidth(GLfloat width)
-{
-    RESOLVE_FUNC_VOID(0, LineWidth)(width);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolvePixelStorei(GLenum pname, GLint param)
-{
-    RESOLVE_FUNC_VOID(0, PixelStorei)(pname, param);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolvePolygonOffset(GLfloat factor, GLfloat units)
-{
-    RESOLVE_FUNC_VOID(0, PolygonOffset)(factor, units);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels)
-{
-    RESOLVE_FUNC_VOID(0, ReadPixels)(x, y, width, height, format, type, pixels);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveScissor(GLint x, GLint y, GLsizei width, GLsizei height)
-{
-    RESOLVE_FUNC_VOID(0, Scissor)(x, y, width, height);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveStencilFunc(GLenum func, GLint ref, GLuint mask)
-{
-    RESOLVE_FUNC_VOID(0, StencilFunc)(func, ref, mask);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveStencilMask(GLuint mask)
-{
-    RESOLVE_FUNC_VOID(0, StencilMask)(mask);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
-{
-    RESOLVE_FUNC_VOID(0, StencilOp)(fail, zfail, zpass);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels)
-{
-    RESOLVE_FUNC_VOID(0, TexImage2D)(target, level, internalformat, width, height, border, format, type, pixels);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveTexParameterf(GLenum target, GLenum pname, GLfloat param)
-{
-    RESOLVE_FUNC_VOID(0, TexParameterf)(target, pname, param);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveTexParameterfv(GLenum target, GLenum pname, const GLfloat* params)
-{
-    RESOLVE_FUNC_VOID(0, TexParameterfv)(target, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveTexParameteri(GLenum target, GLenum pname, GLint param)
-{
-    RESOLVE_FUNC_VOID(0, TexParameteri)(target, pname, param);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveTexParameteriv(GLenum target, GLenum pname, const GLint* params)
-{
-    RESOLVE_FUNC_VOID(0, TexParameteriv)(target, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels)
-{
-    RESOLVE_FUNC_VOID(0, TexSubImage2D)(target, level, xoffset, yoffset, width, height, format, type, pixels);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveViewport(GLint x, GLint y, GLsizei width, GLsizei height)
-{
-    RESOLVE_FUNC_VOID(0, Viewport)(x, y, width, height);
-}
-
-// GL(ES)2
-
-static void QOPENGLF_APIENTRY qopenglfResolveActiveTexture(GLenum texture)
-{
-    RESOLVE_FUNC_VOID(0, ActiveTexture)(texture);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveAttachShader(GLuint program, GLuint shader)
-{
-    RESOLVE_FUNC_VOID_WITH_ALTERNATE(0, AttachShader, AttachObject)(program, shader);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBindAttribLocation(GLuint program, GLuint index, const char* name)
-{
-    RESOLVE_FUNC_VOID(0, BindAttribLocation)(program, index, name);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBindBuffer(GLenum target, GLuint buffer)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, BindBuffer)(target, buffer);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBindFramebuffer(GLenum target, GLuint framebuffer)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, BindFramebuffer)(target, framebuffer);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBindRenderbuffer(GLenum target, GLuint renderbuffer)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, BindRenderbuffer)(target, renderbuffer);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, BlendColor)(red, green, blue, alpha);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBlendEquation(GLenum mode)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, BlendEquation)(mode);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, BlendEquationSeparate)(modeRGB, modeAlpha);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, BlendFuncSeparate)(srcRGB, dstRGB, srcAlpha, dstAlpha);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBufferData(GLenum target, qopengl_GLsizeiptr size, const void* data, GLenum usage)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, BufferData)(target, size, data, usage);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBufferSubData(GLenum target, qopengl_GLintptr offset, qopengl_GLsizeiptr size, const void* data)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, BufferSubData)(target, offset, size, data);
-}
-
-static GLenum QOPENGLF_APIENTRY qopenglfResolveCheckFramebufferStatus(GLenum target)
-{
-    RESOLVE_FUNC(GLenum, ResolveOES | ResolveEXT, CheckFramebufferStatus)(target);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveCompileShader(GLuint shader)
-{
-    RESOLVE_FUNC_VOID(0, CompileShader)(shader);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, CompressedTexImage2D)(target, level, internalformat, width, height, border, imageSize, data);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, CompressedTexSubImage2D)(target, level, xoffset, yoffset, width, height, format, imageSize, data);
-}
-
-static GLuint QOPENGLF_APIENTRY qopenglfResolveCreateProgram()
-{
-    RESOLVE_FUNC_WITH_ALTERNATE(GLuint, 0, CreateProgram, CreateProgramObject)();
-}
-
-static GLuint QOPENGLF_APIENTRY qopenglfResolveCreateShader(GLenum type)
-{
-    RESOLVE_FUNC_WITH_ALTERNATE(GLuint, 0, CreateShader, CreateShaderObject)(type);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDeleteBuffers(GLsizei n, const GLuint* buffers)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, DeleteBuffers)(n, buffers);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, DeleteFramebuffers)(n, framebuffers);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDeleteProgram(GLuint program)
-{
-    RESOLVE_FUNC_VOID(0, DeleteProgram)(program);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, DeleteRenderbuffers)(n, renderbuffers);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDeleteShader(GLuint shader)
-{
-    RESOLVE_FUNC_VOID_WITH_ALTERNATE(0, DeleteShader, DeleteObject)(shader);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDetachShader(GLuint program, GLuint shader)
-{
-    RESOLVE_FUNC_VOID_WITH_ALTERNATE(0, DetachShader, DetachObject)(program, shader);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDisableVertexAttribArray(GLuint index)
-{
-    RESOLVE_FUNC_VOID(0, DisableVertexAttribArray)(index);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveEnableVertexAttribArray(GLuint index)
-{
-    RESOLVE_FUNC_VOID(0, EnableVertexAttribArray)(index);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, FramebufferRenderbuffer)(target, attachment, renderbuffertarget, renderbuffer);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, FramebufferTexture2D)(target, attachment, textarget, texture, level);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGenBuffers(GLsizei n, GLuint* buffers)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, GenBuffers)(n, buffers);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGenerateMipmap(GLenum target)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, GenerateMipmap)(target);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGenFramebuffers(GLsizei n, GLuint* framebuffers)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, GenFramebuffers)(n, framebuffers);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGenRenderbuffers(GLsizei n, GLuint* renderbuffers)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, GenRenderbuffers)(n, renderbuffers);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
-{
-    RESOLVE_FUNC_VOID(0, GetActiveAttrib)(program, index, bufsize, length, size, type, name);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
-{
-    RESOLVE_FUNC_VOID(0, GetActiveUniform)(program, index, bufsize, length, size, type, name);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders)
-{
-    RESOLVE_FUNC_VOID_WITH_ALTERNATE(0, GetAttachedShaders, GetAttachedObjects)(program, maxcount, count, shaders);
-}
-
-static GLint QOPENGLF_APIENTRY qopenglfResolveGetAttribLocation(GLuint program, const char* name)
-{
-    RESOLVE_FUNC(GLint, 0, GetAttribLocation)(program, name);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetBufferParameteriv(GLenum target, GLenum pname, GLint* params)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, GetBufferParameteriv)(target, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, GetFramebufferAttachmentParameteriv)(target, attachment, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetProgramiv(GLuint program, GLenum pname, GLint* params)
-{
-    RESOLVE_FUNC_VOID_WITH_ALTERNATE(0, GetProgramiv, GetObjectParameteriv)(program, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog)
-{
-    RESOLVE_FUNC_VOID_WITH_ALTERNATE(0, GetProgramInfoLog, GetInfoLog)(program, bufsize, length, infolog);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, GetRenderbufferParameteriv)(target, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetShaderiv(GLuint shader, GLenum pname, GLint* params)
-{
-    RESOLVE_FUNC_VOID_WITH_ALTERNATE(0, GetShaderiv, GetObjectParameteriv)(shader, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog)
-{
-    RESOLVE_FUNC_VOID_WITH_ALTERNATE(0, GetShaderInfoLog, GetInfoLog)(shader, bufsize, length, infolog);
+    QOpenGLContext *context = QOpenGLContext::currentContext();
+    QOpenGLFunctionsPrivate *funcs = qt_gl_functions(context);
+    funcs->f.DepthRange((GLdouble) zNear, (GLdouble) zFar);
 }
 
 static void QOPENGLF_APIENTRY qopenglfSpecialGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)
@@ -2949,539 +2173,47 @@ static void QOPENGLF_APIENTRY qopenglfSpecialGetShaderPrecisionFormat(GLenum sha
     range[0] = range[1] = precision[0] = 0;
 }
 
-static void QOPENGLF_APIENTRY qopenglfResolveGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)
-{
-    RESOLVE_FUNC_SPECIAL_VOID(ResolveOES | ResolveEXT, GetShaderPrecisionFormat)(shadertype, precisiontype, range, precision);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char* source)
-{
-    RESOLVE_FUNC_VOID(0, GetShaderSource)(shader, bufsize, length, source);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetUniformfv(GLuint program, GLint location, GLfloat* params)
-{
-    RESOLVE_FUNC_VOID(0, GetUniformfv)(program, location, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetUniformiv(GLuint program, GLint location, GLint* params)
-{
-    RESOLVE_FUNC_VOID(0, GetUniformiv)(program, location, params);
-}
-
-static GLint QOPENGLF_APIENTRY qopenglfResolveGetUniformLocation(GLuint program, const char* name)
-{
-    RESOLVE_FUNC(GLint, 0, GetUniformLocation)(program, name);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
-{
-    RESOLVE_FUNC_VOID(0, GetVertexAttribfv)(index, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetVertexAttribiv(GLuint index, GLenum pname, GLint* params)
-{
-    RESOLVE_FUNC_VOID(0, GetVertexAttribiv)(index, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer)
-{
-    RESOLVE_FUNC_VOID(0, GetVertexAttribPointerv)(index, pname, pointer);
-}
-
-static GLboolean QOPENGLF_APIENTRY qopenglfResolveIsBuffer(GLuint buffer)
-{
-    RESOLVE_FUNC(GLboolean, ResolveOES | ResolveEXT, IsBuffer)(buffer);
-}
-
-static GLboolean QOPENGLF_APIENTRY qopenglfResolveIsFramebuffer(GLuint framebuffer)
-{
-    RESOLVE_FUNC(GLboolean, ResolveOES | ResolveEXT, IsFramebuffer)(framebuffer);
-}
-
 static GLboolean QOPENGLF_APIENTRY qopenglfSpecialIsProgram(GLuint program)
 {
     return program != 0;
 }
 
-static GLboolean QOPENGLF_APIENTRY qopenglfResolveIsProgram(GLuint program)
-{
-    RESOLVE_FUNC_SPECIAL(GLboolean, 0, IsProgram)(program);
-}
-
-static GLboolean QOPENGLF_APIENTRY qopenglfResolveIsRenderbuffer(GLuint renderbuffer)
-{
-    RESOLVE_FUNC(GLboolean, ResolveOES | ResolveEXT, IsRenderbuffer)(renderbuffer);
-}
-
 static GLboolean QOPENGLF_APIENTRY qopenglfSpecialIsShader(GLuint shader)
 {
     return shader != 0;
 }
 
-static GLboolean QOPENGLF_APIENTRY qopenglfResolveIsShader(GLuint shader)
-{
-    RESOLVE_FUNC_SPECIAL(GLboolean, 0, IsShader)(shader);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveLinkProgram(GLuint program)
-{
-    RESOLVE_FUNC_VOID(0, LinkProgram)(program);
-}
-
 static void QOPENGLF_APIENTRY qopenglfSpecialReleaseShaderCompiler()
 {
 }
 
-static void QOPENGLF_APIENTRY qopenglfResolveReleaseShaderCompiler()
-{
-    RESOLVE_FUNC_SPECIAL_VOID(0, ReleaseShaderCompiler)();
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, RenderbufferStorage)(target, internalformat, width, height);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveSampleCoverage(GLclampf value, GLboolean invert)
-{
-    RESOLVE_FUNC_VOID(ResolveOES | ResolveEXT, SampleCoverage)(value, invert);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length)
-{
-    RESOLVE_FUNC_VOID(0, ShaderBinary)(n, shaders, binaryformat, binary, length);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length)
-{
-    RESOLVE_FUNC_VOID(0, ShaderSource)(shader, count, string, length);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
-{
-    RESOLVE_FUNC_VOID(ResolveEXT, StencilFuncSeparate)(face, func, ref, mask);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveStencilMaskSeparate(GLenum face, GLuint mask)
-{
-    RESOLVE_FUNC_VOID(ResolveEXT, StencilMaskSeparate)(face, mask);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
-{
-    RESOLVE_FUNC_VOID(ResolveEXT, StencilOpSeparate)(face, fail, zfail, zpass);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform1f(GLint location, GLfloat x)
-{
-    RESOLVE_FUNC_VOID(0, Uniform1f)(location, x);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform1fv(GLint location, GLsizei count, const GLfloat* v)
-{
-    RESOLVE_FUNC_VOID(0, Uniform1fv)(location, count, v);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform1i(GLint location, GLint x)
-{
-    RESOLVE_FUNC_VOID(0, Uniform1i)(location, x);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform1iv(GLint location, GLsizei count, const GLint* v)
-{
-    RESOLVE_FUNC_VOID(0, Uniform1iv)(location, count, v);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform2f(GLint location, GLfloat x, GLfloat y)
-{
-    RESOLVE_FUNC_VOID(0, Uniform2f)(location, x, y);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform2fv(GLint location, GLsizei count, const GLfloat* v)
-{
-    RESOLVE_FUNC_VOID(0, Uniform2fv)(location, count, v);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform2i(GLint location, GLint x, GLint y)
-{
-    RESOLVE_FUNC_VOID(0, Uniform2i)(location, x, y);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform2iv(GLint location, GLsizei count, const GLint* v)
-{
-    RESOLVE_FUNC_VOID(0, Uniform2iv)(location, count, v);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)
-{
-    RESOLVE_FUNC_VOID(0, Uniform3f)(location, x, y, z);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform3fv(GLint location, GLsizei count, const GLfloat* v)
-{
-    RESOLVE_FUNC_VOID(0, Uniform3fv)(location, count, v);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform3i(GLint location, GLint x, GLint y, GLint z)
-{
-    RESOLVE_FUNC_VOID(0, Uniform3i)(location, x, y, z);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform3iv(GLint location, GLsizei count, const GLint* v)
-{
-    RESOLVE_FUNC_VOID(0, Uniform3iv)(location, count, v);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-    RESOLVE_FUNC_VOID(0, Uniform4f)(location, x, y, z, w);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform4fv(GLint location, GLsizei count, const GLfloat* v)
-{
-    RESOLVE_FUNC_VOID(0, Uniform4fv)(location, count, v);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)
-{
-    RESOLVE_FUNC_VOID(0, Uniform4i)(location, x, y, z, w);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform4iv(GLint location, GLsizei count, const GLint* v)
-{
-    RESOLVE_FUNC_VOID(0, Uniform4iv)(location, count, v);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-{
-    RESOLVE_FUNC_VOID(0, UniformMatrix2fv)(location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-{
-    RESOLVE_FUNC_VOID(0, UniformMatrix3fv)(location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
-{
-    RESOLVE_FUNC_VOID(0, UniformMatrix4fv)(location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUseProgram(GLuint program)
-{
-    RESOLVE_FUNC_VOID(0, UseProgram)(program);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveValidateProgram(GLuint program)
-{
-    RESOLVE_FUNC_VOID(0, ValidateProgram)(program);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttrib1f(GLuint indx, GLfloat x)
-{
-    RESOLVE_FUNC_VOID(0, VertexAttrib1f)(indx, x);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttrib1fv(GLuint indx, const GLfloat* values)
-{
-    RESOLVE_FUNC_VOID(0, VertexAttrib1fv)(indx, values);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)
-{
-    RESOLVE_FUNC_VOID(0, VertexAttrib2f)(indx, x, y);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttrib2fv(GLuint indx, const GLfloat* values)
-{
-    RESOLVE_FUNC_VOID(0, VertexAttrib2fv)(indx, values);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
-{
-    RESOLVE_FUNC_VOID(0, VertexAttrib3f)(indx, x, y, z);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttrib3fv(GLuint indx, const GLfloat* values)
-{
-    RESOLVE_FUNC_VOID(0, VertexAttrib3fv)(indx, values);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-    RESOLVE_FUNC_VOID(0, VertexAttrib4f)(indx, x, y, z, w);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttrib4fv(GLuint indx, const GLfloat* values)
-{
-    RESOLVE_FUNC_VOID(0, VertexAttrib4fv)(indx, values);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr)
-{
-    RESOLVE_FUNC_VOID(0, VertexAttribPointer)(indx, size, type, normalized, stride, ptr);
-}
-
 #endif // !QT_OPENGL_ES_2
 
-// Extensions not standard in any ES version
-
-static GLvoid *QOPENGLF_APIENTRY qopenglfResolveMapBuffer(GLenum target, GLenum access)
-{
-    // It is possible that GL_OES_map_buffer is present, but then having to
-    // differentiate between glUnmapBufferOES and glUnmapBuffer causes extra
-    // headache. QOpenGLBuffer::map() will handle this automatically, while direct
-    // calls are better off with migrating to the standard glMapBufferRange.
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-    if (ctx->isOpenGLES() && ctx->format().majorVersion() >= 3) {
-        qWarning("QOpenGLFunctions: glMapBuffer is not available in OpenGL ES 3.0 and up. Use glMapBufferRange instead.");
-        return 0;
-    } else {
-        RESOLVE_FUNC(GLvoid *, ResolveOES, MapBuffer)(target, access);
-    }
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetBufferSubData(GLenum target, qopengl_GLintptr offset, qopengl_GLsizeiptr size, GLvoid *data)
-{
-    RESOLVE_FUNC_VOID(ResolveEXT, GetBufferSubData)
-        (target, offset, size, data);
-}
 
-static void QOPENGLF_APIENTRY qopenglfResolveDiscardFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments)
+QOpenGLFunctionsPrivate::QOpenGLFunctionsPrivate(QOpenGLContext *c)
 {
-    RESOLVE_FUNC_VOID(ResolveEXT, DiscardFramebuffer)(target, numAttachments, attachments);
-}
+    init(c);
 
-#if !defined(QT_OPENGL_ES_2) && !defined(QT_OPENGL_DYNAMIC)
-// Special translation functions for ES-specific calls on desktop GL
-
-static void QOPENGLF_APIENTRY qopenglfTranslateClearDepthf(GLclampf depth)
-{
-    ::glClearDepth(depth);
-}
-
-static void QOPENGLF_APIENTRY qopenglfTranslateDepthRangef(GLclampf zNear, GLclampf zFar)
-{
-    ::glDepthRange(zNear, zFar);
-}
-#endif // !ES && !DYNAMIC
-
-QOpenGLFunctionsPrivate::QOpenGLFunctionsPrivate(QOpenGLContext *)
-{
-    /* Assign a pointer to an above defined static function
-     * which on first call resolves the function from the current
-     * context, assigns it to the member variable and executes it
-     * (see Resolver template) */
 #ifndef QT_OPENGL_ES_2
-    // The GL1 functions may not be queriable via getProcAddress().
-    if (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::AllGLFunctionsQueryable)) {
-        // The platform plugin supports resolving these.
-        BindTexture = qopenglfResolveBindTexture;
-        BlendFunc = qopenglfResolveBlendFunc;
-        Clear = qopenglfResolveClear;
-        ClearColor = qopenglfResolveClearColor;
-        ClearDepthf = qopenglfResolveClearDepthf;
-        ClearStencil = qopenglfResolveClearStencil;
-        ColorMask = qopenglfResolveColorMask;
-        CopyTexImage2D = qopenglfResolveCopyTexImage2D;
-        CopyTexSubImage2D = qopenglfResolveCopyTexSubImage2D;
-        CullFace = qopenglfResolveCullFace;
-        DeleteTextures = qopenglfResolveDeleteTextures;
-        DepthFunc = qopenglfResolveDepthFunc;
-        DepthMask = qopenglfResolveDepthMask;
-        DepthRangef = qopenglfResolveDepthRangef;
-        Disable = qopenglfResolveDisable;
-        DrawArrays = qopenglfResolveDrawArrays;
-        DrawElements = qopenglfResolveDrawElements;
-        Enable = qopenglfResolveEnable;
-        Finish = qopenglfResolveFinish;
-        Flush = qopenglfResolveFlush;
-        FrontFace = qopenglfResolveFrontFace;
-        GenTextures = qopenglfResolveGenTextures;
-        GetBooleanv = qopenglfResolveGetBooleanv;
-        GetError = qopenglfResolveGetError;
-        GetFloatv = qopenglfResolveGetFloatv;
-        GetIntegerv = qopenglfResolveGetIntegerv;
-        GetString = qopenglfResolveGetString;
-        GetTexParameterfv = qopenglfResolveGetTexParameterfv;
-        GetTexParameteriv = qopenglfResolveGetTexParameteriv;
-        Hint = qopenglfResolveHint;
-        IsEnabled = qopenglfResolveIsEnabled;
-        IsTexture = qopenglfResolveIsTexture;
-        LineWidth = qopenglfResolveLineWidth;
-        PixelStorei = qopenglfResolvePixelStorei;
-        PolygonOffset = qopenglfResolvePolygonOffset;
-        ReadPixels = qopenglfResolveReadPixels;
-        Scissor = qopenglfResolveScissor;
-        StencilFunc = qopenglfResolveStencilFunc;
-        StencilMask = qopenglfResolveStencilMask;
-        StencilOp = qopenglfResolveStencilOp;
-        TexImage2D = qopenglfResolveTexImage2D;
-        TexParameterf = qopenglfResolveTexParameterf;
-        TexParameterfv = qopenglfResolveTexParameterfv;
-        TexParameteri = qopenglfResolveTexParameteri;
-        TexParameteriv = qopenglfResolveTexParameteriv;
-        TexSubImage2D = qopenglfResolveTexSubImage2D;
-        Viewport = qopenglfResolveViewport;
-    } else {
-#ifndef QT_OPENGL_DYNAMIC
-        // Use the functions directly. This requires linking QtGui to an OpenGL implementation.
-        BindTexture = ::glBindTexture;
-        BlendFunc = ::glBlendFunc;
-        Clear = ::glClear;
-        ClearColor = ::glClearColor;
-        ClearDepthf = qopenglfTranslateClearDepthf;
-        ClearStencil = ::glClearStencil;
-        ColorMask = ::glColorMask;
-        CopyTexImage2D = ::glCopyTexImage2D;
-        CopyTexSubImage2D = ::glCopyTexSubImage2D;
-        CullFace = ::glCullFace;
-        DeleteTextures = ::glDeleteTextures;
-        DepthFunc = ::glDepthFunc;
-        DepthMask = ::glDepthMask;
-        DepthRangef = qopenglfTranslateDepthRangef;
-        Disable = ::glDisable;
-        DrawArrays = ::glDrawArrays;
-        DrawElements = ::glDrawElements;
-        Enable = ::glEnable;
-        Finish = ::glFinish;
-        Flush = ::glFlush;
-        FrontFace = ::glFrontFace;
-        GenTextures = ::glGenTextures;
-        GetBooleanv = ::glGetBooleanv;
-        GetError = ::glGetError;
-        GetFloatv = ::glGetFloatv;
-        GetIntegerv = ::glGetIntegerv;
-        GetString = ::glGetString;
-        GetTexParameterfv = ::glGetTexParameterfv;
-        GetTexParameteriv = ::glGetTexParameteriv;
-        Hint = ::glHint;
-        IsEnabled = ::glIsEnabled;
-        IsTexture = ::glIsTexture;
-        LineWidth = ::glLineWidth;
-        PixelStorei = ::glPixelStorei;
-        PolygonOffset = ::glPolygonOffset;
-        ReadPixels = ::glReadPixels;
-        Scissor = ::glScissor;
-        StencilFunc = ::glStencilFunc;
-        StencilMask = ::glStencilMask;
-        StencilOp = ::glStencilOp;
-#if defined(Q_OS_OSX) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
-        TexImage2D = reinterpret_cast<void (*)(GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *)>(glTexImage2D);
-#else
-        TexImage2D = glTexImage2D;
-#endif
-        TexParameterf = ::glTexParameterf;
-        TexParameterfv = ::glTexParameterfv;
-        TexParameteri = ::glTexParameteri;
-        TexParameteriv = ::glTexParameteriv;
-        TexSubImage2D = ::glTexSubImage2D;
-        Viewport = ::glViewport;
-#else // QT_OPENGL_DYNAMIC
-        // This should not happen.
-        qFatal("QOpenGLFunctions: Dynamic OpenGL builds do not support platforms with insufficient function resolving capabilities");
+    // setup fallbacks in case some methods couldn't get resolved
+    if (!f.ClearDepthf)
+        f.ClearDepthf = qopenglfSpecialClearDepthf;
+    if (!f.DepthRangef)
+        f.DepthRangef = qopenglfSpecialDepthRangef;
+    if (!f.GetShaderPrecisionFormat)
+        f.GetShaderPrecisionFormat = qopenglfSpecialGetShaderPrecisionFormat;
+    if (!f.IsProgram)
+        f.IsProgram = qopenglfSpecialIsProgram;
+    if (!f.IsShader)
+        f.IsShader = qopenglfSpecialIsShader;
+    if (!f.ReleaseShaderCompiler)
+        f.ReleaseShaderCompiler = qopenglfSpecialReleaseShaderCompiler;
 #endif
-    }
-
-    ActiveTexture = qopenglfResolveActiveTexture;
-    AttachShader = qopenglfResolveAttachShader;
-    BindAttribLocation = qopenglfResolveBindAttribLocation;
-    BindBuffer = qopenglfResolveBindBuffer;
-    BindFramebuffer = qopenglfResolveBindFramebuffer;
-    BindRenderbuffer = qopenglfResolveBindRenderbuffer;
-    BlendColor = qopenglfResolveBlendColor;
-    BlendEquation = qopenglfResolveBlendEquation;
-    BlendEquationSeparate = qopenglfResolveBlendEquationSeparate;
-    BlendFuncSeparate = qopenglfResolveBlendFuncSeparate;
-    BufferData = qopenglfResolveBufferData;
-    BufferSubData = qopenglfResolveBufferSubData;
-    CheckFramebufferStatus = qopenglfResolveCheckFramebufferStatus;
-    CompileShader = qopenglfResolveCompileShader;
-    CompressedTexImage2D = qopenglfResolveCompressedTexImage2D;
-    CompressedTexSubImage2D = qopenglfResolveCompressedTexSubImage2D;
-    CreateProgram = qopenglfResolveCreateProgram;
-    CreateShader = qopenglfResolveCreateShader;
-    DeleteBuffers = qopenglfResolveDeleteBuffers;
-    DeleteFramebuffers = qopenglfResolveDeleteFramebuffers;
-    DeleteProgram = qopenglfResolveDeleteProgram;
-    DeleteRenderbuffers = qopenglfResolveDeleteRenderbuffers;
-    DeleteShader = qopenglfResolveDeleteShader;
-    DetachShader = qopenglfResolveDetachShader;
-    DisableVertexAttribArray = qopenglfResolveDisableVertexAttribArray;
-    EnableVertexAttribArray = qopenglfResolveEnableVertexAttribArray;
-    FramebufferRenderbuffer = qopenglfResolveFramebufferRenderbuffer;
-    FramebufferTexture2D = qopenglfResolveFramebufferTexture2D;
-    GenBuffers = qopenglfResolveGenBuffers;
-    GenerateMipmap = qopenglfResolveGenerateMipmap;
-    GenFramebuffers = qopenglfResolveGenFramebuffers;
-    GenRenderbuffers = qopenglfResolveGenRenderbuffers;
-    GetActiveAttrib = qopenglfResolveGetActiveAttrib;
-    GetActiveUniform = qopenglfResolveGetActiveUniform;
-    GetAttachedShaders = qopenglfResolveGetAttachedShaders;
-    GetAttribLocation = qopenglfResolveGetAttribLocation;
-    GetBufferParameteriv = qopenglfResolveGetBufferParameteriv;
-    GetFramebufferAttachmentParameteriv = qopenglfResolveGetFramebufferAttachmentParameteriv;
-    GetProgramiv = qopenglfResolveGetProgramiv;
-    GetProgramInfoLog = qopenglfResolveGetProgramInfoLog;
-    GetRenderbufferParameteriv = qopenglfResolveGetRenderbufferParameteriv;
-    GetShaderiv = qopenglfResolveGetShaderiv;
-    GetShaderInfoLog = qopenglfResolveGetShaderInfoLog;
-    GetShaderPrecisionFormat = qopenglfResolveGetShaderPrecisionFormat;
-    GetShaderSource = qopenglfResolveGetShaderSource;
-    GetUniformfv = qopenglfResolveGetUniformfv;
-    GetUniformiv = qopenglfResolveGetUniformiv;
-    GetUniformLocation = qopenglfResolveGetUniformLocation;
-    GetVertexAttribfv = qopenglfResolveGetVertexAttribfv;
-    GetVertexAttribiv = qopenglfResolveGetVertexAttribiv;
-    GetVertexAttribPointerv = qopenglfResolveGetVertexAttribPointerv;
-    IsBuffer = qopenglfResolveIsBuffer;
-    IsFramebuffer = qopenglfResolveIsFramebuffer;
-    IsProgram = qopenglfResolveIsProgram;
-    IsRenderbuffer = qopenglfResolveIsRenderbuffer;
-    IsShader = qopenglfResolveIsShader;
-    LinkProgram = qopenglfResolveLinkProgram;
-    ReleaseShaderCompiler = qopenglfResolveReleaseShaderCompiler;
-    RenderbufferStorage = qopenglfResolveRenderbufferStorage;
-    SampleCoverage = qopenglfResolveSampleCoverage;
-    ShaderBinary = qopenglfResolveShaderBinary;
-    ShaderSource = qopenglfResolveShaderSource;
-    StencilFuncSeparate = qopenglfResolveStencilFuncSeparate;
-    StencilMaskSeparate = qopenglfResolveStencilMaskSeparate;
-    StencilOpSeparate = qopenglfResolveStencilOpSeparate;
-    Uniform1f = qopenglfResolveUniform1f;
-    Uniform1fv = qopenglfResolveUniform1fv;
-    Uniform1i = qopenglfResolveUniform1i;
-    Uniform1iv = qopenglfResolveUniform1iv;
-    Uniform2f = qopenglfResolveUniform2f;
-    Uniform2fv = qopenglfResolveUniform2fv;
-    Uniform2i = qopenglfResolveUniform2i;
-    Uniform2iv = qopenglfResolveUniform2iv;
-    Uniform3f = qopenglfResolveUniform3f;
-    Uniform3fv = qopenglfResolveUniform3fv;
-    Uniform3i = qopenglfResolveUniform3i;
-    Uniform3iv = qopenglfResolveUniform3iv;
-    Uniform4f = qopenglfResolveUniform4f;
-    Uniform4fv = qopenglfResolveUniform4fv;
-    Uniform4i = qopenglfResolveUniform4i;
-    Uniform4iv = qopenglfResolveUniform4iv;
-    UniformMatrix2fv = qopenglfResolveUniformMatrix2fv;
-    UniformMatrix3fv = qopenglfResolveUniformMatrix3fv;
-    UniformMatrix4fv = qopenglfResolveUniformMatrix4fv;
-    UseProgram = qopenglfResolveUseProgram;
-    ValidateProgram = qopenglfResolveValidateProgram;
-    VertexAttrib1f = qopenglfResolveVertexAttrib1f;
-    VertexAttrib1fv = qopenglfResolveVertexAttrib1fv;
-    VertexAttrib2f = qopenglfResolveVertexAttrib2f;
-    VertexAttrib2fv = qopenglfResolveVertexAttrib2fv;
-    VertexAttrib3f = qopenglfResolveVertexAttrib3f;
-    VertexAttrib3fv = qopenglfResolveVertexAttrib3fv;
-    VertexAttrib4f = qopenglfResolveVertexAttrib4f;
-    VertexAttrib4fv = qopenglfResolveVertexAttrib4fv;
-    VertexAttribPointer = qopenglfResolveVertexAttribPointer;
-#endif // !QT_OPENGL_ES_2
 }
 
+
+QT_OPENGL_IMPLEMENT(QOpenGLFunctionsPrivate, QT_OPENGL_FUNCTIONS)
+
 /*!
     \class QOpenGLExtraFunctions
     \brief The QOpenGLExtraFunctions class provides cross-platform access to the OpenGL ES 3.0 and 3.1 API.
@@ -5744,1659 +4476,6 @@ QOpenGLFunctionsPrivate::QOpenGLFunctionsPrivate(QOpenGLContext *)
     \internal
 */
 
-// Functions part of the OpenGL ES 3.0+ standard need special handling. These, just like
-// the 2.0 functions, are not guaranteed to be resolvable via eglGetProcAddress or
-// similar. (we cannot count on EGL_KHR_(client_)get_all_proc_addresses being available)
-
-// Calling them directly is, unlike the 2.0 functions, not feasible because one may build
-// the binaries on a GLES3-capable system and then deploy on a GLES2-only system that does
-// not have these symbols, and vice versa. Until ES3 becomes universally available, they
-// have to be dlsym'ed.
-
-Q_GLOBAL_STATIC(QOpenGLES3Helper, qgles3Helper)
-
-bool QOpenGLES3Helper::init()
-{
-#ifdef QT_NO_LIBRARY
-    return false;
-#elif !defined(Q_OS_IOS)
-# ifdef Q_OS_WIN
-#  ifndef QT_DEBUG
-    m_gl.setFileName(QStringLiteral("libGLESv2"));
-#  else
-    m_gl.setFileName(QStringLiteral("libGLESv2d"));
-#  endif
-# else
-#  ifdef Q_OS_ANDROID
-    m_gl.setFileName(QStringLiteral("GLESv2"));
-#  else
-    m_gl.setFileNameAndVersion(QStringLiteral("GLESv2"), 2);
-#  endif
-# endif // Q_OS_WIN
-    return m_gl.load();
-#else
-    return true;
-#endif // Q_OS_IOS
-}
-
-QFunctionPointer QOpenGLES3Helper::resolve(const char *name)
-{
-#ifdef Q_OS_IOS
-    return QFunctionPointer(dlsym(RTLD_DEFAULT, name));
-#elif !defined(QT_NO_LIBRARY)
-    return m_gl.resolve(name);
-#else
-    Q_UNUSED(name);
-    return 0;
-#endif
-}
-
-QOpenGLES3Helper::QOpenGLES3Helper()
-{
-    m_supportedVersion = qMakePair(2, 0);
-
-    if (init()) {
-        const QPair<int, int> contextVersion = QOpenGLContext::currentContext()->format().version();
-
-        qCDebug(lcGLES3, "Resolving OpenGL ES 3.0 entry points");
-
-        BeginQuery = (void (QOPENGLF_APIENTRYP) (GLenum, GLuint)) resolve("glBeginQuery");
-        BeginTransformFeedback = (void (QOPENGLF_APIENTRYP) (GLenum)) resolve("glBeginTransformFeedback");
-        BindBufferBase = (void (QOPENGLF_APIENTRYP) (GLenum, GLuint, GLuint)) resolve("glBindBufferBase");
-        BindBufferRange = (void (QOPENGLF_APIENTRYP) (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr)) resolve("glBindBufferRange");
-        BindSampler = (void (QOPENGLF_APIENTRYP) (GLuint, GLuint)) resolve("glBindSampler");
-        BindTransformFeedback = (void (QOPENGLF_APIENTRYP) (GLenum, GLuint)) resolve("glBindTransformFeedback");
-        BindVertexArray = (void (QOPENGLF_APIENTRYP) (GLuint)) resolve("glBindVertexArray");
-        BlitFramebuffer = (void (QOPENGLF_APIENTRYP) (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum)) resolve("glBlitFramebuffer");
-        ClearBufferfi = (void (QOPENGLF_APIENTRYP) (GLenum, GLint, GLfloat, GLint)) resolve("glClearBufferfi");
-        ClearBufferfv = (void (QOPENGLF_APIENTRYP) (GLenum, GLint, const GLfloat *)) resolve("glClearBufferfv");
-        ClearBufferiv = (void (QOPENGLF_APIENTRYP) (GLenum, GLint, const GLint *)) resolve("glClearBufferiv");
-        ClearBufferuiv = (void (QOPENGLF_APIENTRYP) (GLenum, GLint, const GLuint *)) resolve("glClearBufferuiv");
-        ClientWaitSync = (GLenum (QOPENGLF_APIENTRYP) (GLsync, GLbitfield, GLuint64)) resolve("glClientWaitSync");
-        CompressedTexImage3D = (void (QOPENGLF_APIENTRYP) (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const void *)) resolve("glCompressedTexImage3D");
-        CompressedTexSubImage3D = (void (QOPENGLF_APIENTRYP) (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const void *)) resolve("glCompressedTexSubImage3D");
-        CopyBufferSubData = (void (QOPENGLF_APIENTRYP) (GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr)) resolve("glCopyBufferSubData");
-        CopyTexSubImage3D = (void (QOPENGLF_APIENTRYP) (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)) resolve("glCopyTexSubImage3D");
-        DeleteQueries = (void (QOPENGLF_APIENTRYP) (GLsizei, const GLuint *)) resolve("glDeleteQueries");
-        DeleteSamplers = (void (QOPENGLF_APIENTRYP) (GLsizei, const GLuint *)) resolve("glDeleteSamplers");
-        DeleteSync = (void (QOPENGLF_APIENTRYP) (GLsync)) resolve("glDeleteSync");
-        DeleteTransformFeedbacks = (void (QOPENGLF_APIENTRYP) (GLsizei, const GLuint *)) resolve("glDeleteTransformFeedbacks");
-        DeleteVertexArrays = (void (QOPENGLF_APIENTRYP) (GLsizei, const GLuint *)) resolve("glDeleteVertexArrays");
-        DrawArraysInstanced = (void (QOPENGLF_APIENTRYP) (GLenum, GLint, GLsizei, GLsizei)) resolve("glDrawArraysInstanced");
-        DrawBuffers = (void (QOPENGLF_APIENTRYP) (GLsizei, const GLenum *)) resolve("glDrawBuffers");
-        DrawElementsInstanced = (void (QOPENGLF_APIENTRYP) (GLenum, GLsizei, GLenum, const void *, GLsizei)) resolve("glDrawElementsInstanced");
-        DrawRangeElements = (void (QOPENGLF_APIENTRYP) (GLenum, GLuint, GLuint, GLsizei, GLenum, const void *)) resolve("glDrawRangeElements");
-        EndQuery = (void (QOPENGLF_APIENTRYP) (GLenum)) resolve("glEndQuery");
-        EndTransformFeedback = (void (QOPENGLF_APIENTRYP) ()) resolve("glEndTransformFeedback");
-        FenceSync = (GLsync (QOPENGLF_APIENTRYP) (GLenum, GLbitfield)) resolve("glFenceSync");
-        FlushMappedBufferRange = (void (QOPENGLF_APIENTRYP) (GLenum, GLintptr, GLsizeiptr)) resolve("glFlushMappedBufferRange");
-        FramebufferTextureLayer = (void (QOPENGLF_APIENTRYP) (GLenum, GLenum, GLuint, GLint, GLint)) resolve("glFramebufferTextureLayer");
-        GenQueries = (void (QOPENGLF_APIENTRYP) (GLsizei, GLuint*)) resolve("glGenQueries");
-        GenSamplers = (void (QOPENGLF_APIENTRYP) (GLsizei, GLuint*)) resolve("glGenSamplers");
-        GenTransformFeedbacks = (void (QOPENGLF_APIENTRYP) (GLsizei, GLuint*)) resolve("glGenTransformFeedbacks");
-        GenVertexArrays = (void (QOPENGLF_APIENTRYP) (GLsizei, GLuint*)) resolve("glGenVertexArrays");
-        GetActiveUniformBlockName = (void (QOPENGLF_APIENTRYP) (GLuint, GLuint, GLsizei, GLsizei*, GLchar*)) resolve("glGetActiveUniformBlockName");
-        GetActiveUniformBlockiv = (void (QOPENGLF_APIENTRYP) (GLuint, GLuint, GLenum, GLint*)) resolve("glGetActiveUniformBlockiv");
-        GetActiveUniformsiv = (void (QOPENGLF_APIENTRYP) (GLuint, GLsizei, const GLuint *, GLenum, GLint*)) resolve("glGetActiveUniformsiv");
-        GetBufferParameteri64v = (void (QOPENGLF_APIENTRYP) (GLenum, GLenum, GLint64*)) resolve("glGetBufferParameteri64v");
-        GetBufferPointerv = (void (QOPENGLF_APIENTRYP) (GLenum, GLenum, void **)) resolve("glGetBufferPointerv");
-        GetFragDataLocation = (GLint (QOPENGLF_APIENTRYP) (GLuint, const GLchar *)) resolve("glGetFragDataLocation");
-        GetInteger64i_v = (void (QOPENGLF_APIENTRYP) (GLenum, GLuint, GLint64*)) resolve("glGetInteger64i_v");
-        GetInteger64v = (void (QOPENGLF_APIENTRYP) (GLenum, GLint64*)) resolve("glGetInteger64v");
-        GetIntegeri_v = (void (QOPENGLF_APIENTRYP) (GLenum, GLuint, GLint*)) resolve("glGetIntegeri_v");
-        GetInternalformativ = (void (QOPENGLF_APIENTRYP) (GLenum, GLenum, GLenum, GLsizei, GLint*)) resolve("glGetInternalformativ");
-        GetProgramBinary = (void (QOPENGLF_APIENTRYP) (GLuint, GLsizei, GLsizei*, GLenum*, void *)) resolve("glGetProgramBinary");
-        GetQueryObjectuiv = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, GLuint*)) resolve("glGetQueryObjectuiv");
-        GetQueryiv = (void (QOPENGLF_APIENTRYP) (GLenum, GLenum, GLint*)) resolve("glGetQueryiv");
-        GetSamplerParameterfv = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, GLfloat*)) resolve("glGetSamplerParameterfv");
-        GetSamplerParameteriv = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, GLint*)) resolve("glGetSamplerParameteriv");
-        GetStringi = (const GLubyte * (QOPENGLF_APIENTRYP) (GLenum, GLuint)) resolve("glGetStringi");
-        GetSynciv = (void (QOPENGLF_APIENTRYP) (GLsync, GLenum, GLsizei, GLsizei*, GLint*)) resolve("glGetSynciv");
-        GetTransformFeedbackVarying = (void (QOPENGLF_APIENTRYP) (GLuint, GLuint, GLsizei, GLsizei*, GLsizei*, GLenum*, GLchar*)) resolve("glGetTransformFeedbackVarying");
-        GetUniformBlockIndex = (GLuint (QOPENGLF_APIENTRYP) (GLuint, const GLchar *)) resolve("glGetUniformBlockIndex");
-        GetUniformIndices = (void (QOPENGLF_APIENTRYP) (GLuint, GLsizei, const GLchar *const*, GLuint*)) resolve("glGetUniformIndices");
-        GetUniformuiv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLuint*)) resolve("glGetUniformuiv");
-        GetVertexAttribIiv = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, GLint*)) resolve("glGetVertexAttribIiv");
-        GetVertexAttribIuiv = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, GLuint*)) resolve("glGetVertexAttribIuiv");
-        InvalidateFramebuffer = (void (QOPENGLF_APIENTRYP) (GLenum, GLsizei, const GLenum *)) resolve("glInvalidateFramebuffer");
-        InvalidateSubFramebuffer = (void (QOPENGLF_APIENTRYP) (GLenum, GLsizei, const GLenum *, GLint, GLint, GLsizei, GLsizei)) resolve("glInvalidateSubFramebuffer");
-        IsQuery = (GLboolean (QOPENGLF_APIENTRYP) (GLuint)) resolve("glIsQuery");
-        IsSampler = (GLboolean (QOPENGLF_APIENTRYP) (GLuint)) resolve("glIsSampler");
-        IsSync = (GLboolean (QOPENGLF_APIENTRYP) (GLsync)) resolve("glIsSync");
-        IsTransformFeedback = (GLboolean (QOPENGLF_APIENTRYP) (GLuint)) resolve("glIsTransformFeedback");
-        IsVertexArray = (GLboolean (QOPENGLF_APIENTRYP) (GLuint)) resolve("glIsVertexArray");
-        MapBufferRange = (void * (QOPENGLF_APIENTRYP) (GLenum, GLintptr, GLsizeiptr, GLbitfield)) resolve("glMapBufferRange");
-        PauseTransformFeedback = (void (QOPENGLF_APIENTRYP) ()) resolve("glPauseTransformFeedback");
-        ProgramBinary = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, const void *, GLsizei)) resolve("glProgramBinary");
-        ProgramParameteri = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, GLint)) resolve("glProgramParameteri");
-        ReadBuffer = (void (QOPENGLF_APIENTRYP) (GLenum)) resolve("glReadBuffer");
-        RenderbufferStorageMultisample = (void (QOPENGLF_APIENTRYP) (GLenum, GLsizei, GLenum, GLsizei, GLsizei)) resolve("glRenderbufferStorageMultisample");
-        ResumeTransformFeedback = (void (QOPENGLF_APIENTRYP) ()) resolve("glResumeTransformFeedback");
-        SamplerParameterf = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, GLfloat)) resolve("glSamplerParameterf");
-        SamplerParameterfv = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, const GLfloat *)) resolve("glSamplerParameterfv");
-        SamplerParameteri = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, GLint)) resolve("glSamplerParameteri");
-        SamplerParameteriv = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, const GLint *)) resolve("glSamplerParameteriv");
-        TexImage3D = (void (QOPENGLF_APIENTRYP) (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const void *)) resolve("glTexImage3D");
-        TexStorage2D = (void (QOPENGLF_APIENTRYP) (GLenum, GLsizei, GLenum, GLsizei, GLsizei)) resolve("glTexStorage2D");
-        TexStorage3D = (void (QOPENGLF_APIENTRYP) (GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei)) resolve("glTexStorage3D");
-        TexSubImage3D = (void (QOPENGLF_APIENTRYP) (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const void *)) resolve("glTexSubImage3D");
-        TransformFeedbackVaryings = (void (QOPENGLF_APIENTRYP) (GLuint, GLsizei, const GLchar *const*, GLenum)) resolve("glTransformFeedbackVaryings");
-        Uniform1ui = (void (QOPENGLF_APIENTRYP) (GLint, GLuint)) resolve("glUniform1ui");
-        Uniform1uiv = (void (QOPENGLF_APIENTRYP) (GLint, GLsizei, const GLuint *)) resolve("glUniform1uiv");
-        Uniform2ui = (void (QOPENGLF_APIENTRYP) (GLint, GLuint, GLuint)) resolve("glUniform2ui");
-        Uniform2uiv = (void (QOPENGLF_APIENTRYP) (GLint, GLsizei, const GLuint *)) resolve("glUniform2uiv");
-        Uniform3ui = (void (QOPENGLF_APIENTRYP) (GLint, GLuint, GLuint, GLuint)) resolve("glUniform3ui");
-        Uniform3uiv = (void (QOPENGLF_APIENTRYP) (GLint, GLsizei, const GLuint *)) resolve("glUniform3uiv");
-        Uniform4ui = (void (QOPENGLF_APIENTRYP) (GLint, GLuint, GLuint, GLuint, GLuint)) resolve("glUniform4ui");
-        Uniform4uiv = (void (QOPENGLF_APIENTRYP) (GLint, GLsizei, const GLuint *)) resolve("glUniform4uiv");
-        UniformBlockBinding = (void (QOPENGLF_APIENTRYP) (GLuint, GLuint, GLuint)) resolve("glUniformBlockBinding");
-        UniformMatrix2x3fv = (void (QOPENGLF_APIENTRYP) (GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glUniformMatrix2x3fv");
-        UniformMatrix2x4fv = (void (QOPENGLF_APIENTRYP) (GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glUniformMatrix2x4fv");
-        UniformMatrix3x2fv = (void (QOPENGLF_APIENTRYP) (GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glUniformMatrix3x2fv");
-        UniformMatrix3x4fv = (void (QOPENGLF_APIENTRYP) (GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glUniformMatrix3x4fv");
-        UniformMatrix4x2fv = (void (QOPENGLF_APIENTRYP) (GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glUniformMatrix4x2fv");
-        UniformMatrix4x3fv = (void (QOPENGLF_APIENTRYP) (GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glUniformMatrix4x3fv");
-        UnmapBuffer = (GLboolean (QOPENGLF_APIENTRYP) (GLenum)) resolve("glUnmapBuffer");
-        VertexAttribDivisor = (void (QOPENGLF_APIENTRYP) (GLuint, GLuint)) resolve("glVertexAttribDivisor");
-        VertexAttribI4i = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLint, GLint, GLint)) resolve("glVertexAttribI4i");
-        VertexAttribI4iv = (void (QOPENGLF_APIENTRYP) (GLuint, const GLint *)) resolve("glVertexAttribI4iv");
-        VertexAttribI4ui = (void (QOPENGLF_APIENTRYP) (GLuint, GLuint, GLuint, GLuint, GLuint)) resolve("glVertexAttribI4ui");
-        VertexAttribI4uiv = (void (QOPENGLF_APIENTRYP) (GLuint, const GLuint *)) resolve("glVertexAttribI4uiv");
-        VertexAttribIPointer = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLenum, GLsizei, const void *)) resolve("glVertexAttribIPointer");
-        WaitSync = (void (QOPENGLF_APIENTRYP) (GLsync, GLbitfield, GLuint64)) resolve("glWaitSync");
-
-        if (!BeginQuery || !BlitFramebuffer || !GenTransformFeedbacks || !GenVertexArrays || !MapBufferRange
-            || !RenderbufferStorageMultisample || !TexStorage2D || !WaitSync) {
-            qWarning("OpenGL ES 3.0 entry points not found. This is odd because the driver returned a context of version %d.%d",
-                     contextVersion.first, contextVersion.second);
-            return;
-        }
-        m_supportedVersion = qMakePair(3, 0);
-
-        if (contextVersion >= qMakePair(3, 1)) {
-            qCDebug(lcGLES3, "Resolving OpenGL ES 3.1 entry points");
-
-            ActiveShaderProgram = (void (QOPENGLF_APIENTRYP) (GLuint, GLuint)) resolve("glActiveShaderProgram");
-            BindImageTexture = (void (QOPENGLF_APIENTRYP) (GLuint, GLuint, GLint, GLboolean, GLint, GLenum, GLenum)) resolve("glBindImageTexture");
-            BindProgramPipeline = (void (QOPENGLF_APIENTRYP) (GLuint)) resolve("glBindProgramPipeline");
-            BindVertexBuffer = (void (QOPENGLF_APIENTRYP) (GLuint, GLuint, GLintptr, GLsizei)) resolve("glBindVertexBuffer");
-            CreateShaderProgramv = (GLuint (QOPENGLF_APIENTRYP) (GLenum, GLsizei, const GLchar *const*)) resolve("glCreateShaderProgramv");
-            DeleteProgramPipelines = (void (QOPENGLF_APIENTRYP) (GLsizei, const GLuint *)) resolve("glDeleteProgramPipelines");
-            DispatchCompute = (void (QOPENGLF_APIENTRYP) (GLuint, GLuint, GLuint)) resolve("glDispatchCompute");
-            DispatchComputeIndirect = (void (QOPENGLF_APIENTRYP) (GLintptr)) resolve("glDispatchComputeIndirect");
-            DrawArraysIndirect = (void (QOPENGLF_APIENTRYP) (GLenum, const void *)) resolve("glDrawArraysIndirect");
-            DrawElementsIndirect = (void (QOPENGLF_APIENTRYP) (GLenum, GLenum, const void *)) resolve("glDrawElementsIndirect");
-            FramebufferParameteri = (void (QOPENGLF_APIENTRYP) (GLenum, GLenum, GLint)) resolve("glFramebufferParameteri");
-            GenProgramPipelines = (void (QOPENGLF_APIENTRYP) (GLsizei, GLuint*)) resolve("glGenProgramPipelines");
-            GetBooleani_v = (void (QOPENGLF_APIENTRYP) (GLenum, GLuint, GLboolean*)) resolve("glGetBooleani_v");
-            GetFramebufferParameteriv = (void (QOPENGLF_APIENTRYP) (GLenum, GLenum, GLint*)) resolve("glGetFramebufferParameteriv");
-            GetMultisamplefv = (void (QOPENGLF_APIENTRYP) (GLenum, GLuint, GLfloat*)) resolve("glGetMultisamplefv");
-            GetProgramInterfaceiv = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, GLenum, GLint*)) resolve("glGetProgramInterfaceiv");
-            GetProgramPipelineInfoLog = (void (QOPENGLF_APIENTRYP) (GLuint, GLsizei, GLsizei*, GLchar*)) resolve("glGetProgramPipelineInfoLog");
-            GetProgramPipelineiv = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, GLint*)) resolve("glGetProgramPipelineiv");
-            GetProgramResourceIndex = (GLuint (QOPENGLF_APIENTRYP) (GLuint, GLenum, const GLchar *)) resolve("glGetProgramResourceIndex");
-            GetProgramResourceLocation = (GLint (QOPENGLF_APIENTRYP) (GLuint, GLenum, const GLchar *)) resolve("glGetProgramResourceLocation");
-            GetProgramResourceName = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, GLuint, GLsizei, GLsizei*, GLchar*)) resolve("glGetProgramResourceName");
-            GetProgramResourceiv = (void (QOPENGLF_APIENTRYP) (GLuint, GLenum, GLuint, GLsizei, const GLenum *, GLsizei, GLsizei*, GLint*)) resolve("glGetProgramResourceiv");
-            GetTexLevelParameterfv = (void (QOPENGLF_APIENTRYP) (GLenum, GLint, GLenum, GLfloat*)) resolve("glGetTexLevelParameterfv");
-            GetTexLevelParameteriv = (void (QOPENGLF_APIENTRYP) (GLenum, GLint, GLenum, GLint*)) resolve("glGetTexLevelParameteriv");
-            IsProgramPipeline = (GLboolean (QOPENGLF_APIENTRYP) (GLuint)) resolve("glIsProgramPipeline");
-            MemoryBarrierFunc = (void (QOPENGLF_APIENTRYP) (GLbitfield)) resolve("glMemoryBarrier");
-            MemoryBarrierByRegion = (void (QOPENGLF_APIENTRYP) (GLbitfield)) resolve("glMemoryBarrierByRegion");
-            ProgramUniform1f = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLfloat)) resolve("glProgramUniform1f");
-            ProgramUniform1fv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, const GLfloat *)) resolve("glProgramUniform1fv");
-            ProgramUniform1i = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLint)) resolve("glProgramUniform1i");
-            ProgramUniform1iv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, const GLint *)) resolve("glProgramUniform1iv");
-            ProgramUniform1ui = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLuint)) resolve("glProgramUniform1ui");
-            ProgramUniform1uiv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, const GLuint *)) resolve("glProgramUniform1uiv");
-            ProgramUniform2f = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLfloat, GLfloat)) resolve("glProgramUniform2f");
-            ProgramUniform2fv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, const GLfloat *)) resolve("glProgramUniform2fv");
-            ProgramUniform2i = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLint, GLint)) resolve("glProgramUniform2i");
-            ProgramUniform2iv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, const GLint *)) resolve("glProgramUniform2iv");
-            ProgramUniform2ui = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLuint, GLuint)) resolve("glProgramUniform2ui");
-            ProgramUniform2uiv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, const GLuint *)) resolve("glProgramUniform2uiv");
-            ProgramUniform3f = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLfloat, GLfloat, GLfloat)) resolve("glProgramUniform3f");
-            ProgramUniform3fv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, const GLfloat *)) resolve("glProgramUniform3fv");
-            ProgramUniform3i = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLint, GLint, GLint)) resolve("glProgramUniform3i");
-            ProgramUniform3iv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, const GLint *)) resolve("glProgramUniform3iv");
-            ProgramUniform3ui = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLuint, GLuint, GLuint)) resolve("glProgramUniform3ui");
-            ProgramUniform3uiv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, const GLuint *)) resolve("glProgramUniform3uiv");
-            ProgramUniform4f = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLfloat, GLfloat, GLfloat, GLfloat)) resolve("glProgramUniform4f");
-            ProgramUniform4fv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, const GLfloat *)) resolve("glProgramUniform4fv");
-            ProgramUniform4i = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLint, GLint, GLint, GLint)) resolve("glProgramUniform4i");
-            ProgramUniform4iv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, const GLint *)) resolve("glProgramUniform4iv");
-            ProgramUniform4ui = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLuint, GLuint, GLuint, GLuint)) resolve("glProgramUniform4ui");
-            ProgramUniform4uiv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, const GLuint *)) resolve("glProgramUniform4uiv");
-            ProgramUniformMatrix2fv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glProgramUniformMatrix2fv");
-            ProgramUniformMatrix2x3fv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glProgramUniformMatrix2x3fv");
-            ProgramUniformMatrix2x4fv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glProgramUniformMatrix2x4fv");
-            ProgramUniformMatrix3fv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glProgramUniformMatrix3fv");
-            ProgramUniformMatrix3x2fv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glProgramUniformMatrix3x2fv");
-            ProgramUniformMatrix3x4fv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glProgramUniformMatrix3x4fv");
-            ProgramUniformMatrix4fv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glProgramUniformMatrix4fv");
-            ProgramUniformMatrix4x2fv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glProgramUniformMatrix4x2fv");
-            ProgramUniformMatrix4x3fv = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) resolve("glProgramUniformMatrix4x3fv");
-            SampleMaski = (void (QOPENGLF_APIENTRYP) (GLuint, GLbitfield)) resolve("glSampleMaski");
-            TexStorage2DMultisample = (void (QOPENGLF_APIENTRYP) (GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLboolean)) resolve("glTexStorage2DMultisample");
-            UseProgramStages = (void (QOPENGLF_APIENTRYP) (GLuint, GLbitfield, GLuint)) resolve("glUseProgramStages");
-            ValidateProgramPipeline = (void (QOPENGLF_APIENTRYP) (GLuint)) resolve("glValidateProgramPipeline");
-            VertexAttribBinding = (void (QOPENGLF_APIENTRYP) (GLuint, GLuint)) resolve("glVertexAttribBinding");
-            VertexAttribFormat = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLenum, GLboolean, GLuint)) resolve("glVertexAttribFormat");
-            VertexAttribIFormat = (void (QOPENGLF_APIENTRYP) (GLuint, GLint, GLenum, GLuint)) resolve("glVertexAttribIFormat");
-            VertexBindingDivisor = (void (QOPENGLF_APIENTRYP) (GLuint, GLuint)) resolve("glVertexBindingDivisor");
-
-            if (!ActiveShaderProgram || !BindImageTexture || !DispatchCompute || !DrawArraysIndirect
-                || !GenProgramPipelines || !MemoryBarrierFunc) {
-                qWarning("OpenGL ES 3.1 entry points not found. This is odd because the driver returned a context of version %d.%d",
-                         contextVersion.first, contextVersion.second);
-                return;
-            }
-            m_supportedVersion = qMakePair(3, 1);
-        }
-    } else {
-        qFatal("Failed to load libGLESv2");
-    }
-}
-
-// GLES 3.0 and 3.1
-
-// Checks for true OpenGL ES 3.x. OpenGL with GL_ARB_ES3_compatibility
-// does not count because there the plain resolvers work anyhow.
-static inline bool isES3(int minor)
-{
-    QOpenGLContext *ctx = QOpenGLContext::currentContext();
-
-    const bool libMatches = QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES;
-    const bool contextMatches = ctx->isOpenGLES() && ctx->format().version() >= qMakePair(3, minor);
-
-    // Resolving happens whenever qgles3Helper() is called first. So do it only
-    // when the driver gives a 3.0+ context.
-    if (libMatches && contextMatches)
-        return qgles3Helper()->supportedVersion() >= qMakePair(3, minor);
-
-    return false;
-}
-
-// Go through the dlsym-based helper for real ES 3, resolve using
-// wglGetProcAddress or similar when on plain OpenGL.
-
-static void QOPENGLF_APIENTRY qopenglfResolveBeginQuery(GLenum target, GLuint id)
-{
-    if (isES3(0))
-        qgles3Helper()->BeginQuery(target, id);
-    else
-        RESOLVE_FUNC_VOID(0, BeginQuery)(target, id);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBeginTransformFeedback(GLenum primitiveMode)
-{
-    if (isES3(0))
-        qgles3Helper()->BeginTransformFeedback(primitiveMode);
-    else
-        RESOLVE_FUNC_VOID(0, BeginTransformFeedback)(primitiveMode);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBindBufferBase(GLenum target, GLuint index, GLuint buffer)
-{
-    if (isES3(0))
-        qgles3Helper()->BindBufferBase(target, index, buffer);
-    else
-        RESOLVE_FUNC_VOID(0, BindBufferBase)(target, index, buffer);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
-{
-    if (isES3(0))
-        qgles3Helper()->BindBufferRange(target, index, buffer, offset, size);
-    else
-        RESOLVE_FUNC_VOID(0, BindBufferRange)(target, index, buffer, offset, size);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBindSampler(GLuint unit, GLuint sampler)
-{
-    if (isES3(0))
-        qgles3Helper()->BindSampler(unit, sampler);
-    else
-        RESOLVE_FUNC_VOID(0, BindSampler)(unit, sampler);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBindTransformFeedback(GLenum target, GLuint id)
-{
-    if (isES3(0))
-        qgles3Helper()->BindTransformFeedback(target, id);
-    else
-        RESOLVE_FUNC_VOID(0, BindTransformFeedback)(target, id);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBindVertexArray(GLuint array)
-{
-    if (isES3(0))
-        qgles3Helper()->BindVertexArray(array);
-    else
-        RESOLVE_FUNC_VOID(0, BindVertexArray)(array);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
-{
-    if (isES3(0))
-        qgles3Helper()->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
-    else
-        RESOLVE_FUNC_VOID(ResolveEXT | ResolveANGLE | ResolveNV, BlitFramebuffer)
-            (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
-{
-    if (isES3(0))
-        qgles3Helper()->ClearBufferfi(buffer, drawbuffer, depth, stencil);
-    else
-        RESOLVE_FUNC_VOID(0, ClearBufferfi)(buffer, drawbuffer, depth, stencil);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat * value)
-{
-    if (isES3(0))
-        qgles3Helper()->ClearBufferfv(buffer, drawbuffer, value);
-    else
-        RESOLVE_FUNC_VOID(0, ClearBufferfv)(buffer, drawbuffer, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint * value)
-{
-    if (isES3(0))
-        qgles3Helper()->ClearBufferiv(buffer, drawbuffer, value);
-    else
-        RESOLVE_FUNC_VOID(0, ClearBufferiv)(buffer, drawbuffer, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint * value)
-{
-    if (isES3(0))
-        qgles3Helper()->ClearBufferuiv(buffer, drawbuffer, value);
-    else
-        RESOLVE_FUNC_VOID(0, ClearBufferuiv)(buffer, drawbuffer, value);
-}
-
-static GLenum QOPENGLF_APIENTRY qopenglfResolveClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
-{
-    if (isES3(0))
-        return qgles3Helper()->ClientWaitSync(sync, flags, timeout);
-    else
-        RESOLVE_FUNC(GLenum, 0, ClientWaitSync)(sync, flags, timeout);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void * data)
-{
-    if (isES3(0))
-        qgles3Helper()->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
-    else
-        RESOLVE_FUNC_VOID(0, CompressedTexImage3D)(target, level, internalformat, width, height, depth, border, imageSize, data);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void * data)
-{
-    if (isES3(0))
-        qgles3Helper()->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
-    else
-        RESOLVE_FUNC_VOID(0, CompressedTexSubImage3D)(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
-{
-    if (isES3(0))
-        qgles3Helper()->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
-    else
-        RESOLVE_FUNC_VOID(0, CopyBufferSubData)(readTarget, writeTarget, readOffset, writeOffset, size);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
-{
-    if (isES3(0))
-        qgles3Helper()->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
-    else
-        RESOLVE_FUNC_VOID(0, CopyTexSubImage3D)(target, level, xoffset, yoffset, zoffset, x, y, width, height);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDeleteQueries(GLsizei n, const GLuint * ids)
-{
-    if (isES3(0))
-        qgles3Helper()->DeleteQueries(n, ids);
-    else
-        RESOLVE_FUNC_VOID(0, DeleteQueries)(n, ids);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDeleteSamplers(GLsizei count, const GLuint * samplers)
-{
-    if (isES3(0))
-        qgles3Helper()->DeleteSamplers(count, samplers);
-    else
-        RESOLVE_FUNC_VOID(0, DeleteSamplers)(count, samplers);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDeleteSync(GLsync sync)
-{
-    if (isES3(0))
-        qgles3Helper()->DeleteSync(sync);
-    else
-        RESOLVE_FUNC_VOID(0, DeleteSync)(sync);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDeleteTransformFeedbacks(GLsizei n, const GLuint * ids)
-{
-    if (isES3(0))
-        qgles3Helper()->DeleteTransformFeedbacks(n, ids);
-    else
-        RESOLVE_FUNC_VOID(0, DeleteTransformFeedbacks)(n, ids);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDeleteVertexArrays(GLsizei n, const GLuint * arrays)
-{
-    if (isES3(0))
-        qgles3Helper()->DeleteVertexArrays(n, arrays);
-    else
-        RESOLVE_FUNC_VOID(0, DeleteVertexArrays)(n, arrays);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
-{
-    if (isES3(0))
-        qgles3Helper()->DrawArraysInstanced(mode, first, count, instancecount);
-    else
-        RESOLVE_FUNC_VOID(0, DrawArraysInstanced)(mode, first, count, instancecount);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDrawBuffers(GLsizei n, const GLenum * bufs)
-{
-    if (isES3(0))
-        qgles3Helper()->DrawBuffers(n, bufs);
-    else
-        RESOLVE_FUNC_VOID(0, DrawBuffers)(n, bufs);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const void * indices, GLsizei instancecount)
-{
-    if (isES3(0))
-        qgles3Helper()->DrawElementsInstanced(mode, count, type, indices, instancecount);
-    else
-        RESOLVE_FUNC_VOID(0, DrawElementsInstanced)(mode, count, type, indices, instancecount);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void * indices)
-{
-    if (isES3(0))
-        qgles3Helper()->DrawRangeElements(mode, start, end, count, type, indices);
-    else
-        RESOLVE_FUNC_VOID(0, DrawRangeElements)(mode, start, end, count, type, indices);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveEndQuery(GLenum target)
-{
-    if (isES3(0))
-        qgles3Helper()->EndQuery(target);
-    else
-        RESOLVE_FUNC_VOID(0, EndQuery)(target);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveEndTransformFeedback()
-{
-    if (isES3(0))
-        qgles3Helper()->EndTransformFeedback();
-    else
-        RESOLVE_FUNC_VOID(0, EndTransformFeedback)();
-}
-
-static GLsync QOPENGLF_APIENTRY qopenglfResolveFenceSync(GLenum condition, GLbitfield flags)
-{
-    if (isES3(0))
-        return qgles3Helper()->FenceSync(condition, flags);
-    else
-        RESOLVE_FUNC(GLsync, 0, FenceSync)(condition, flags);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
-{
-    if (isES3(0))
-        qgles3Helper()->FlushMappedBufferRange(target, offset, length);
-    else
-        RESOLVE_FUNC_VOID(0, FlushMappedBufferRange)(target, offset, length);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
-{
-    if (isES3(0))
-        qgles3Helper()->FramebufferTextureLayer(target, attachment, texture, level, layer);
-    else
-        RESOLVE_FUNC_VOID(0, FramebufferTextureLayer)(target, attachment, texture, level, layer);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGenQueries(GLsizei n, GLuint* ids)
-{
-    if (isES3(0))
-        qgles3Helper()->GenQueries(n, ids);
-    else
-        RESOLVE_FUNC_VOID(0, GenQueries)(n, ids);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGenSamplers(GLsizei count, GLuint* samplers)
-{
-    if (isES3(0))
-        qgles3Helper()->GenSamplers(count, samplers);
-    else
-        RESOLVE_FUNC_VOID(0, GenSamplers)(count, samplers);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGenTransformFeedbacks(GLsizei n, GLuint* ids)
-{
-    if (isES3(0))
-        qgles3Helper()->GenTransformFeedbacks(n, ids);
-    else
-        RESOLVE_FUNC_VOID(0, GenTransformFeedbacks)(n, ids);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGenVertexArrays(GLsizei n, GLuint* arrays)
-{
-    if (isES3(0))
-        qgles3Helper()->GenVertexArrays(n, arrays);
-    else
-        RESOLVE_FUNC_VOID(0, GenVertexArrays)(n, arrays);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName)
-{
-    if (isES3(0))
-        qgles3Helper()->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
-    else
-        RESOLVE_FUNC_VOID(0, GetActiveUniformBlockName)(program, uniformBlockIndex, bufSize, length, uniformBlockName);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params)
-{
-    if (isES3(0))
-        qgles3Helper()->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetActiveUniformBlockiv)(program, uniformBlockIndex, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint * uniformIndices, GLenum pname, GLint* params)
-{
-    if (isES3(0))
-        qgles3Helper()->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetActiveUniformsiv)(program, uniformCount, uniformIndices, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetBufferParameteri64v(GLenum target, GLenum pname, GLint64* params)
-{
-    if (isES3(0))
-        qgles3Helper()->GetBufferParameteri64v(target, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetBufferParameteri64v)(target, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetBufferPointerv(GLenum target, GLenum pname, void ** params)
-{
-    if (isES3(0))
-        qgles3Helper()->GetBufferPointerv(target, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetBufferPointerv)(target, pname, params);
-}
-
-static GLint QOPENGLF_APIENTRY qopenglfResolveGetFragDataLocation(GLuint program, const GLchar * name)
-{
-    if (isES3(0))
-        return qgles3Helper()->GetFragDataLocation(program, name);
-    else
-        RESOLVE_FUNC(GLint, 0, GetFragDataLocation)(program, name);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetInteger64i_v(GLenum target, GLuint index, GLint64* data)
-{
-    if (isES3(0))
-        qgles3Helper()->GetInteger64i_v(target, index, data);
-    else
-        RESOLVE_FUNC_VOID(0, GetInteger64i_v)(target, index, data);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetInteger64v(GLenum pname, GLint64* data)
-{
-    if (isES3(0))
-        qgles3Helper()->GetInteger64v(pname, data);
-    else
-        RESOLVE_FUNC_VOID(0, GetInteger64v)(pname, data);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetIntegeri_v(GLenum target, GLuint index, GLint* data)
-{
-    if (isES3(0))
-        qgles3Helper()->GetIntegeri_v(target, index, data);
-    else
-        RESOLVE_FUNC_VOID(0, GetIntegeri_v)(target, index, data);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params)
-{
-    if (isES3(0))
-        qgles3Helper()->GetInternalformativ(target, internalformat, pname, bufSize, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetInternalformativ)(target, internalformat, pname, bufSize, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat, void * binary)
-{
-    if (isES3(0))
-        qgles3Helper()->GetProgramBinary(program, bufSize, length, binaryFormat, binary);
-    else
-        RESOLVE_FUNC_VOID(0, GetProgramBinary)(program, bufSize, length, binaryFormat, binary);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetQueryObjectuiv(GLuint id, GLenum pname, GLuint* params)
-{
-    if (isES3(0))
-        qgles3Helper()->GetQueryObjectuiv(id, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetQueryObjectuiv)(id, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetQueryiv(GLenum target, GLenum pname, GLint* params)
-{
-    if (isES3(0))
-        qgles3Helper()->GetQueryiv(target, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetQueryiv)(target, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat* params)
-{
-    if (isES3(0))
-        qgles3Helper()->GetSamplerParameterfv(sampler, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetSamplerParameterfv)(sampler, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint* params)
-{
-    if (isES3(0))
-        qgles3Helper()->GetSamplerParameteriv(sampler, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetSamplerParameteriv)(sampler, pname, params);
-}
-
-static const GLubyte * QOPENGLF_APIENTRY qopenglfResolveGetStringi(GLenum name, GLuint index)
-{
-    if (isES3(0))
-        return qgles3Helper()->GetStringi(name, index);
-    else
-        RESOLVE_FUNC(const GLubyte *, 0, GetStringi)(name, index);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values)
-{
-    if (isES3(0))
-        qgles3Helper()->GetSynciv(sync, pname, bufSize, length, values);
-    else
-        RESOLVE_FUNC_VOID(0, GetSynciv)(sync, pname, bufSize, length, values);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name)
-{
-    if (isES3(0))
-        qgles3Helper()->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
-    else
-        RESOLVE_FUNC_VOID(0, GetTransformFeedbackVarying)(program, index, bufSize, length, size, type, name);
-}
-
-static GLuint QOPENGLF_APIENTRY qopenglfResolveGetUniformBlockIndex(GLuint program, const GLchar * uniformBlockName)
-{
-    if (isES3(0))
-        return qgles3Helper()->GetUniformBlockIndex(program, uniformBlockName);
-    else
-        RESOLVE_FUNC(GLuint, 0, GetUniformBlockIndex)(program, uniformBlockName);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar *const* uniformNames, GLuint* uniformIndices)
-{
-    if (isES3(0))
-        qgles3Helper()->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
-    else
-        RESOLVE_FUNC_VOID(0, GetUniformIndices)(program, uniformCount, uniformNames, uniformIndices);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetUniformuiv(GLuint program, GLint location, GLuint* params)
-{
-    if (isES3(0))
-        qgles3Helper()->GetUniformuiv(program, location, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetUniformuiv)(program, location, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetVertexAttribIiv(GLuint index, GLenum pname, GLint* params)
-{
-    if (isES3(0))
-        qgles3Helper()->GetVertexAttribIiv(index, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetVertexAttribIiv)(index, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint* params)
-{
-    if (isES3(0))
-        qgles3Helper()->GetVertexAttribIuiv(index, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetVertexAttribIuiv)(index, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveInvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum * attachments)
-{
-    if (isES3(0))
-        qgles3Helper()->InvalidateFramebuffer(target, numAttachments, attachments);
-    else
-        RESOLVE_FUNC_VOID(0, InvalidateFramebuffer)(target, numAttachments, attachments);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, const GLenum * attachments, GLint x, GLint y, GLsizei width, GLsizei height)
-{
-    if (isES3(0))
-        qgles3Helper()->InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
-    else
-        RESOLVE_FUNC_VOID(0, InvalidateSubFramebuffer)(target, numAttachments, attachments, x, y, width, height);
-}
-
-static GLboolean QOPENGLF_APIENTRY qopenglfResolveIsQuery(GLuint id)
-{
-    if (isES3(0))
-        return qgles3Helper()->IsQuery(id);
-    else
-        RESOLVE_FUNC(GLboolean, 0, IsQuery)(id);
-}
-
-static GLboolean QOPENGLF_APIENTRY qopenglfResolveIsSampler(GLuint sampler)
-{
-    if (isES3(0))
-        return qgles3Helper()->IsSampler(sampler);
-    else
-        RESOLVE_FUNC(GLboolean, 0, IsSampler)(sampler);
-}
-
-static GLboolean QOPENGLF_APIENTRY qopenglfResolveIsSync(GLsync sync)
-{
-    if (isES3(0))
-        return qgles3Helper()->IsSync(sync);
-    else
-        RESOLVE_FUNC(GLboolean, 0, IsSync)(sync);
-}
-
-static GLboolean QOPENGLF_APIENTRY qopenglfResolveIsTransformFeedback(GLuint id)
-{
-    if (isES3(0))
-        return qgles3Helper()->IsTransformFeedback(id);
-    else
-        RESOLVE_FUNC(GLboolean, 0, IsTransformFeedback)(id);
-}
-
-static GLboolean QOPENGLF_APIENTRY qopenglfResolveIsVertexArray(GLuint array)
-{
-    if (isES3(0))
-        return qgles3Helper()->IsVertexArray(array);
-    else
-        RESOLVE_FUNC(GLboolean, 0, IsVertexArray)(array);
-}
-
-static void * QOPENGLF_APIENTRY qopenglfResolveMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
-{
-    if (isES3(0))
-        return qgles3Helper()->MapBufferRange(target, offset, length, access);
-    else
-        RESOLVE_FUNC(void *, 0, MapBufferRange)(target, offset, length, access);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolvePauseTransformFeedback()
-{
-    if (isES3(0))
-        qgles3Helper()->PauseTransformFeedback();
-    else
-        RESOLVE_FUNC_VOID(0, PauseTransformFeedback)();
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramBinary(GLuint program, GLenum binaryFormat, const void * binary, GLsizei length)
-{
-    if (isES3(0))
-        qgles3Helper()->ProgramBinary(program, binaryFormat, binary, length);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramBinary)(program, binaryFormat, binary, length);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramParameteri(GLuint program, GLenum pname, GLint value)
-{
-    if (isES3(0))
-        qgles3Helper()->ProgramParameteri(program, pname, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramParameteri)(program, pname, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveReadBuffer(GLenum src)
-{
-    if (isES3(0))
-        qgles3Helper()->ReadBuffer(src);
-    else
-        RESOLVE_FUNC_VOID(0, ReadBuffer)(src);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
-{
-    if (isES3(0))
-        qgles3Helper()->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
-    else
-        RESOLVE_FUNC_VOID(ResolveEXT | ResolveANGLE | ResolveNV, RenderbufferStorageMultisample)
-            (target, samples, internalformat, width, height);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveResumeTransformFeedback()
-{
-    if (isES3(0))
-        qgles3Helper()->ResumeTransformFeedback();
-    else
-        RESOLVE_FUNC_VOID(0, ResumeTransformFeedback)();
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
-{
-    if (isES3(0))
-        qgles3Helper()->SamplerParameterf(sampler, pname, param);
-    else
-        RESOLVE_FUNC_VOID(0, SamplerParameterf)(sampler, pname, param);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat * param)
-{
-    if (isES3(0))
-        qgles3Helper()->SamplerParameterfv(sampler, pname, param);
-    else
-        RESOLVE_FUNC_VOID(0, SamplerParameterfv)(sampler, pname, param);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
-{
-    if (isES3(0))
-        qgles3Helper()->SamplerParameteri(sampler, pname, param);
-    else
-        RESOLVE_FUNC_VOID(0, SamplerParameteri)(sampler, pname, param);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveSamplerParameteriv(GLuint sampler, GLenum pname, const GLint * param)
-{
-    if (isES3(0))
-        qgles3Helper()->SamplerParameteriv(sampler, pname, param);
-    else
-        RESOLVE_FUNC_VOID(0, SamplerParameteriv)(sampler, pname, param);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void * pixels)
-{
-    if (isES3(0))
-        qgles3Helper()->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
-    else
-        RESOLVE_FUNC_VOID(0, TexImage3D)(target, level, internalformat, width, height, depth, border, format, type, pixels);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
-{
-    if (isES3(0))
-        qgles3Helper()->TexStorage2D(target, levels, internalformat, width, height);
-    else
-        RESOLVE_FUNC_VOID(0, TexStorage2D)(target, levels, internalformat, width, height);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveTexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
-{
-    if (isES3(0))
-        qgles3Helper()->TexStorage3D(target, levels, internalformat, width, height, depth);
-    else
-        RESOLVE_FUNC_VOID(0, TexStorage3D)(target, levels, internalformat, width, height, depth);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void * pixels)
-{
-    if (isES3(0))
-        qgles3Helper()->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
-    else
-        RESOLVE_FUNC_VOID(0, TexSubImage3D)(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar *const* varyings, GLenum bufferMode)
-{
-    if (isES3(0))
-        qgles3Helper()->TransformFeedbackVaryings(program, count, varyings, bufferMode);
-    else
-        RESOLVE_FUNC_VOID(0, TransformFeedbackVaryings)(program, count, varyings, bufferMode);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform1ui(GLint location, GLuint v0)
-{
-    if (isES3(0))
-        qgles3Helper()->Uniform1ui(location, v0);
-    else
-        RESOLVE_FUNC_VOID(0, Uniform1ui)(location, v0);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform1uiv(GLint location, GLsizei count, const GLuint * value)
-{
-    if (isES3(0))
-        qgles3Helper()->Uniform1uiv(location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, Uniform1uiv)(location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform2ui(GLint location, GLuint v0, GLuint v1)
-{
-    if (isES3(0))
-        qgles3Helper()->Uniform2ui(location, v0, v1);
-    else
-        RESOLVE_FUNC_VOID(0, Uniform2ui)(location, v0, v1);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform2uiv(GLint location, GLsizei count, const GLuint * value)
-{
-    if (isES3(0))
-        qgles3Helper()->Uniform2uiv(location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, Uniform2uiv)(location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
-{
-    if (isES3(0))
-        qgles3Helper()->Uniform3ui(location, v0, v1, v2);
-    else
-        RESOLVE_FUNC_VOID(0, Uniform3ui)(location, v0, v1, v2);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform3uiv(GLint location, GLsizei count, const GLuint * value)
-{
-    if (isES3(0))
-        qgles3Helper()->Uniform3uiv(location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, Uniform3uiv)(location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
-{
-    if (isES3(0))
-        qgles3Helper()->Uniform4ui(location, v0, v1, v2, v3);
-    else
-        RESOLVE_FUNC_VOID(0, Uniform4ui)(location, v0, v1, v2, v3);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniform4uiv(GLint location, GLsizei count, const GLuint * value)
-{
-    if (isES3(0))
-        qgles3Helper()->Uniform4uiv(location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, Uniform4uiv)(location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
-{
-    if (isES3(0))
-        qgles3Helper()->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
-    else
-        RESOLVE_FUNC_VOID(0, UniformBlockBinding)(program, uniformBlockIndex, uniformBlockBinding);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(0))
-        qgles3Helper()->UniformMatrix2x3fv(location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, UniformMatrix2x3fv)(location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(0))
-        qgles3Helper()->UniformMatrix2x4fv(location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, UniformMatrix2x4fv)(location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(0))
-        qgles3Helper()->UniformMatrix3x2fv(location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, UniformMatrix3x2fv)(location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(0))
-        qgles3Helper()->UniformMatrix3x4fv(location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, UniformMatrix3x4fv)(location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(0))
-        qgles3Helper()->UniformMatrix4x2fv(location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, UniformMatrix4x2fv)(location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(0))
-        qgles3Helper()->UniformMatrix4x3fv(location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, UniformMatrix4x3fv)(location, count, transpose, value);
-}
-
-static GLboolean QOPENGLF_APIENTRY qopenglfResolveUnmapBuffer(GLenum target)
-{
-    if (isES3(0))
-        return qgles3Helper()->UnmapBuffer(target);
-    else
-        RESOLVE_FUNC(GLboolean, ResolveOES, UnmapBuffer)(target);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttribDivisor(GLuint index, GLuint divisor)
-{
-    if (isES3(0))
-        qgles3Helper()->VertexAttribDivisor(index, divisor);
-    else
-        RESOLVE_FUNC_VOID(0, VertexAttribDivisor)(index, divisor);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
-{
-    if (isES3(0))
-        qgles3Helper()->VertexAttribI4i(index, x, y, z, w);
-    else
-        RESOLVE_FUNC_VOID(0, VertexAttribI4i)(index, x, y, z, w);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttribI4iv(GLuint index, const GLint * v)
-{
-    if (isES3(0))
-        qgles3Helper()->VertexAttribI4iv(index, v);
-    else
-        RESOLVE_FUNC_VOID(0, VertexAttribI4iv)(index, v);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
-{
-    if (isES3(0))
-        qgles3Helper()->VertexAttribI4ui(index, x, y, z, w);
-    else
-        RESOLVE_FUNC_VOID(0, VertexAttribI4ui)(index, x, y, z, w);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttribI4uiv(GLuint index, const GLuint * v)
-{
-    if (isES3(0))
-        qgles3Helper()->VertexAttribI4uiv(index, v);
-    else
-        RESOLVE_FUNC_VOID(0, VertexAttribI4uiv)(index, v);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer)
-{
-    if (isES3(0))
-        qgles3Helper()->VertexAttribIPointer(index, size, type, stride, pointer);
-    else
-        RESOLVE_FUNC_VOID(0, VertexAttribIPointer)(index, size, type, stride, pointer);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
-{
-    if (isES3(0))
-        qgles3Helper()->WaitSync(sync, flags, timeout);
-    else
-        RESOLVE_FUNC_VOID(0, WaitSync)(sync, flags, timeout);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveActiveShaderProgram(GLuint pipeline, GLuint program)
-{
-    if (isES3(1))
-        qgles3Helper()->ActiveShaderProgram(pipeline, program);
-    else
-        RESOLVE_FUNC_VOID(0, ActiveShaderProgram)(pipeline, program);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBindImageTexture(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format)
-{
-    if (isES3(1))
-        qgles3Helper()->BindImageTexture(unit, texture, level, layered, layer, access, format);
-    else
-        RESOLVE_FUNC_VOID(0, BindImageTexture)(unit, texture, level, layered, layer, access, format);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBindProgramPipeline(GLuint pipeline)
-{
-    if (isES3(1))
-        qgles3Helper()->BindProgramPipeline(pipeline);
-    else
-        RESOLVE_FUNC_VOID(0, BindProgramPipeline)(pipeline);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveBindVertexBuffer(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride)
-{
-    if (isES3(1))
-        qgles3Helper()->BindVertexBuffer(bindingindex, buffer, offset, stride);
-    else
-        RESOLVE_FUNC_VOID(0, BindVertexBuffer)(bindingindex, buffer, offset, stride);
-}
-
-static GLuint QOPENGLF_APIENTRY qopenglfResolveCreateShaderProgramv(GLenum type, GLsizei count, const GLchar *const* strings)
-{
-    if (isES3(1))
-        return qgles3Helper()->CreateShaderProgramv(type, count, strings);
-    else
-        RESOLVE_FUNC(GLuint, 0, CreateShaderProgramv)(type, count, strings);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDeleteProgramPipelines(GLsizei n, const GLuint * pipelines)
-{
-    if (isES3(1))
-        qgles3Helper()->DeleteProgramPipelines(n, pipelines);
-    else
-        RESOLVE_FUNC_VOID(0, DeleteProgramPipelines)(n, pipelines);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z)
-{
-    if (isES3(1))
-        qgles3Helper()->DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
-    else
-        RESOLVE_FUNC_VOID(0, DispatchCompute)(num_groups_x, num_groups_y, num_groups_z);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDispatchComputeIndirect(GLintptr indirect)
-{
-    if (isES3(1))
-        qgles3Helper()->DispatchComputeIndirect(indirect);
-    else
-        RESOLVE_FUNC_VOID(0, DispatchComputeIndirect)(indirect);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDrawArraysIndirect(GLenum mode, const void * indirect)
-{
-    if (isES3(1))
-        qgles3Helper()->DrawArraysIndirect(mode, indirect);
-    else
-        RESOLVE_FUNC_VOID(0, DrawArraysIndirect)(mode, indirect);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveDrawElementsIndirect(GLenum mode, GLenum type, const void * indirect)
-{
-    if (isES3(1))
-        qgles3Helper()->DrawElementsIndirect(mode, type, indirect);
-    else
-        RESOLVE_FUNC_VOID(0, DrawElementsIndirect)(mode, type, indirect);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveFramebufferParameteri(GLenum target, GLenum pname, GLint param)
-{
-    if (isES3(1))
-        qgles3Helper()->FramebufferParameteri(target, pname, param);
-    else
-        RESOLVE_FUNC_VOID(0, FramebufferParameteri)(target, pname, param);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGenProgramPipelines(GLsizei n, GLuint* pipelines)
-{
-    if (isES3(1))
-        qgles3Helper()->GenProgramPipelines(n, pipelines);
-    else
-        RESOLVE_FUNC_VOID(0, GenProgramPipelines)(n, pipelines);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetBooleani_v(GLenum target, GLuint index, GLboolean* data)
-{
-    if (isES3(1))
-        qgles3Helper()->GetBooleani_v(target, index, data);
-    else
-        RESOLVE_FUNC_VOID(0, GetBooleani_v)(target, index, data);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetFramebufferParameteriv(GLenum target, GLenum pname, GLint* params)
-{
-    if (isES3(1))
-        qgles3Helper()->GetFramebufferParameteriv(target, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetFramebufferParameteriv)(target, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetMultisamplefv(GLenum pname, GLuint index, GLfloat* val)
-{
-    if (isES3(1))
-        qgles3Helper()->GetMultisamplefv(pname, index, val);
-    else
-        RESOLVE_FUNC_VOID(0, GetMultisamplefv)(pname, index, val);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetProgramInterfaceiv(GLuint program, GLenum programInterface, GLenum pname, GLint* params)
-{
-    if (isES3(1))
-        qgles3Helper()->GetProgramInterfaceiv(program, programInterface, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetProgramInterfaceiv)(program, programInterface, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetProgramPipelineInfoLog(GLuint pipeline, GLsizei bufSize, GLsizei* length, GLchar* infoLog)
-{
-    if (isES3(1))
-        qgles3Helper()->GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
-    else
-        RESOLVE_FUNC_VOID(0, GetProgramPipelineInfoLog)(pipeline, bufSize, length, infoLog);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint* params)
-{
-    if (isES3(1))
-        qgles3Helper()->GetProgramPipelineiv(pipeline, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetProgramPipelineiv)(pipeline, pname, params);
-}
-
-static GLuint QOPENGLF_APIENTRY qopenglfResolveGetProgramResourceIndex(GLuint program, GLenum programInterface, const GLchar * name)
-{
-    if (isES3(1))
-        return qgles3Helper()->GetProgramResourceIndex(program, programInterface, name);
-    else
-        RESOLVE_FUNC(GLuint, 0, GetProgramResourceIndex)(program, programInterface, name);
-}
-
-static GLint QOPENGLF_APIENTRY qopenglfResolveGetProgramResourceLocation(GLuint program, GLenum programInterface, const GLchar * name)
-{
-    if (isES3(1))
-        return qgles3Helper()->GetProgramResourceLocation(program, programInterface, name);
-    else
-        RESOLVE_FUNC(GLint, 0, GetProgramResourceLocation)(program, programInterface, name);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetProgramResourceName(GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei* length, GLchar* name)
-{
-    if (isES3(1))
-        qgles3Helper()->GetProgramResourceName(program, programInterface, index, bufSize, length, name);
-    else
-        RESOLVE_FUNC_VOID(0, GetProgramResourceName)(program, programInterface, index, bufSize, length, name);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetProgramResourceiv(GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum * props, GLsizei bufSize, GLsizei* length, GLint* params)
-{
-    if (isES3(1))
-        qgles3Helper()->GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetProgramResourceiv)(program, programInterface, index, propCount, props, bufSize, length, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat* params)
-{
-    if (isES3(1))
-        qgles3Helper()->GetTexLevelParameterfv(target, level, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetTexLevelParameterfv)(target, level, pname, params);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint* params)
-{
-    if (isES3(1))
-        qgles3Helper()->GetTexLevelParameteriv(target, level, pname, params);
-    else
-        RESOLVE_FUNC_VOID(0, GetTexLevelParameteriv)(target, level, pname, params);
-}
-
-static GLboolean QOPENGLF_APIENTRY qopenglfResolveIsProgramPipeline(GLuint pipeline)
-{
-    if (isES3(1))
-        return qgles3Helper()->IsProgramPipeline(pipeline);
-    else
-        RESOLVE_FUNC(GLboolean, 0, IsProgramPipeline)(pipeline);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveMemoryBarrier(GLbitfield barriers)
-{
-    if (isES3(1))
-        qgles3Helper()->MemoryBarrierFunc(barriers);
-    else
-        RESOLVE_FUNC_VOID(0, MemoryBarrierFunc)(barriers);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveMemoryBarrierByRegion(GLbitfield barriers)
-{
-    if (isES3(1))
-        qgles3Helper()->MemoryBarrierByRegion(barriers);
-    else
-        RESOLVE_FUNC_VOID(0, MemoryBarrierByRegion)(barriers);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform1f(GLuint program, GLint location, GLfloat v0)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform1f(program, location, v0);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform1f)(program, location, v0);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform1fv(GLuint program, GLint location, GLsizei count, const GLfloat * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform1fv(program, location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform1fv)(program, location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform1i(GLuint program, GLint location, GLint v0)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform1i(program, location, v0);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform1i)(program, location, v0);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform1iv(GLuint program, GLint location, GLsizei count, const GLint * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform1iv(program, location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform1iv)(program, location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform1ui(GLuint program, GLint location, GLuint v0)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform1ui(program, location, v0);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform1ui)(program, location, v0);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform1uiv(GLuint program, GLint location, GLsizei count, const GLuint * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform1uiv(program, location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform1uiv)(program, location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform2f(program, location, v0, v1);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform2f)(program, location, v0, v1);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform2fv(GLuint program, GLint location, GLsizei count, const GLfloat * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform2fv(program, location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform2fv)(program, location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform2i(program, location, v0, v1);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform2i)(program, location, v0, v1);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform2iv(GLuint program, GLint location, GLsizei count, const GLint * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform2iv(program, location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform2iv)(program, location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform2ui(program, location, v0, v1);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform2ui)(program, location, v0, v1);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform2uiv(GLuint program, GLint location, GLsizei count, const GLuint * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform2uiv(program, location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform2uiv)(program, location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform3f(program, location, v0, v1, v2);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform3f)(program, location, v0, v1, v2);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform3fv(GLuint program, GLint location, GLsizei count, const GLfloat * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform3fv(program, location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform3fv)(program, location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform3i(program, location, v0, v1, v2);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform3i)(program, location, v0, v1, v2);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform3iv(GLuint program, GLint location, GLsizei count, const GLint * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform3iv(program, location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform3iv)(program, location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform3ui(program, location, v0, v1, v2);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform3ui)(program, location, v0, v1, v2);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform3uiv(GLuint program, GLint location, GLsizei count, const GLuint * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform3uiv(program, location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform3uiv)(program, location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform4f(program, location, v0, v1, v2, v3);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform4f)(program, location, v0, v1, v2, v3);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform4fv(GLuint program, GLint location, GLsizei count, const GLfloat * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform4fv(program, location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform4fv)(program, location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform4i(program, location, v0, v1, v2, v3);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform4i)(program, location, v0, v1, v2, v3);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform4iv(GLuint program, GLint location, GLsizei count, const GLint * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform4iv(program, location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform4iv)(program, location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform4ui(program, location, v0, v1, v2, v3);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform4ui)(program, location, v0, v1, v2, v3);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniform4uiv(GLuint program, GLint location, GLsizei count, const GLuint * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniform4uiv(program, location, count, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniform4uiv)(program, location, count, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniformMatrix2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniformMatrix2fv(program, location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniformMatrix2fv)(program, location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniformMatrix2x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniformMatrix2x3fv)(program, location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniformMatrix2x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniformMatrix2x4fv)(program, location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniformMatrix3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniformMatrix3fv(program, location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniformMatrix3fv)(program, location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniformMatrix3x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniformMatrix3x2fv)(program, location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniformMatrix3x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniformMatrix3x4fv)(program, location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniformMatrix4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniformMatrix4fv(program, location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniformMatrix4fv)(program, location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniformMatrix4x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniformMatrix4x2fv)(program, location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveProgramUniformMatrix4x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value)
-{
-    if (isES3(1))
-        qgles3Helper()->ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
-    else
-        RESOLVE_FUNC_VOID(0, ProgramUniformMatrix4x3fv)(program, location, count, transpose, value);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveSampleMaski(GLuint maskNumber, GLbitfield mask)
-{
-    if (isES3(1))
-        qgles3Helper()->SampleMaski(maskNumber, mask);
-    else
-        RESOLVE_FUNC_VOID(0, SampleMaski)(maskNumber, mask);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveTexStorage2DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
-{
-    if (isES3(1))
-        qgles3Helper()->TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
-    else
-        RESOLVE_FUNC_VOID(0, TexStorage2DMultisample)(target, samples, internalformat, width, height, fixedsamplelocations);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveUseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
-{
-    if (isES3(1))
-        qgles3Helper()->UseProgramStages(pipeline, stages, program);
-    else
-        RESOLVE_FUNC_VOID(0, UseProgramStages)(pipeline, stages, program);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveValidateProgramPipeline(GLuint pipeline)
-{
-    if (isES3(1))
-        qgles3Helper()->ValidateProgramPipeline(pipeline);
-    else
-        RESOLVE_FUNC_VOID(0, ValidateProgramPipeline)(pipeline);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttribBinding(GLuint attribindex, GLuint bindingindex)
-{
-    if (isES3(1))
-        qgles3Helper()->VertexAttribBinding(attribindex, bindingindex);
-    else
-        RESOLVE_FUNC_VOID(0, VertexAttribBinding)(attribindex, bindingindex);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttribFormat(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset)
-{
-    if (isES3(1))
-        qgles3Helper()->VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
-    else
-        RESOLVE_FUNC_VOID(0, VertexAttribFormat)(attribindex, size, type, normalized, relativeoffset);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexAttribIFormat(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
-{
-    if (isES3(1))
-        qgles3Helper()->VertexAttribIFormat(attribindex, size, type, relativeoffset);
-    else
-        RESOLVE_FUNC_VOID(0, VertexAttribIFormat)(attribindex, size, type, relativeoffset);
-}
-
-static void QOPENGLF_APIENTRY qopenglfResolveVertexBindingDivisor(GLuint bindingindex, GLuint divisor)
-{
-    if (isES3(1))
-        qgles3Helper()->VertexBindingDivisor(bindingindex, divisor);
-    else
-        RESOLVE_FUNC_VOID(0, VertexBindingDivisor)(bindingindex, divisor);
-}
 
 /*!
     Constructs a default function resolver. The resolver cannot be used until
@@ -7425,194 +4504,21 @@ QOpenGLExtraFunctions::QOpenGLExtraFunctions(QOpenGLContext *context)
 QOpenGLExtraFunctionsPrivate::QOpenGLExtraFunctionsPrivate(QOpenGLContext *ctx)
     : QOpenGLFunctionsPrivate(ctx)
 {
-    ReadBuffer = qopenglfResolveReadBuffer;
-    DrawRangeElements = qopenglfResolveDrawRangeElements;
-    TexImage3D = qopenglfResolveTexImage3D;
-    TexSubImage3D = qopenglfResolveTexSubImage3D;
-    CopyTexSubImage3D = qopenglfResolveCopyTexSubImage3D;
-    CompressedTexImage3D = qopenglfResolveCompressedTexImage3D;
-    CompressedTexSubImage3D = qopenglfResolveCompressedTexSubImage3D;
-    GenQueries = qopenglfResolveGenQueries;
-    DeleteQueries = qopenglfResolveDeleteQueries;
-    IsQuery = qopenglfResolveIsQuery;
-    BeginQuery = qopenglfResolveBeginQuery;
-    EndQuery = qopenglfResolveEndQuery;
-    GetQueryiv = qopenglfResolveGetQueryiv;
-    GetQueryObjectuiv = qopenglfResolveGetQueryObjectuiv;
-    UnmapBuffer = qopenglfResolveUnmapBuffer;
-    GetBufferPointerv = qopenglfResolveGetBufferPointerv;
-    DrawBuffers = qopenglfResolveDrawBuffers;
-    UniformMatrix2x3fv = qopenglfResolveUniformMatrix2x3fv;
-    UniformMatrix3x2fv = qopenglfResolveUniformMatrix3x2fv;
-    UniformMatrix2x4fv = qopenglfResolveUniformMatrix2x4fv;
-    UniformMatrix4x2fv = qopenglfResolveUniformMatrix4x2fv;
-    UniformMatrix3x4fv = qopenglfResolveUniformMatrix3x4fv;
-    UniformMatrix4x3fv = qopenglfResolveUniformMatrix4x3fv;
-    BlitFramebuffer = qopenglfResolveBlitFramebuffer;
-    RenderbufferStorageMultisample = qopenglfResolveRenderbufferStorageMultisample;
-    FramebufferTextureLayer = qopenglfResolveFramebufferTextureLayer;
-    MapBufferRange = qopenglfResolveMapBufferRange;
-    FlushMappedBufferRange = qopenglfResolveFlushMappedBufferRange;
-    BindVertexArray = qopenglfResolveBindVertexArray;
-    DeleteVertexArrays = qopenglfResolveDeleteVertexArrays;
-    GenVertexArrays = qopenglfResolveGenVertexArrays;
-    IsVertexArray = qopenglfResolveIsVertexArray;
-    GetIntegeri_v = qopenglfResolveGetIntegeri_v;
-    BeginTransformFeedback = qopenglfResolveBeginTransformFeedback;
-    EndTransformFeedback = qopenglfResolveEndTransformFeedback;
-    BindBufferRange = qopenglfResolveBindBufferRange;
-    BindBufferBase = qopenglfResolveBindBufferBase;
-    TransformFeedbackVaryings = qopenglfResolveTransformFeedbackVaryings;
-    GetTransformFeedbackVarying = qopenglfResolveGetTransformFeedbackVarying;
-    VertexAttribIPointer = qopenglfResolveVertexAttribIPointer;
-    GetVertexAttribIiv = qopenglfResolveGetVertexAttribIiv;
-    GetVertexAttribIuiv = qopenglfResolveGetVertexAttribIuiv;
-    VertexAttribI4i = qopenglfResolveVertexAttribI4i;
-    VertexAttribI4ui = qopenglfResolveVertexAttribI4ui;
-    VertexAttribI4iv = qopenglfResolveVertexAttribI4iv;
-    VertexAttribI4uiv = qopenglfResolveVertexAttribI4uiv;
-    GetUniformuiv = qopenglfResolveGetUniformuiv;
-    GetFragDataLocation = qopenglfResolveGetFragDataLocation;
-    Uniform1ui = qopenglfResolveUniform1ui;
-    Uniform2ui = qopenglfResolveUniform2ui;
-    Uniform3ui = qopenglfResolveUniform3ui;
-    Uniform4ui = qopenglfResolveUniform4ui;
-    Uniform1uiv = qopenglfResolveUniform1uiv;
-    Uniform2uiv = qopenglfResolveUniform2uiv;
-    Uniform3uiv = qopenglfResolveUniform3uiv;
-    Uniform4uiv = qopenglfResolveUniform4uiv;
-    ClearBufferiv = qopenglfResolveClearBufferiv;
-    ClearBufferuiv = qopenglfResolveClearBufferuiv;
-    ClearBufferfv = qopenglfResolveClearBufferfv;
-    ClearBufferfi = qopenglfResolveClearBufferfi;
-    GetStringi = qopenglfResolveGetStringi;
-    CopyBufferSubData = qopenglfResolveCopyBufferSubData;
-    GetUniformIndices = qopenglfResolveGetUniformIndices;
-    GetActiveUniformsiv = qopenglfResolveGetActiveUniformsiv;
-    GetUniformBlockIndex = qopenglfResolveGetUniformBlockIndex;
-    GetActiveUniformBlockiv = qopenglfResolveGetActiveUniformBlockiv;
-    GetActiveUniformBlockName = qopenglfResolveGetActiveUniformBlockName;
-    UniformBlockBinding = qopenglfResolveUniformBlockBinding;
-    DrawArraysInstanced = qopenglfResolveDrawArraysInstanced;
-    DrawElementsInstanced = qopenglfResolveDrawElementsInstanced;
-    FenceSync = qopenglfResolveFenceSync;
-    IsSync = qopenglfResolveIsSync;
-    DeleteSync = qopenglfResolveDeleteSync;
-    ClientWaitSync = qopenglfResolveClientWaitSync;
-    WaitSync = qopenglfResolveWaitSync;
-    GetInteger64v = qopenglfResolveGetInteger64v;
-    GetSynciv = qopenglfResolveGetSynciv;
-    GetInteger64i_v = qopenglfResolveGetInteger64i_v;
-    GetBufferParameteri64v = qopenglfResolveGetBufferParameteri64v;
-    GenSamplers = qopenglfResolveGenSamplers;
-    DeleteSamplers = qopenglfResolveDeleteSamplers;
-    IsSampler = qopenglfResolveIsSampler;
-    BindSampler = qopenglfResolveBindSampler;
-    SamplerParameteri = qopenglfResolveSamplerParameteri;
-    SamplerParameteriv = qopenglfResolveSamplerParameteriv;
-    SamplerParameterf = qopenglfResolveSamplerParameterf;
-    SamplerParameterfv = qopenglfResolveSamplerParameterfv;
-    GetSamplerParameteriv = qopenglfResolveGetSamplerParameteriv;
-    GetSamplerParameterfv = qopenglfResolveGetSamplerParameterfv;
-    VertexAttribDivisor = qopenglfResolveVertexAttribDivisor;
-    BindTransformFeedback = qopenglfResolveBindTransformFeedback;
-    DeleteTransformFeedbacks = qopenglfResolveDeleteTransformFeedbacks;
-    GenTransformFeedbacks = qopenglfResolveGenTransformFeedbacks;
-    IsTransformFeedback = qopenglfResolveIsTransformFeedback;
-    PauseTransformFeedback = qopenglfResolvePauseTransformFeedback;
-    ResumeTransformFeedback = qopenglfResolveResumeTransformFeedback;
-    GetProgramBinary = qopenglfResolveGetProgramBinary;
-    ProgramBinary = qopenglfResolveProgramBinary;
-    ProgramParameteri = qopenglfResolveProgramParameteri;
-    InvalidateFramebuffer = qopenglfResolveInvalidateFramebuffer;
-    InvalidateSubFramebuffer = qopenglfResolveInvalidateSubFramebuffer;
-    TexStorage2D = qopenglfResolveTexStorage2D;
-    TexStorage3D = qopenglfResolveTexStorage3D;
-    GetInternalformativ = qopenglfResolveGetInternalformativ;
-
-    DispatchCompute = qopenglfResolveDispatchCompute;
-    DispatchComputeIndirect = qopenglfResolveDispatchComputeIndirect;
-    DrawArraysIndirect = qopenglfResolveDrawArraysIndirect;
-    DrawElementsIndirect = qopenglfResolveDrawElementsIndirect;
-    FramebufferParameteri = qopenglfResolveFramebufferParameteri;
-    GetFramebufferParameteriv = qopenglfResolveGetFramebufferParameteriv;
-    GetProgramInterfaceiv = qopenglfResolveGetProgramInterfaceiv;
-    GetProgramResourceIndex = qopenglfResolveGetProgramResourceIndex;
-    GetProgramResourceName = qopenglfResolveGetProgramResourceName;
-    GetProgramResourceiv = qopenglfResolveGetProgramResourceiv;
-    GetProgramResourceLocation = qopenglfResolveGetProgramResourceLocation;
-    UseProgramStages = qopenglfResolveUseProgramStages;
-    ActiveShaderProgram = qopenglfResolveActiveShaderProgram;
-    CreateShaderProgramv = qopenglfResolveCreateShaderProgramv;
-    BindProgramPipeline = qopenglfResolveBindProgramPipeline;
-    DeleteProgramPipelines = qopenglfResolveDeleteProgramPipelines;
-    GenProgramPipelines = qopenglfResolveGenProgramPipelines;
-    IsProgramPipeline = qopenglfResolveIsProgramPipeline;
-    GetProgramPipelineiv = qopenglfResolveGetProgramPipelineiv;
-    ProgramUniform1i = qopenglfResolveProgramUniform1i;
-    ProgramUniform2i = qopenglfResolveProgramUniform2i;
-    ProgramUniform3i = qopenglfResolveProgramUniform3i;
-    ProgramUniform4i = qopenglfResolveProgramUniform4i;
-    ProgramUniform1ui = qopenglfResolveProgramUniform1ui;
-    ProgramUniform2ui = qopenglfResolveProgramUniform2ui;
-    ProgramUniform3ui = qopenglfResolveProgramUniform3ui;
-    ProgramUniform4ui = qopenglfResolveProgramUniform4ui;
-    ProgramUniform1f = qopenglfResolveProgramUniform1f;
-    ProgramUniform2f = qopenglfResolveProgramUniform2f;
-    ProgramUniform3f = qopenglfResolveProgramUniform3f;
-    ProgramUniform4f = qopenglfResolveProgramUniform4f;
-    ProgramUniform1iv = qopenglfResolveProgramUniform1iv;
-    ProgramUniform2iv = qopenglfResolveProgramUniform2iv;
-    ProgramUniform3iv = qopenglfResolveProgramUniform3iv;
-    ProgramUniform4iv = qopenglfResolveProgramUniform4iv;
-    ProgramUniform1uiv = qopenglfResolveProgramUniform1uiv;
-    ProgramUniform2uiv = qopenglfResolveProgramUniform2uiv;
-    ProgramUniform3uiv = qopenglfResolveProgramUniform3uiv;
-    ProgramUniform4uiv = qopenglfResolveProgramUniform4uiv;
-    ProgramUniform1fv = qopenglfResolveProgramUniform1fv;
-    ProgramUniform2fv = qopenglfResolveProgramUniform2fv;
-    ProgramUniform3fv = qopenglfResolveProgramUniform3fv;
-    ProgramUniform4fv = qopenglfResolveProgramUniform4fv;
-    ProgramUniformMatrix2fv = qopenglfResolveProgramUniformMatrix2fv;
-    ProgramUniformMatrix3fv = qopenglfResolveProgramUniformMatrix3fv;
-    ProgramUniformMatrix4fv = qopenglfResolveProgramUniformMatrix4fv;
-    ProgramUniformMatrix2x3fv = qopenglfResolveProgramUniformMatrix2x3fv;
-    ProgramUniformMatrix3x2fv = qopenglfResolveProgramUniformMatrix3x2fv;
-    ProgramUniformMatrix2x4fv = qopenglfResolveProgramUniformMatrix2x4fv;
-    ProgramUniformMatrix4x2fv = qopenglfResolveProgramUniformMatrix4x2fv;
-    ProgramUniformMatrix3x4fv = qopenglfResolveProgramUniformMatrix3x4fv;
-    ProgramUniformMatrix4x3fv = qopenglfResolveProgramUniformMatrix4x3fv;
-    ValidateProgramPipeline = qopenglfResolveValidateProgramPipeline;
-    GetProgramPipelineInfoLog = qopenglfResolveGetProgramPipelineInfoLog;
-    BindImageTexture = qopenglfResolveBindImageTexture;
-    GetBooleani_v = qopenglfResolveGetBooleani_v;
-    MemoryBarrierFunc = qopenglfResolveMemoryBarrier;
-    MemoryBarrierByRegion = qopenglfResolveMemoryBarrierByRegion;
-    TexStorage2DMultisample = qopenglfResolveTexStorage2DMultisample;
-    GetMultisamplefv = qopenglfResolveGetMultisamplefv;
-    SampleMaski = qopenglfResolveSampleMaski;
-    GetTexLevelParameteriv = qopenglfResolveGetTexLevelParameteriv;
-    GetTexLevelParameterfv = qopenglfResolveGetTexLevelParameterfv;
-    BindVertexBuffer = qopenglfResolveBindVertexBuffer;
-    VertexAttribFormat = qopenglfResolveVertexAttribFormat;
-    VertexAttribIFormat = qopenglfResolveVertexAttribIFormat;
-    VertexAttribBinding = qopenglfResolveVertexAttribBinding;
-    VertexBindingDivisor = qopenglfResolveVertexBindingDivisor;
+    init(ctx);
 }
 
+QT_OPENGL_IMPLEMENT(QOpenGLExtraFunctionsPrivate, QT_OPENGL_EXTRA_FUNCTIONS)
+
 QOpenGLExtensionsPrivate::QOpenGLExtensionsPrivate(QOpenGLContext *ctx)
     : QOpenGLExtraFunctionsPrivate(ctx),
       flushVendorChecked(false)
 {
-    MapBuffer = qopenglfResolveMapBuffer;
-    GetBufferSubData = qopenglfResolveGetBufferSubData;
-    DiscardFramebuffer = qopenglfResolveDiscardFramebuffer;
-}
+    QOpenGLContext *context = QOpenGLContext::currentContext();
 
-QOpenGLES3Helper *QOpenGLExtensions::gles3Helper()
-{
-    return qgles3Helper();
-}
+    MapBuffer = RESOLVE(MapBuffer);
+    GetBufferSubData = RESOLVE(GetBufferSubData);
+    DiscardFramebuffer = RESOLVE(DiscardFramebuffer);
+ }
 
 void QOpenGLExtensions::flushShared()
 {
diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
index e295f68e44..f6cd0e553e 100644
--- a/src/gui/opengl/qopenglfunctions.h
+++ b/src/gui/opengl/qopenglfunctions.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -50,6 +56,10 @@
 
 //#define Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 
+#ifdef QT_OPENGL_ES
+typedef double GLdouble;
+#endif
+
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 #define Q_OPENGL_FUNCTIONS_DEBUG \
@@ -408,159 +418,173 @@ protected:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QOpenGLFunctions::OpenGLFeatures)
 
+#define QT_OPENGL_DECLARE_FUNCTIONS(ret, name, args) \
+    ret (QOPENGLF_APIENTRYP name)args;
+#define QT_OPENGL_COUNT_FUNCTIONS(ret, name, args) +1
+
+#define QT_OPENGL_DECLARE(FUNCTIONS) \
+public: \
+    struct Functions { \
+        FUNCTIONS(QT_OPENGL_DECLARE_FUNCTIONS) \
+    }; \
+    union { \
+        QFunctionPointer functions[FUNCTIONS(QT_OPENGL_COUNT_FUNCTIONS)]; \
+        Functions f; \
+    }; \
+private: \
+    void init(QOpenGLContext *context);
+
 struct QOpenGLFunctionsPrivate
 {
     QOpenGLFunctionsPrivate(QOpenGLContext *ctx);
 
-    void (QOPENGLF_APIENTRYP BindTexture)(GLenum target, GLuint texture);
-    void (QOPENGLF_APIENTRYP BlendFunc)(GLenum sfactor, GLenum dfactor);
-    void (QOPENGLF_APIENTRYP Clear)(GLbitfield mask);
-    void (QOPENGLF_APIENTRYP ClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-    void (QOPENGLF_APIENTRYP ClearDepthf)(GLclampf depth);
-    void (QOPENGLF_APIENTRYP ClearStencil)(GLint s);
-    void (QOPENGLF_APIENTRYP ColorMask)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-    void (QOPENGLF_APIENTRYP CopyTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-    void (QOPENGLF_APIENTRYP CopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP CullFace)(GLenum mode);
-    void (QOPENGLF_APIENTRYP DeleteTextures)(GLsizei n, const GLuint* textures);
-    void (QOPENGLF_APIENTRYP DepthFunc)(GLenum func);
-    void (QOPENGLF_APIENTRYP DepthMask)(GLboolean flag);
-    void (QOPENGLF_APIENTRYP DepthRangef)(GLclampf nearVal, GLclampf farVal);
-    void (QOPENGLF_APIENTRYP Disable)(GLenum cap);
-    void (QOPENGLF_APIENTRYP DrawArrays)(GLenum mode, GLint first, GLsizei count);
-    void (QOPENGLF_APIENTRYP DrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices);
-    void (QOPENGLF_APIENTRYP Enable)(GLenum cap);
-    void (QOPENGLF_APIENTRYP Finish)();
-    void (QOPENGLF_APIENTRYP Flush)();
-    void (QOPENGLF_APIENTRYP FrontFace)(GLenum mode);
-    void (QOPENGLF_APIENTRYP GenTextures)(GLsizei n, GLuint* textures);
-    void (QOPENGLF_APIENTRYP GetBooleanv)(GLenum pname, GLboolean* params);
-    GLenum (QOPENGLF_APIENTRYP GetError)();
-    void (QOPENGLF_APIENTRYP GetFloatv)(GLenum pname, GLfloat* params);
-    void (QOPENGLF_APIENTRYP GetIntegerv)(GLenum pname, GLint* params);
-    const GLubyte * (QOPENGLF_APIENTRYP GetString)(GLenum name);
-    void (QOPENGLF_APIENTRYP GetTexParameterfv)(GLenum target, GLenum pname, GLfloat* params);
-    void (QOPENGLF_APIENTRYP GetTexParameteriv)(GLenum target, GLenum pname, GLint* params);
-    void (QOPENGLF_APIENTRYP Hint)(GLenum target, GLenum mode);
-    GLboolean (QOPENGLF_APIENTRYP IsEnabled)(GLenum cap);
-    GLboolean (QOPENGLF_APIENTRYP IsTexture)(GLuint texture);
-    void (QOPENGLF_APIENTRYP LineWidth)(GLfloat width);
-    void (QOPENGLF_APIENTRYP PixelStorei)(GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP PolygonOffset)(GLfloat factor, GLfloat units);
-    void (QOPENGLF_APIENTRYP ReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels);
-    void (QOPENGLF_APIENTRYP Scissor)(GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP StencilFunc)(GLenum func, GLint ref, GLuint mask);
-    void (QOPENGLF_APIENTRYP StencilMask)(GLuint mask);
-    void (QOPENGLF_APIENTRYP StencilOp)(GLenum fail, GLenum zfail, GLenum zpass);
-    void (QOPENGLF_APIENTRYP TexImage2D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
-    void (QOPENGLF_APIENTRYP TexParameterf)(GLenum target, GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP TexParameterfv)(GLenum target, GLenum pname, const GLfloat* params);
-    void (QOPENGLF_APIENTRYP TexParameteri)(GLenum target, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP TexParameteriv)(GLenum target, GLenum pname, const GLint* params);
-    void (QOPENGLF_APIENTRYP TexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels);
-    void (QOPENGLF_APIENTRYP Viewport)(GLint x, GLint y, GLsizei width, GLsizei height);
-
-    void (QOPENGLF_APIENTRYP ActiveTexture)(GLenum texture);
-    void (QOPENGLF_APIENTRYP AttachShader)(GLuint program, GLuint shader);
-    void (QOPENGLF_APIENTRYP BindAttribLocation)(GLuint program, GLuint index, const char* name);
-    void (QOPENGLF_APIENTRYP BindBuffer)(GLenum target, GLuint buffer);
-    void (QOPENGLF_APIENTRYP BindFramebuffer)(GLenum target, GLuint framebuffer);
-    void (QOPENGLF_APIENTRYP BindRenderbuffer)(GLenum target, GLuint renderbuffer);
-    void (QOPENGLF_APIENTRYP BlendColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-    void (QOPENGLF_APIENTRYP BlendEquation)(GLenum mode);
-    void (QOPENGLF_APIENTRYP BlendEquationSeparate)(GLenum modeRGB, GLenum modeAlpha);
-    void (QOPENGLF_APIENTRYP BlendFuncSeparate)(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-    void (QOPENGLF_APIENTRYP BufferData)(GLenum target, qopengl_GLsizeiptr size, const void* data, GLenum usage);
-    void (QOPENGLF_APIENTRYP BufferSubData)(GLenum target, qopengl_GLintptr offset, qopengl_GLsizeiptr size, const void* data);
-    GLenum (QOPENGLF_APIENTRYP CheckFramebufferStatus)(GLenum target);
-    void (QOPENGLF_APIENTRYP CompileShader)(GLuint shader);
-    void (QOPENGLF_APIENTRYP CompressedTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
-    void (QOPENGLF_APIENTRYP CompressedTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
-    GLuint (QOPENGLF_APIENTRYP CreateProgram)();
-    GLuint (QOPENGLF_APIENTRYP CreateShader)(GLenum type);
-    void (QOPENGLF_APIENTRYP DeleteBuffers)(GLsizei n, const GLuint* buffers);
-    void (QOPENGLF_APIENTRYP DeleteFramebuffers)(GLsizei n, const GLuint* framebuffers);
-    void (QOPENGLF_APIENTRYP DeleteProgram)(GLuint program);
-    void (QOPENGLF_APIENTRYP DeleteRenderbuffers)(GLsizei n, const GLuint* renderbuffers);
-    void (QOPENGLF_APIENTRYP DeleteShader)(GLuint shader);
-    void (QOPENGLF_APIENTRYP DetachShader)(GLuint program, GLuint shader);
-    void (QOPENGLF_APIENTRYP DisableVertexAttribArray)(GLuint index);
-    void (QOPENGLF_APIENTRYP EnableVertexAttribArray)(GLuint index);
-    void (QOPENGLF_APIENTRYP FramebufferRenderbuffer)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-    void (QOPENGLF_APIENTRYP FramebufferTexture2D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-    void (QOPENGLF_APIENTRYP GenBuffers)(GLsizei n, GLuint* buffers);
-    void (QOPENGLF_APIENTRYP GenerateMipmap)(GLenum target);
-    void (QOPENGLF_APIENTRYP GenFramebuffers)(GLsizei n, GLuint* framebuffers);
-    void (QOPENGLF_APIENTRYP GenRenderbuffers)(GLsizei n, GLuint* renderbuffers);
-    void (QOPENGLF_APIENTRYP GetActiveAttrib)(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name);
-    void (QOPENGLF_APIENTRYP GetActiveUniform)(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name);
-    void (QOPENGLF_APIENTRYP GetAttachedShaders)(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
-    GLint (QOPENGLF_APIENTRYP GetAttribLocation)(GLuint program, const char* name);
-    void (QOPENGLF_APIENTRYP GetBufferParameteriv)(GLenum target, GLenum pname, GLint* params);
-    void (QOPENGLF_APIENTRYP GetFramebufferAttachmentParameteriv)(GLenum target, GLenum attachment, GLenum pname, GLint* params);
-    void (QOPENGLF_APIENTRYP GetProgramiv)(GLuint program, GLenum pname, GLint* params);
-    void (QOPENGLF_APIENTRYP GetProgramInfoLog)(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog);
-    void (QOPENGLF_APIENTRYP GetRenderbufferParameteriv)(GLenum target, GLenum pname, GLint* params);
-    void (QOPENGLF_APIENTRYP GetShaderiv)(GLuint shader, GLenum pname, GLint* params);
-    void (QOPENGLF_APIENTRYP GetShaderInfoLog)(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog);
-    void (QOPENGLF_APIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
-    void (QOPENGLF_APIENTRYP GetShaderSource)(GLuint shader, GLsizei bufsize, GLsizei* length, char* source);
-    void (QOPENGLF_APIENTRYP GetUniformfv)(GLuint program, GLint location, GLfloat* params);
-    void (QOPENGLF_APIENTRYP GetUniformiv)(GLuint program, GLint location, GLint* params);
-    GLint (QOPENGLF_APIENTRYP GetUniformLocation)(GLuint program, const char* name);
-    void (QOPENGLF_APIENTRYP GetVertexAttribfv)(GLuint index, GLenum pname, GLfloat* params);
-    void (QOPENGLF_APIENTRYP GetVertexAttribiv)(GLuint index, GLenum pname, GLint* params);
-    void (QOPENGLF_APIENTRYP GetVertexAttribPointerv)(GLuint index, GLenum pname, void** pointer);
-    GLboolean (QOPENGLF_APIENTRYP IsBuffer)(GLuint buffer);
-    GLboolean (QOPENGLF_APIENTRYP IsFramebuffer)(GLuint framebuffer);
-    GLboolean (QOPENGLF_APIENTRYP IsProgram)(GLuint program);
-    GLboolean (QOPENGLF_APIENTRYP IsRenderbuffer)(GLuint renderbuffer);
-    GLboolean (QOPENGLF_APIENTRYP IsShader)(GLuint shader);
-    void (QOPENGLF_APIENTRYP LinkProgram)(GLuint program);
-    void (QOPENGLF_APIENTRYP ReleaseShaderCompiler)();
-    void (QOPENGLF_APIENTRYP RenderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP SampleCoverage)(GLclampf value, GLboolean invert);
-    void (QOPENGLF_APIENTRYP ShaderBinary)(GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length);
-    void (QOPENGLF_APIENTRYP ShaderSource)(GLuint shader, GLsizei count, const char** string, const GLint* length);
-    void (QOPENGLF_APIENTRYP StencilFuncSeparate)(GLenum face, GLenum func, GLint ref, GLuint mask);
-    void (QOPENGLF_APIENTRYP StencilMaskSeparate)(GLenum face, GLuint mask);
-    void (QOPENGLF_APIENTRYP StencilOpSeparate)(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
-    void (QOPENGLF_APIENTRYP Uniform1f)(GLint location, GLfloat x);
-    void (QOPENGLF_APIENTRYP Uniform1fv)(GLint location, GLsizei count, const GLfloat* v);
-    void (QOPENGLF_APIENTRYP Uniform1i)(GLint location, GLint x);
-    void (QOPENGLF_APIENTRYP Uniform1iv)(GLint location, GLsizei count, const GLint* v);
-    void (QOPENGLF_APIENTRYP Uniform2f)(GLint location, GLfloat x, GLfloat y);
-    void (QOPENGLF_APIENTRYP Uniform2fv)(GLint location, GLsizei count, const GLfloat* v);
-    void (QOPENGLF_APIENTRYP Uniform2i)(GLint location, GLint x, GLint y);
-    void (QOPENGLF_APIENTRYP Uniform2iv)(GLint location, GLsizei count, const GLint* v);
-    void (QOPENGLF_APIENTRYP Uniform3f)(GLint location, GLfloat x, GLfloat y, GLfloat z);
-    void (QOPENGLF_APIENTRYP Uniform3fv)(GLint location, GLsizei count, const GLfloat* v);
-    void (QOPENGLF_APIENTRYP Uniform3i)(GLint location, GLint x, GLint y, GLint z);
-    void (QOPENGLF_APIENTRYP Uniform3iv)(GLint location, GLsizei count, const GLint* v);
-    void (QOPENGLF_APIENTRYP Uniform4f)(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void (QOPENGLF_APIENTRYP Uniform4fv)(GLint location, GLsizei count, const GLfloat* v);
-    void (QOPENGLF_APIENTRYP Uniform4i)(GLint location, GLint x, GLint y, GLint z, GLint w);
-    void (QOPENGLF_APIENTRYP Uniform4iv)(GLint location, GLsizei count, const GLint* v);
-    void (QOPENGLF_APIENTRYP UniformMatrix2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-    void (QOPENGLF_APIENTRYP UniformMatrix3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-    void (QOPENGLF_APIENTRYP UniformMatrix4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-    void (QOPENGLF_APIENTRYP UseProgram)(GLuint program);
-    void (QOPENGLF_APIENTRYP ValidateProgram)(GLuint program);
-    void (QOPENGLF_APIENTRYP VertexAttrib1f)(GLuint indx, GLfloat x);
-    void (QOPENGLF_APIENTRYP VertexAttrib1fv)(GLuint indx, const GLfloat* values);
-    void (QOPENGLF_APIENTRYP VertexAttrib2f)(GLuint indx, GLfloat x, GLfloat y);
-    void (QOPENGLF_APIENTRYP VertexAttrib2fv)(GLuint indx, const GLfloat* values);
-    void (QOPENGLF_APIENTRYP VertexAttrib3f)(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
-    void (QOPENGLF_APIENTRYP VertexAttrib3fv)(GLuint indx, const GLfloat* values);
-    void (QOPENGLF_APIENTRYP VertexAttrib4f)(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void (QOPENGLF_APIENTRYP VertexAttrib4fv)(GLuint indx, const GLfloat* values);
-    void (QOPENGLF_APIENTRYP VertexAttribPointer)(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr);
-
-    // Special non-ES OpenGL variants, not to be called directly
-#ifndef QT_OPENGL_ES_2
-    void (QOPENGLF_APIENTRYP ClearDepth)(GLdouble depth);
-    void (QOPENGLF_APIENTRYP DepthRange)(GLdouble zNear, GLdouble zFar);
-#endif
+#define QT_OPENGL_FUNCTIONS(F) \
+    F(void, BindTexture, (GLenum target, GLuint texture)) \
+    F(void, BlendFunc, (GLenum sfactor, GLenum dfactor)) \
+    F(void, Clear, (GLbitfield mask)) \
+    F(void, ClearColor, (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)) \
+    F(void, ClearDepthf, (GLclampf depth)) \
+    F(void, ClearStencil, (GLint s)) \
+    F(void, ColorMask, (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)) \
+    F(void, CopyTexImage2D, (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)) \
+    F(void, CopyTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)) \
+    F(void, CullFace, (GLenum mode)) \
+    F(void, DeleteTextures, (GLsizei n, const GLuint* textures)) \
+    F(void, DepthFunc, (GLenum func)) \
+    F(void, DepthMask, (GLboolean flag)) \
+    F(void, DepthRangef, (GLclampf nearVal, GLclampf farVal)) \
+    F(void, Disable, (GLenum cap)) \
+    F(void, DrawArrays, (GLenum mode, GLint first, GLsizei count)) \
+    F(void, DrawElements, (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices)) \
+    F(void, Enable, (GLenum cap)) \
+    F(void, Finish, ()) \
+    F(void, Flush, ()) \
+    F(void, FrontFace, (GLenum mode)) \
+    F(void, GenTextures, (GLsizei n, GLuint* textures)) \
+    F(void, GetBooleanv, (GLenum pname, GLboolean* params)) \
+    F(GLenum, GetError, ()) \
+    F(void, GetFloatv, (GLenum pname, GLfloat* params)) \
+    F(void, GetIntegerv, (GLenum pname, GLint* params)) \
+    F(const GLubyte *, GetString, (GLenum name)) \
+    F(void, GetTexParameterfv, (GLenum target, GLenum pname, GLfloat* params)) \
+    F(void, GetTexParameteriv, (GLenum target, GLenum pname, GLint* params)) \
+    F(void, Hint, (GLenum target, GLenum mode)) \
+    F(GLboolean, IsEnabled, (GLenum cap)) \
+    F(GLboolean, IsTexture, (GLuint texture)) \
+    F(void, LineWidth, (GLfloat width)) \
+    F(void, PixelStorei, (GLenum pname, GLint param)) \
+    F(void, PolygonOffset, (GLfloat factor, GLfloat units)) \
+    F(void, ReadPixels, (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels)) \
+    F(void, Scissor, (GLint x, GLint y, GLsizei width, GLsizei height)) \
+    F(void, StencilFunc, (GLenum func, GLint ref, GLuint mask)) \
+    F(void, StencilMask, (GLuint mask)) \
+    F(void, StencilOp, (GLenum fail, GLenum zfail, GLenum zpass)) \
+    F(void, TexImage2D, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels)) \
+    F(void, TexParameterf, (GLenum target, GLenum pname, GLfloat param)) \
+    F(void, TexParameterfv, (GLenum target, GLenum pname, const GLfloat* params)) \
+    F(void, TexParameteri, (GLenum target, GLenum pname, GLint param)) \
+    F(void, TexParameteriv, (GLenum target, GLenum pname, const GLint* params)) \
+    F(void, TexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels)) \
+    F(void, Viewport, (GLint x, GLint y, GLsizei width, GLsizei height)) \
+    F(void, ActiveTexture, (GLenum texture)) \
+    F(void, AttachShader, (GLuint program, GLuint shader)) \
+    F(void, BindAttribLocation, (GLuint program, GLuint index, const char* name)) \
+    F(void, BindBuffer, (GLenum target, GLuint buffer)) \
+    F(void, BindFramebuffer, (GLenum target, GLuint framebuffer)) \
+    F(void, BindRenderbuffer, (GLenum target, GLuint renderbuffer)) \
+    F(void, BlendColor, (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)) \
+    F(void, BlendEquation, (GLenum mode)) \
+    F(void, BlendEquationSeparate, (GLenum modeRGB, GLenum modeAlpha)) \
+    F(void, BlendFuncSeparate, (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)) \
+    F(void, BufferData, (GLenum target, qopengl_GLsizeiptr size, const void* data, GLenum usage)) \
+    F(void, BufferSubData, (GLenum target, qopengl_GLintptr offset, qopengl_GLsizeiptr size, const void* data)) \
+    F(GLenum, CheckFramebufferStatus, (GLenum target)) \
+    F(void, CompileShader, (GLuint shader)) \
+    F(void, CompressedTexImage2D, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data)) \
+    F(void, CompressedTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data)) \
+    F(GLuint, CreateProgram, ()) \
+    F(GLuint, CreateShader, (GLenum type)) \
+    F(void, DeleteBuffers, (GLsizei n, const GLuint* buffers)) \
+    F(void, DeleteFramebuffers, (GLsizei n, const GLuint* framebuffers)) \
+    F(void, DeleteProgram, (GLuint program)) \
+    F(void, DeleteRenderbuffers, (GLsizei n, const GLuint* renderbuffers)) \
+    F(void, DeleteShader, (GLuint shader)) \
+    F(void, DetachShader, (GLuint program, GLuint shader)) \
+    F(void, DisableVertexAttribArray, (GLuint index)) \
+    F(void, EnableVertexAttribArray, (GLuint index)) \
+    F(void, FramebufferRenderbuffer, (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)) \
+    F(void, FramebufferTexture2D, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) \
+    F(void, GenBuffers, (GLsizei n, GLuint* buffers)) \
+    F(void, GenerateMipmap, (GLenum target)) \
+    F(void, GenFramebuffers, (GLsizei n, GLuint* framebuffers)) \
+    F(void, GenRenderbuffers, (GLsizei n, GLuint* renderbuffers)) \
+    F(void, GetActiveAttrib, (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)) \
+    F(void, GetActiveUniform, (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)) \
+    F(void, GetAttachedShaders, (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders)) \
+    F(GLint, GetAttribLocation, (GLuint program, const char* name)) \
+    F(void, GetBufferParameteriv, (GLenum target, GLenum pname, GLint* params)) \
+    F(void, GetFramebufferAttachmentParameteriv, (GLenum target, GLenum attachment, GLenum pname, GLint* params)) \
+    F(void, GetProgramiv, (GLuint program, GLenum pname, GLint* params)) \
+    F(void, GetProgramInfoLog, (GLuint program, GLsizei bufsize, GLsizei* length, char* infolog)) \
+    F(void, GetRenderbufferParameteriv, (GLenum target, GLenum pname, GLint* params)) \
+    F(void, GetShaderiv, (GLuint shader, GLenum pname, GLint* params)) \
+    F(void, GetShaderInfoLog, (GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog)) \
+    F(void, GetShaderPrecisionFormat, (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)) \
+    F(void, GetShaderSource, (GLuint shader, GLsizei bufsize, GLsizei* length, char* source)) \
+    F(void, GetUniformfv, (GLuint program, GLint location, GLfloat* params)) \
+    F(void, GetUniformiv, (GLuint program, GLint location, GLint* params)) \
+    F(GLint, GetUniformLocation, (GLuint program, const char* name)) \
+    F(void, GetVertexAttribfv, (GLuint index, GLenum pname, GLfloat* params)) \
+    F(void, GetVertexAttribiv, (GLuint index, GLenum pname, GLint* params)) \
+    F(void, GetVertexAttribPointerv, (GLuint index, GLenum pname, void** pointer)) \
+    F(GLboolean, IsBuffer, (GLuint buffer)) \
+    F(GLboolean, IsFramebuffer, (GLuint framebuffer)) \
+    F(GLboolean, IsProgram, (GLuint program)) \
+    F(GLboolean, IsRenderbuffer, (GLuint renderbuffer)) \
+    F(GLboolean, IsShader, (GLuint shader)) \
+    F(void, LinkProgram, (GLuint program)) \
+    F(void, ReleaseShaderCompiler, ()) \
+    F(void, RenderbufferStorage, (GLenum target, GLenum internalformat, GLsizei width, GLsizei height)) \
+    F(void, SampleCoverage, (GLclampf value, GLboolean invert)) \
+    F(void, ShaderBinary, (GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length)) \
+    F(void, ShaderSource, (GLuint shader, GLsizei count, const char** string, const GLint* length)) \
+    F(void, StencilFuncSeparate, (GLenum face, GLenum func, GLint ref, GLuint mask)) \
+    F(void, StencilMaskSeparate, (GLenum face, GLuint mask)) \
+    F(void, StencilOpSeparate, (GLenum face, GLenum fail, GLenum zfail, GLenum zpass)) \
+    F(void, Uniform1f, (GLint location, GLfloat x)) \
+    F(void, Uniform1fv, (GLint location, GLsizei count, const GLfloat* v)) \
+    F(void, Uniform1i, (GLint location, GLint x)) \
+    F(void, Uniform1iv, (GLint location, GLsizei count, const GLint* v)) \
+    F(void, Uniform2f, (GLint location, GLfloat x, GLfloat y)) \
+    F(void, Uniform2fv, (GLint location, GLsizei count, const GLfloat* v)) \
+    F(void, Uniform2i, (GLint location, GLint x, GLint y)) \
+    F(void, Uniform2iv, (GLint location, GLsizei count, const GLint* v)) \
+    F(void, Uniform3f, (GLint location, GLfloat x, GLfloat y, GLfloat z)) \
+    F(void, Uniform3fv, (GLint location, GLsizei count, const GLfloat* v)) \
+    F(void, Uniform3i, (GLint location, GLint x, GLint y, GLint z)) \
+    F(void, Uniform3iv, (GLint location, GLsizei count, const GLint* v)) \
+    F(void, Uniform4f, (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) \
+    F(void, Uniform4fv, (GLint location, GLsizei count, const GLfloat* v)) \
+    F(void, Uniform4i, (GLint location, GLint x, GLint y, GLint z, GLint w)) \
+    F(void, Uniform4iv, (GLint location, GLsizei count, const GLint* v)) \
+    F(void, UniformMatrix2fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)) \
+    F(void, UniformMatrix3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)) \
+    F(void, UniformMatrix4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)) \
+    F(void, UseProgram, (GLuint program)) \
+    F(void, ValidateProgram, (GLuint program)) \
+    F(void, VertexAttrib1f, (GLuint indx, GLfloat x)) \
+    F(void, VertexAttrib1fv, (GLuint indx, const GLfloat* values)) \
+    F(void, VertexAttrib2f, (GLuint indx, GLfloat x, GLfloat y)) \
+    F(void, VertexAttrib2fv, (GLuint indx, const GLfloat* values)) \
+    F(void, VertexAttrib3f, (GLuint indx, GLfloat x, GLfloat y, GLfloat z)) \
+    F(void, VertexAttrib3fv, (GLuint indx, const GLfloat* values)) \
+    F(void, VertexAttrib4f, (GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) \
+    F(void, VertexAttrib4fv, (GLuint indx, const GLfloat* values)) \
+    F(void, VertexAttribPointer, (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr)) \
+    F(void, ClearDepth, (GLdouble depth)) \
+    F(void, DepthRange, (GLdouble zNear, GLdouble zFar)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_FUNCTIONS)
 };
 
 // GLES2 + OpenGL1 common subset
@@ -571,7 +595,7 @@ inline void QOpenGLFunctions::glBindTexture(GLenum target, GLuint texture)
     ::glBindTexture(target, texture);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->BindTexture(target, texture);
+    d_ptr->f.BindTexture(target, texture);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -582,7 +606,7 @@ inline void QOpenGLFunctions::glBlendFunc(GLenum sfactor, GLenum dfactor)
     ::glBlendFunc(sfactor, dfactor);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->BlendFunc(sfactor, dfactor);
+    d_ptr->f.BlendFunc(sfactor, dfactor);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -593,7 +617,7 @@ inline void QOpenGLFunctions::glClear(GLbitfield mask)
     ::glClear(mask);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Clear(mask);
+    d_ptr->f.Clear(mask);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -604,7 +628,7 @@ inline void QOpenGLFunctions::glClearColor(GLclampf red, GLclampf green, GLclamp
     ::glClearColor(red, green, blue, alpha);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->ClearColor(red, green, blue, alpha);
+    d_ptr->f.ClearColor(red, green, blue, alpha);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -615,7 +639,7 @@ inline void QOpenGLFunctions::glClearStencil(GLint s)
     ::glClearStencil(s);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->ClearStencil(s);
+    d_ptr->f.ClearStencil(s);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -626,7 +650,7 @@ inline void QOpenGLFunctions::glColorMask(GLboolean red, GLboolean green, GLbool
     ::glColorMask(red, green, blue, alpha);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->ColorMask(red, green, blue, alpha);
+    d_ptr->f.ColorMask(red, green, blue, alpha);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -637,7 +661,7 @@ inline void QOpenGLFunctions::glCopyTexImage2D(GLenum target, GLint level, GLenu
     ::glCopyTexImage2D(target, level, internalformat, x, y, width,height, border);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->CopyTexImage2D(target, level, internalformat, x, y, width,height, border);
+    d_ptr->f.CopyTexImage2D(target, level, internalformat, x, y, width,height, border);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -648,7 +672,7 @@ inline void QOpenGLFunctions::glCopyTexSubImage2D(GLenum target, GLint level, GL
     ::glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_ptr->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -659,7 +683,7 @@ inline void QOpenGLFunctions::glCullFace(GLenum mode)
     ::glCullFace(mode);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->CullFace(mode);
+    d_ptr->f.CullFace(mode);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -670,7 +694,7 @@ inline void QOpenGLFunctions::glDeleteTextures(GLsizei n, const GLuint* textures
     ::glDeleteTextures(n, textures);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->DeleteTextures(n, textures);
+    d_ptr->f.DeleteTextures(n, textures);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -681,7 +705,7 @@ inline void QOpenGLFunctions::glDepthFunc(GLenum func)
     ::glDepthFunc(func);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->DepthFunc(func);
+    d_ptr->f.DepthFunc(func);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -692,7 +716,7 @@ inline void QOpenGLFunctions::glDepthMask(GLboolean flag)
     ::glDepthMask(flag);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->DepthMask(flag);
+    d_ptr->f.DepthMask(flag);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -703,7 +727,7 @@ inline void QOpenGLFunctions::glDisable(GLenum cap)
     ::glDisable(cap);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Disable(cap);
+    d_ptr->f.Disable(cap);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -714,7 +738,7 @@ inline void QOpenGLFunctions::glDrawArrays(GLenum mode, GLint first, GLsizei cou
     ::glDrawArrays(mode, first, count);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->DrawArrays(mode, first, count);
+    d_ptr->f.DrawArrays(mode, first, count);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -725,7 +749,7 @@ inline void QOpenGLFunctions::glDrawElements(GLenum mode, GLsizei count, GLenum
     ::glDrawElements(mode, count, type, indices);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->DrawElements(mode, count, type, indices);
+    d_ptr->f.DrawElements(mode, count, type, indices);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -736,7 +760,7 @@ inline void QOpenGLFunctions::glEnable(GLenum cap)
     ::glEnable(cap);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Enable(cap);
+    d_ptr->f.Enable(cap);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -747,7 +771,7 @@ inline void QOpenGLFunctions::glFinish()
     ::glFinish();
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Finish();
+    d_ptr->f.Finish();
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -758,7 +782,7 @@ inline void QOpenGLFunctions::glFlush()
     ::glFlush();
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Flush();
+    d_ptr->f.Flush();
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -769,7 +793,7 @@ inline void QOpenGLFunctions::glFrontFace(GLenum mode)
     ::glFrontFace(mode);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->FrontFace(mode);
+    d_ptr->f.FrontFace(mode);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -780,7 +804,7 @@ inline void QOpenGLFunctions::glGenTextures(GLsizei n, GLuint* textures)
     ::glGenTextures(n, textures);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GenTextures(n, textures);
+    d_ptr->f.GenTextures(n, textures);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -791,7 +815,7 @@ inline void QOpenGLFunctions::glGetBooleanv(GLenum pname, GLboolean* params)
     ::glGetBooleanv(pname, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetBooleanv(pname, params);
+    d_ptr->f.GetBooleanv(pname, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -802,7 +826,7 @@ inline GLenum QOpenGLFunctions::glGetError()
     GLenum result = ::glGetError();
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    GLenum result = d_ptr->GetError();
+    GLenum result = d_ptr->f.GetError();
 #endif
     return result;
 }
@@ -813,7 +837,7 @@ inline void QOpenGLFunctions::glGetFloatv(GLenum pname, GLfloat* params)
     ::glGetFloatv(pname, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetFloatv(pname, params);
+    d_ptr->f.GetFloatv(pname, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -824,7 +848,7 @@ inline void QOpenGLFunctions::glGetIntegerv(GLenum pname, GLint* params)
     ::glGetIntegerv(pname, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetIntegerv(pname, params);
+    d_ptr->f.GetIntegerv(pname, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -835,7 +859,7 @@ inline const GLubyte *QOpenGLFunctions::glGetString(GLenum name)
     const GLubyte *result = ::glGetString(name);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    const GLubyte *result = d_ptr->GetString(name);
+    const GLubyte *result = d_ptr->f.GetString(name);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
@@ -847,7 +871,7 @@ inline void QOpenGLFunctions::glGetTexParameterfv(GLenum target, GLenum pname, G
     ::glGetTexParameterfv(target, pname, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetTexParameterfv(target, pname, params);
+    d_ptr->f.GetTexParameterfv(target, pname, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -858,7 +882,7 @@ inline void QOpenGLFunctions::glGetTexParameteriv(GLenum target, GLenum pname, G
     ::glGetTexParameteriv(target, pname, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetTexParameteriv(target, pname, params);
+    d_ptr->f.GetTexParameteriv(target, pname, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -869,7 +893,7 @@ inline void QOpenGLFunctions::glHint(GLenum target, GLenum mode)
     ::glHint(target, mode);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Hint(target, mode);
+    d_ptr->f.Hint(target, mode);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -880,7 +904,7 @@ inline GLboolean QOpenGLFunctions::glIsEnabled(GLenum cap)
     GLboolean result = ::glIsEnabled(cap);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    GLboolean result = d_ptr->IsEnabled(cap);
+    GLboolean result = d_ptr->f.IsEnabled(cap);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
@@ -892,7 +916,7 @@ inline GLboolean QOpenGLFunctions::glIsTexture(GLuint texture)
     GLboolean result = ::glIsTexture(texture);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    GLboolean result = d_ptr->IsTexture(texture);
+    GLboolean result = d_ptr->f.IsTexture(texture);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
@@ -904,7 +928,7 @@ inline void QOpenGLFunctions::glLineWidth(GLfloat width)
     ::glLineWidth(width);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->LineWidth(width);
+    d_ptr->f.LineWidth(width);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -915,7 +939,7 @@ inline void QOpenGLFunctions::glPixelStorei(GLenum pname, GLint param)
     ::glPixelStorei(pname, param);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->PixelStorei(pname, param);
+    d_ptr->f.PixelStorei(pname, param);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -926,7 +950,7 @@ inline void QOpenGLFunctions::glPolygonOffset(GLfloat factor, GLfloat units)
     ::glPolygonOffset(factor, units);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->PolygonOffset(factor, units);
+    d_ptr->f.PolygonOffset(factor, units);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -937,7 +961,7 @@ inline void QOpenGLFunctions::glReadPixels(GLint x, GLint y, GLsizei width, GLsi
     ::glReadPixels(x, y, width, height, format, type, pixels);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->ReadPixels(x, y, width, height, format, type, pixels);
+    d_ptr->f.ReadPixels(x, y, width, height, format, type, pixels);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -948,7 +972,7 @@ inline void QOpenGLFunctions::glScissor(GLint x, GLint y, GLsizei width, GLsizei
     ::glScissor(x, y, width, height);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Scissor(x, y, width, height);
+    d_ptr->f.Scissor(x, y, width, height);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -959,7 +983,7 @@ inline void QOpenGLFunctions::glStencilFunc(GLenum func, GLint ref, GLuint mask)
     ::glStencilFunc(func, ref, mask);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->StencilFunc(func, ref, mask);
+    d_ptr->f.StencilFunc(func, ref, mask);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -970,7 +994,7 @@ inline void QOpenGLFunctions::glStencilMask(GLuint mask)
     ::glStencilMask(mask);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->StencilMask(mask);
+    d_ptr->f.StencilMask(mask);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -981,7 +1005,7 @@ inline void QOpenGLFunctions::glStencilOp(GLenum fail, GLenum zfail, GLenum zpas
     ::glStencilOp(fail, zfail, zpass);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->StencilOp(fail, zfail, zpass);
+    d_ptr->f.StencilOp(fail, zfail, zpass);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -992,7 +1016,7 @@ inline void QOpenGLFunctions::glTexImage2D(GLenum target, GLint level, GLint int
     ::glTexImage2D(target, level, internalformat, width,height, border, format, type, pixels);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->TexImage2D(target, level, internalformat, width,height, border, format, type, pixels);
+    d_ptr->f.TexImage2D(target, level, internalformat, width,height, border, format, type, pixels);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1003,7 +1027,7 @@ inline void QOpenGLFunctions::glTexParameterf(GLenum target, GLenum pname, GLflo
     ::glTexParameterf(target, pname, param);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->TexParameterf(target, pname, param);
+    d_ptr->f.TexParameterf(target, pname, param);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1014,7 +1038,7 @@ inline void QOpenGLFunctions::glTexParameterfv(GLenum target, GLenum pname, cons
     ::glTexParameterfv(target, pname, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->TexParameterfv(target, pname, params);
+    d_ptr->f.TexParameterfv(target, pname, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1025,7 +1049,7 @@ inline void QOpenGLFunctions::glTexParameteri(GLenum target, GLenum pname, GLint
     ::glTexParameteri(target, pname, param);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->TexParameteri(target, pname, param);
+    d_ptr->f.TexParameteri(target, pname, param);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1036,7 +1060,7 @@ inline void QOpenGLFunctions::glTexParameteriv(GLenum target, GLenum pname, cons
     ::glTexParameteriv(target, pname, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->TexParameteriv(target, pname, params);
+    d_ptr->f.TexParameteriv(target, pname, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1047,7 +1071,7 @@ inline void QOpenGLFunctions::glTexSubImage2D(GLenum target, GLint level, GLint
     ::glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_ptr->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1058,7 +1082,7 @@ inline void QOpenGLFunctions::glViewport(GLint x, GLint y, GLsizei width, GLsize
     ::glViewport(x, y, width, height);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Viewport(x, y, width, height);
+    d_ptr->f.Viewport(x, y, width, height);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1071,7 +1095,7 @@ inline void QOpenGLFunctions::glActiveTexture(GLenum texture)
     ::glActiveTexture(texture);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->ActiveTexture(texture);
+    d_ptr->f.ActiveTexture(texture);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1082,7 +1106,7 @@ inline void QOpenGLFunctions::glAttachShader(GLuint program, GLuint shader)
     ::glAttachShader(program, shader);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->AttachShader(program, shader);
+    d_ptr->f.AttachShader(program, shader);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1093,7 +1117,7 @@ inline void QOpenGLFunctions::glBindAttribLocation(GLuint program, GLuint index,
     ::glBindAttribLocation(program, index, name);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->BindAttribLocation(program, index, name);
+    d_ptr->f.BindAttribLocation(program, index, name);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1104,7 +1128,7 @@ inline void QOpenGLFunctions::glBindBuffer(GLenum target, GLuint buffer)
     ::glBindBuffer(target, buffer);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->BindBuffer(target, buffer);
+    d_ptr->f.BindBuffer(target, buffer);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1117,7 +1141,7 @@ inline void QOpenGLFunctions::glBindFramebuffer(GLenum target, GLuint framebuffe
     ::glBindFramebuffer(target, framebuffer);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->BindFramebuffer(target, framebuffer);
+    d_ptr->f.BindFramebuffer(target, framebuffer);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1128,7 +1152,7 @@ inline void QOpenGLFunctions::glBindRenderbuffer(GLenum target, GLuint renderbuf
     ::glBindRenderbuffer(target, renderbuffer);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->BindRenderbuffer(target, renderbuffer);
+    d_ptr->f.BindRenderbuffer(target, renderbuffer);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1139,7 +1163,7 @@ inline void QOpenGLFunctions::glBlendColor(GLclampf red, GLclampf green, GLclamp
     ::glBlendColor(red, green, blue, alpha);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->BlendColor(red, green, blue, alpha);
+    d_ptr->f.BlendColor(red, green, blue, alpha);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1150,7 +1174,7 @@ inline void QOpenGLFunctions::glBlendEquation(GLenum mode)
     ::glBlendEquation(mode);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->BlendEquation(mode);
+    d_ptr->f.BlendEquation(mode);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1161,7 +1185,7 @@ inline void QOpenGLFunctions::glBlendEquationSeparate(GLenum modeRGB, GLenum mod
     ::glBlendEquationSeparate(modeRGB, modeAlpha);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_ptr->f.BlendEquationSeparate(modeRGB, modeAlpha);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1172,7 +1196,7 @@ inline void QOpenGLFunctions::glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB,
     ::glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->BlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
+    d_ptr->f.BlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1183,7 +1207,7 @@ inline void QOpenGLFunctions::glBufferData(GLenum target, qopengl_GLsizeiptr siz
     ::glBufferData(target, size, data, usage);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->BufferData(target, size, data, usage);
+    d_ptr->f.BufferData(target, size, data, usage);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1194,7 +1218,7 @@ inline void QOpenGLFunctions::glBufferSubData(GLenum target, qopengl_GLintptr of
     ::glBufferSubData(target, offset, size, data);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->BufferSubData(target, offset, size, data);
+    d_ptr->f.BufferSubData(target, offset, size, data);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1205,7 +1229,7 @@ inline GLenum QOpenGLFunctions::glCheckFramebufferStatus(GLenum target)
     GLenum result = ::glCheckFramebufferStatus(target);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    GLenum result = d_ptr->CheckFramebufferStatus(target);
+    GLenum result = d_ptr->f.CheckFramebufferStatus(target);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
@@ -1215,7 +1239,7 @@ inline void QOpenGLFunctions::glClearDepthf(GLclampf depth)
 {
 #ifndef QT_OPENGL_ES
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->ClearDepthf(depth);
+    d_ptr->f.ClearDepthf(depth);
 #else
     ::glClearDepthf(depth);
 #endif
@@ -1228,7 +1252,7 @@ inline void QOpenGLFunctions::glCompileShader(GLuint shader)
     ::glCompileShader(shader);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->CompileShader(shader);
+    d_ptr->f.CompileShader(shader);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1239,7 +1263,7 @@ inline void QOpenGLFunctions::glCompressedTexImage2D(GLenum target, GLint level,
     ::glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_ptr->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1250,7 +1274,7 @@ inline void QOpenGLFunctions::glCompressedTexSubImage2D(GLenum target, GLint lev
     ::glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_ptr->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1261,7 +1285,7 @@ inline GLuint QOpenGLFunctions::glCreateProgram()
     GLuint result = ::glCreateProgram();
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    GLuint result = d_ptr->CreateProgram();
+    GLuint result = d_ptr->f.CreateProgram();
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
@@ -1273,7 +1297,7 @@ inline GLuint QOpenGLFunctions::glCreateShader(GLenum type)
     GLuint result = ::glCreateShader(type);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    GLuint result = d_ptr->CreateShader(type);
+    GLuint result = d_ptr->f.CreateShader(type);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
@@ -1285,7 +1309,7 @@ inline void QOpenGLFunctions::glDeleteBuffers(GLsizei n, const GLuint* buffers)
     ::glDeleteBuffers(n, buffers);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->DeleteBuffers(n, buffers);
+    d_ptr->f.DeleteBuffers(n, buffers);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1296,7 +1320,7 @@ inline void QOpenGLFunctions::glDeleteFramebuffers(GLsizei n, const GLuint* fram
     ::glDeleteFramebuffers(n, framebuffers);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->DeleteFramebuffers(n, framebuffers);
+    d_ptr->f.DeleteFramebuffers(n, framebuffers);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1307,7 +1331,7 @@ inline void QOpenGLFunctions::glDeleteProgram(GLuint program)
     ::glDeleteProgram(program);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->DeleteProgram(program);
+    d_ptr->f.DeleteProgram(program);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1318,7 +1342,7 @@ inline void QOpenGLFunctions::glDeleteRenderbuffers(GLsizei n, const GLuint* ren
     ::glDeleteRenderbuffers(n, renderbuffers);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->DeleteRenderbuffers(n, renderbuffers);
+    d_ptr->f.DeleteRenderbuffers(n, renderbuffers);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1329,7 +1353,7 @@ inline void QOpenGLFunctions::glDeleteShader(GLuint shader)
     ::glDeleteShader(shader);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->DeleteShader(shader);
+    d_ptr->f.DeleteShader(shader);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1338,7 +1362,7 @@ inline void QOpenGLFunctions::glDepthRangef(GLclampf zNear, GLclampf zFar)
 {
 #ifndef QT_OPENGL_ES
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->DepthRangef(zNear, zFar);
+    d_ptr->f.DepthRangef(zNear, zFar);
 #else
     ::glDepthRangef(zNear, zFar);
 #endif
@@ -1351,7 +1375,7 @@ inline void QOpenGLFunctions::glDetachShader(GLuint program, GLuint shader)
     ::glDetachShader(program, shader);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->DetachShader(program, shader);
+    d_ptr->f.DetachShader(program, shader);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1362,7 +1386,7 @@ inline void QOpenGLFunctions::glDisableVertexAttribArray(GLuint index)
     ::glDisableVertexAttribArray(index);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->DisableVertexAttribArray(index);
+    d_ptr->f.DisableVertexAttribArray(index);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1373,7 +1397,7 @@ inline void QOpenGLFunctions::glEnableVertexAttribArray(GLuint index)
     ::glEnableVertexAttribArray(index);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->EnableVertexAttribArray(index);
+    d_ptr->f.EnableVertexAttribArray(index);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1384,7 +1408,7 @@ inline void QOpenGLFunctions::glFramebufferRenderbuffer(GLenum target, GLenum at
     ::glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_ptr->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1395,7 +1419,7 @@ inline void QOpenGLFunctions::glFramebufferTexture2D(GLenum target, GLenum attac
     ::glFramebufferTexture2D(target, attachment, textarget, texture, level);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_ptr->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1406,7 +1430,7 @@ inline void QOpenGLFunctions::glGenBuffers(GLsizei n, GLuint* buffers)
     ::glGenBuffers(n, buffers);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GenBuffers(n, buffers);
+    d_ptr->f.GenBuffers(n, buffers);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1417,7 +1441,7 @@ inline void QOpenGLFunctions::glGenerateMipmap(GLenum target)
     ::glGenerateMipmap(target);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GenerateMipmap(target);
+    d_ptr->f.GenerateMipmap(target);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1428,7 +1452,7 @@ inline void QOpenGLFunctions::glGenFramebuffers(GLsizei n, GLuint* framebuffers)
     ::glGenFramebuffers(n, framebuffers);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GenFramebuffers(n, framebuffers);
+    d_ptr->f.GenFramebuffers(n, framebuffers);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1439,7 +1463,7 @@ inline void QOpenGLFunctions::glGenRenderbuffers(GLsizei n, GLuint* renderbuffer
     ::glGenRenderbuffers(n, renderbuffers);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GenRenderbuffers(n, renderbuffers);
+    d_ptr->f.GenRenderbuffers(n, renderbuffers);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1450,7 +1474,7 @@ inline void QOpenGLFunctions::glGetActiveAttrib(GLuint program, GLuint index, GL
     ::glGetActiveAttrib(program, index, bufsize, length, size, type, name);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetActiveAttrib(program, index, bufsize, length, size, type, name);
+    d_ptr->f.GetActiveAttrib(program, index, bufsize, length, size, type, name);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1461,7 +1485,7 @@ inline void QOpenGLFunctions::glGetActiveUniform(GLuint program, GLuint index, G
     ::glGetActiveUniform(program, index, bufsize, length, size, type, name);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetActiveUniform(program, index, bufsize, length, size, type, name);
+    d_ptr->f.GetActiveUniform(program, index, bufsize, length, size, type, name);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1472,7 +1496,7 @@ inline void QOpenGLFunctions::glGetAttachedShaders(GLuint program, GLsizei maxco
     ::glGetAttachedShaders(program, maxcount, count, shaders);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetAttachedShaders(program, maxcount, count, shaders);
+    d_ptr->f.GetAttachedShaders(program, maxcount, count, shaders);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1483,7 +1507,7 @@ inline GLint QOpenGLFunctions::glGetAttribLocation(GLuint program, const char* n
     GLint result = ::glGetAttribLocation(program, name);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    GLint result = d_ptr->GetAttribLocation(program, name);
+    GLint result = d_ptr->f.GetAttribLocation(program, name);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
@@ -1495,7 +1519,7 @@ inline void QOpenGLFunctions::glGetBufferParameteriv(GLenum target, GLenum pname
     ::glGetBufferParameteriv(target, pname, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetBufferParameteriv(target, pname, params);
+    d_ptr->f.GetBufferParameteriv(target, pname, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1506,7 +1530,7 @@ inline void QOpenGLFunctions::glGetFramebufferAttachmentParameteriv(GLenum targe
     ::glGetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_ptr->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1517,7 +1541,7 @@ inline void QOpenGLFunctions::glGetProgramiv(GLuint program, GLenum pname, GLint
     ::glGetProgramiv(program, pname, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetProgramiv(program, pname, params);
+    d_ptr->f.GetProgramiv(program, pname, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1528,7 +1552,7 @@ inline void QOpenGLFunctions::glGetProgramInfoLog(GLuint program, GLsizei bufsiz
     ::glGetProgramInfoLog(program, bufsize, length, infolog);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetProgramInfoLog(program, bufsize, length, infolog);
+    d_ptr->f.GetProgramInfoLog(program, bufsize, length, infolog);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1539,7 +1563,7 @@ inline void QOpenGLFunctions::glGetRenderbufferParameteriv(GLenum target, GLenum
     ::glGetRenderbufferParameteriv(target, pname, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetRenderbufferParameteriv(target, pname, params);
+    d_ptr->f.GetRenderbufferParameteriv(target, pname, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1550,7 +1574,7 @@ inline void QOpenGLFunctions::glGetShaderiv(GLuint shader, GLenum pname, GLint*
     ::glGetShaderiv(shader, pname, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetShaderiv(shader, pname, params);
+    d_ptr->f.GetShaderiv(shader, pname, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1561,7 +1585,7 @@ inline void QOpenGLFunctions::glGetShaderInfoLog(GLuint shader, GLsizei bufsize,
     ::glGetShaderInfoLog(shader, bufsize, length, infolog);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetShaderInfoLog(shader, bufsize, length, infolog);
+    d_ptr->f.GetShaderInfoLog(shader, bufsize, length, infolog);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1572,7 +1596,7 @@ inline void QOpenGLFunctions::glGetShaderPrecisionFormat(GLenum shadertype, GLen
     ::glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+    d_ptr->f.GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1583,7 +1607,7 @@ inline void QOpenGLFunctions::glGetShaderSource(GLuint shader, GLsizei bufsize,
     ::glGetShaderSource(shader, bufsize, length, source);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetShaderSource(shader, bufsize, length, source);
+    d_ptr->f.GetShaderSource(shader, bufsize, length, source);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1594,7 +1618,7 @@ inline void QOpenGLFunctions::glGetUniformfv(GLuint program, GLint location, GLf
     ::glGetUniformfv(program, location, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetUniformfv(program, location, params);
+    d_ptr->f.GetUniformfv(program, location, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1605,7 +1629,7 @@ inline void QOpenGLFunctions::glGetUniformiv(GLuint program, GLint location, GLi
     ::glGetUniformiv(program, location, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetUniformiv(program, location, params);
+    d_ptr->f.GetUniformiv(program, location, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1616,7 +1640,7 @@ inline GLint QOpenGLFunctions::glGetUniformLocation(GLuint program, const char*
     GLint result = ::glGetUniformLocation(program, name);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    GLint result = d_ptr->GetUniformLocation(program, name);
+    GLint result = d_ptr->f.GetUniformLocation(program, name);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
@@ -1628,7 +1652,7 @@ inline void QOpenGLFunctions::glGetVertexAttribfv(GLuint index, GLenum pname, GL
     ::glGetVertexAttribfv(index, pname, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetVertexAttribfv(index, pname, params);
+    d_ptr->f.GetVertexAttribfv(index, pname, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1639,7 +1663,7 @@ inline void QOpenGLFunctions::glGetVertexAttribiv(GLuint index, GLenum pname, GL
     ::glGetVertexAttribiv(index, pname, params);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetVertexAttribiv(index, pname, params);
+    d_ptr->f.GetVertexAttribiv(index, pname, params);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1650,7 +1674,7 @@ inline void QOpenGLFunctions::glGetVertexAttribPointerv(GLuint index, GLenum pna
     ::glGetVertexAttribPointerv(index, pname, pointer);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->GetVertexAttribPointerv(index, pname, pointer);
+    d_ptr->f.GetVertexAttribPointerv(index, pname, pointer);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1661,7 +1685,7 @@ inline GLboolean QOpenGLFunctions::glIsBuffer(GLuint buffer)
     GLboolean result = ::glIsBuffer(buffer);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    GLboolean result = d_ptr->IsBuffer(buffer);
+    GLboolean result = d_ptr->f.IsBuffer(buffer);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
@@ -1673,7 +1697,7 @@ inline GLboolean QOpenGLFunctions::glIsFramebuffer(GLuint framebuffer)
     GLboolean result = ::glIsFramebuffer(framebuffer);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    GLboolean result = d_ptr->IsFramebuffer(framebuffer);
+    GLboolean result = d_ptr->f.IsFramebuffer(framebuffer);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
@@ -1685,7 +1709,7 @@ inline GLboolean QOpenGLFunctions::glIsProgram(GLuint program)
     GLboolean result = ::glIsProgram(program);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    GLboolean result = d_ptr->IsProgram(program);
+    GLboolean result = d_ptr->f.IsProgram(program);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
@@ -1697,7 +1721,7 @@ inline GLboolean QOpenGLFunctions::glIsRenderbuffer(GLuint renderbuffer)
     GLboolean result = ::glIsRenderbuffer(renderbuffer);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    GLboolean result = d_ptr->IsRenderbuffer(renderbuffer);
+    GLboolean result = d_ptr->f.IsRenderbuffer(renderbuffer);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
@@ -1709,7 +1733,7 @@ inline GLboolean QOpenGLFunctions::glIsShader(GLuint shader)
     GLboolean result = ::glIsShader(shader);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    GLboolean result = d_ptr->IsShader(shader);
+    GLboolean result = d_ptr->f.IsShader(shader);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
     return result;
@@ -1721,7 +1745,7 @@ inline void QOpenGLFunctions::glLinkProgram(GLuint program)
     ::glLinkProgram(program);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->LinkProgram(program);
+    d_ptr->f.LinkProgram(program);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1732,7 +1756,7 @@ inline void QOpenGLFunctions::glReleaseShaderCompiler()
     ::glReleaseShaderCompiler();
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->ReleaseShaderCompiler();
+    d_ptr->f.ReleaseShaderCompiler();
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1743,7 +1767,7 @@ inline void QOpenGLFunctions::glRenderbufferStorage(GLenum target, GLenum intern
     ::glRenderbufferStorage(target, internalformat, width, height);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->RenderbufferStorage(target, internalformat, width, height);
+    d_ptr->f.RenderbufferStorage(target, internalformat, width, height);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1754,7 +1778,7 @@ inline void QOpenGLFunctions::glSampleCoverage(GLclampf value, GLboolean invert)
     ::glSampleCoverage(value, invert);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->SampleCoverage(value, invert);
+    d_ptr->f.SampleCoverage(value, invert);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1765,7 +1789,7 @@ inline void QOpenGLFunctions::glShaderBinary(GLint n, const GLuint* shaders, GLe
     ::glShaderBinary(n, shaders, binaryformat, binary, length);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->ShaderBinary(n, shaders, binaryformat, binary, length);
+    d_ptr->f.ShaderBinary(n, shaders, binaryformat, binary, length);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1776,7 +1800,7 @@ inline void QOpenGLFunctions::glShaderSource(GLuint shader, GLsizei count, const
     ::glShaderSource(shader, count, string, length);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->ShaderSource(shader, count, string, length);
+    d_ptr->f.ShaderSource(shader, count, string, length);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1787,7 +1811,7 @@ inline void QOpenGLFunctions::glStencilFuncSeparate(GLenum face, GLenum func, GL
     ::glStencilFuncSeparate(face, func, ref, mask);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->StencilFuncSeparate(face, func, ref, mask);
+    d_ptr->f.StencilFuncSeparate(face, func, ref, mask);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1798,7 +1822,7 @@ inline void QOpenGLFunctions::glStencilMaskSeparate(GLenum face, GLuint mask)
     ::glStencilMaskSeparate(face, mask);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->StencilMaskSeparate(face, mask);
+    d_ptr->f.StencilMaskSeparate(face, mask);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1809,7 +1833,7 @@ inline void QOpenGLFunctions::glStencilOpSeparate(GLenum face, GLenum fail, GLen
     ::glStencilOpSeparate(face, fail, zfail, zpass);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->StencilOpSeparate(face, fail, zfail, zpass);
+    d_ptr->f.StencilOpSeparate(face, fail, zfail, zpass);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1820,7 +1844,7 @@ inline void QOpenGLFunctions::glUniform1f(GLint location, GLfloat x)
     ::glUniform1f(location, x);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform1f(location, x);
+    d_ptr->f.Uniform1f(location, x);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1831,7 +1855,7 @@ inline void QOpenGLFunctions::glUniform1fv(GLint location, GLsizei count, const
     ::glUniform1fv(location, count, v);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform1fv(location, count, v);
+    d_ptr->f.Uniform1fv(location, count, v);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1842,7 +1866,7 @@ inline void QOpenGLFunctions::glUniform1i(GLint location, GLint x)
     ::glUniform1i(location, x);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform1i(location, x);
+    d_ptr->f.Uniform1i(location, x);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1853,7 +1877,7 @@ inline void QOpenGLFunctions::glUniform1iv(GLint location, GLsizei count, const
     ::glUniform1iv(location, count, v);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform1iv(location, count, v);
+    d_ptr->f.Uniform1iv(location, count, v);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1864,7 +1888,7 @@ inline void QOpenGLFunctions::glUniform2f(GLint location, GLfloat x, GLfloat y)
     ::glUniform2f(location, x, y);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform2f(location, x, y);
+    d_ptr->f.Uniform2f(location, x, y);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1875,7 +1899,7 @@ inline void QOpenGLFunctions::glUniform2fv(GLint location, GLsizei count, const
     ::glUniform2fv(location, count, v);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform2fv(location, count, v);
+    d_ptr->f.Uniform2fv(location, count, v);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1886,7 +1910,7 @@ inline void QOpenGLFunctions::glUniform2i(GLint location, GLint x, GLint y)
     ::glUniform2i(location, x, y);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform2i(location, x, y);
+    d_ptr->f.Uniform2i(location, x, y);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1897,7 +1921,7 @@ inline void QOpenGLFunctions::glUniform2iv(GLint location, GLsizei count, const
     ::glUniform2iv(location, count, v);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform2iv(location, count, v);
+    d_ptr->f.Uniform2iv(location, count, v);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1908,7 +1932,7 @@ inline void QOpenGLFunctions::glUniform3f(GLint location, GLfloat x, GLfloat y,
     ::glUniform3f(location, x, y, z);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform3f(location, x, y, z);
+    d_ptr->f.Uniform3f(location, x, y, z);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1919,7 +1943,7 @@ inline void QOpenGLFunctions::glUniform3fv(GLint location, GLsizei count, const
     ::glUniform3fv(location, count, v);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform3fv(location, count, v);
+    d_ptr->f.Uniform3fv(location, count, v);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1930,7 +1954,7 @@ inline void QOpenGLFunctions::glUniform3i(GLint location, GLint x, GLint y, GLin
     ::glUniform3i(location, x, y, z);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform3i(location, x, y, z);
+    d_ptr->f.Uniform3i(location, x, y, z);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1941,7 +1965,7 @@ inline void QOpenGLFunctions::glUniform3iv(GLint location, GLsizei count, const
     ::glUniform3iv(location, count, v);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform3iv(location, count, v);
+    d_ptr->f.Uniform3iv(location, count, v);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1952,7 +1976,7 @@ inline void QOpenGLFunctions::glUniform4f(GLint location, GLfloat x, GLfloat y,
     ::glUniform4f(location, x, y, z, w);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform4f(location, x, y, z, w);
+    d_ptr->f.Uniform4f(location, x, y, z, w);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1963,7 +1987,7 @@ inline void QOpenGLFunctions::glUniform4fv(GLint location, GLsizei count, const
     ::glUniform4fv(location, count, v);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform4fv(location, count, v);
+    d_ptr->f.Uniform4fv(location, count, v);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1974,7 +1998,7 @@ inline void QOpenGLFunctions::glUniform4i(GLint location, GLint x, GLint y, GLin
     ::glUniform4i(location, x, y, z, w);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform4i(location, x, y, z, w);
+    d_ptr->f.Uniform4i(location, x, y, z, w);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1985,7 +2009,7 @@ inline void QOpenGLFunctions::glUniform4iv(GLint location, GLsizei count, const
     ::glUniform4iv(location, count, v);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->Uniform4iv(location, count, v);
+    d_ptr->f.Uniform4iv(location, count, v);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -1996,7 +2020,7 @@ inline void QOpenGLFunctions::glUniformMatrix2fv(GLint location, GLsizei count,
     ::glUniformMatrix2fv(location, count, transpose, value);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->UniformMatrix2fv(location, count, transpose, value);
+    d_ptr->f.UniformMatrix2fv(location, count, transpose, value);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -2007,7 +2031,7 @@ inline void QOpenGLFunctions::glUniformMatrix3fv(GLint location, GLsizei count,
     ::glUniformMatrix3fv(location, count, transpose, value);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->UniformMatrix3fv(location, count, transpose, value);
+    d_ptr->f.UniformMatrix3fv(location, count, transpose, value);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -2018,7 +2042,7 @@ inline void QOpenGLFunctions::glUniformMatrix4fv(GLint location, GLsizei count,
     ::glUniformMatrix4fv(location, count, transpose, value);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->UniformMatrix4fv(location, count, transpose, value);
+    d_ptr->f.UniformMatrix4fv(location, count, transpose, value);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -2029,7 +2053,7 @@ inline void QOpenGLFunctions::glUseProgram(GLuint program)
     ::glUseProgram(program);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->UseProgram(program);
+    d_ptr->f.UseProgram(program);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -2040,7 +2064,7 @@ inline void QOpenGLFunctions::glValidateProgram(GLuint program)
     ::glValidateProgram(program);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->ValidateProgram(program);
+    d_ptr->f.ValidateProgram(program);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -2051,7 +2075,7 @@ inline void QOpenGLFunctions::glVertexAttrib1f(GLuint indx, GLfloat x)
     ::glVertexAttrib1f(indx, x);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->VertexAttrib1f(indx, x);
+    d_ptr->f.VertexAttrib1f(indx, x);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -2062,7 +2086,7 @@ inline void QOpenGLFunctions::glVertexAttrib1fv(GLuint indx, const GLfloat* valu
     ::glVertexAttrib1fv(indx, values);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->VertexAttrib1fv(indx, values);
+    d_ptr->f.VertexAttrib1fv(indx, values);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -2073,7 +2097,7 @@ inline void QOpenGLFunctions::glVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y
     ::glVertexAttrib2f(indx, x, y);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->VertexAttrib2f(indx, x, y);
+    d_ptr->f.VertexAttrib2f(indx, x, y);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -2084,7 +2108,7 @@ inline void QOpenGLFunctions::glVertexAttrib2fv(GLuint indx, const GLfloat* valu
     ::glVertexAttrib2fv(indx, values);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->VertexAttrib2fv(indx, values);
+    d_ptr->f.VertexAttrib2fv(indx, values);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -2095,7 +2119,7 @@ inline void QOpenGLFunctions::glVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y
     ::glVertexAttrib3f(indx, x, y, z);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->VertexAttrib3f(indx, x, y, z);
+    d_ptr->f.VertexAttrib3f(indx, x, y, z);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -2106,7 +2130,7 @@ inline void QOpenGLFunctions::glVertexAttrib3fv(GLuint indx, const GLfloat* valu
     ::glVertexAttrib3fv(indx, values);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->VertexAttrib3fv(indx, values);
+    d_ptr->f.VertexAttrib3fv(indx, values);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -2117,7 +2141,7 @@ inline void QOpenGLFunctions::glVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y
     ::glVertexAttrib4f(indx, x, y, z, w);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->VertexAttrib4f(indx, x, y, z, w);
+    d_ptr->f.VertexAttrib4f(indx, x, y, z, w);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -2128,7 +2152,7 @@ inline void QOpenGLFunctions::glVertexAttrib4fv(GLuint indx, const GLfloat* valu
     ::glVertexAttrib4fv(indx, values);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->VertexAttrib4fv(indx, values);
+    d_ptr->f.VertexAttrib4fv(indx, values);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
@@ -2139,11 +2163,15 @@ inline void QOpenGLFunctions::glVertexAttribPointer(GLuint indx, GLint size, GLe
     ::glVertexAttribPointer(indx, size, type, normalized, stride, ptr);
 #else
     Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr));
-    d_ptr->VertexAttribPointer(indx, size, type, normalized, stride, ptr);
+    d_ptr->f.VertexAttribPointer(indx, size, type, normalized, stride, ptr);
 #endif
     Q_OPENGL_FUNCTIONS_DEBUG
 }
 
+#undef QT_OPENGL_DECLARE_FUNCTIONS
+#undef QT_OPENGL_COUNT_FUNCTIONS
+#undef QT_OPENGL_DECLARE
+
 QT_END_NAMESPACE
 
 #endif // QT_NO_OPENGL
diff --git a/src/gui/opengl/qopenglfunctions_1_0.cpp b/src/gui/opengl/qopenglfunctions_1_0.cpp
index 8e87529dd6..9d5a76380a 100644
--- a/src/gui/opengl/qopenglfunctions_1_0.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_0.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -68,14 +74,12 @@ QOpenGLFunctions_1_0::QOpenGLFunctions_1_0()
 
 QOpenGLFunctions_1_0::~QOpenGLFunctions_1_0()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_1_0::initializeOpenGLFunctions()
@@ -94,18 +98,10 @@ bool QOpenGLFunctions_1_0::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_1_0.h b/src/gui/opengl/qopenglfunctions_1_0.h
index 4d7f98743a..825a6255a3 100644
--- a/src/gui/opengl/qopenglfunctions_1_0.h
+++ b/src/gui/opengl/qopenglfunctions_1_0.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -383,1534 +390,1534 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_1_0::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_0::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_1_0::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_1_0::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_1_0::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_1_0::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_1_0::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_1_0::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_0::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_1_0::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_1_0::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_1_0::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_1_0::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_1_0::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_1_0::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_1_0::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_1_0::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_1_0::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_1_0::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_1_0::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_0::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_1_0::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_1_0::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_1_0::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_0::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_1_0::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_1_0::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_0::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_0::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_0::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_1_0::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_1_0::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_1_0::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_1_0::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_1_0::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_1_0::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_0::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_0::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_0::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_0::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_1_0::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_1_0::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_1_0::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_1_0::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_1_0::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_0::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_0::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_1_0::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_0::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_0::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_1_0::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_1_0::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_1_0::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_1_0::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_1_0::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_1_0::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_1_0::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_0::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_0::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_0::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_1_0::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_0::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_1_0::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_0::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_0::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_0::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_1_0::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_1_0::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_1_0::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_1_0::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_1_0::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_1_0::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_1_0::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_1_0::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_1_0::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_1_0::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_1_0::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_1_0::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_1_0::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_1_0::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_1_0::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_1_0::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_1_0::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_1_0::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_1_0::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_1_0::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_1_0::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_1_0::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_1_0::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_1_0::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_1_0::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_1_0::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_1_0::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_0::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_1_0::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_1_0::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_1_0::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_1_0::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_1_0::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_1_0::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_1_0::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_1_0::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_1_0::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_1_0::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_1_0::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_0::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_0::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_1_0::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_1_0::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_0::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_0::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_0::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_0::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_0::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_0::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_0::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_1_0::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_0::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_0::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_0::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_0::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_0::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_1_0::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_1_0::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_1_0::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_1_0::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_1_0::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_1_0::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_1_0::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_1_0::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_1_0::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_1_0::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_1_0::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_0::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_1_0::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_1_0::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_1_0::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_1_0::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_1_0::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_1_0::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_1_0::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_1_0::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_1_1.cpp b/src/gui/opengl/qopenglfunctions_1_1.cpp
index 6ab5fda124..57385f1927 100644
--- a/src/gui/opengl/qopenglfunctions_1_1.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_1.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -70,22 +76,18 @@ QOpenGLFunctions_1_1::QOpenGLFunctions_1_1()
 
 QOpenGLFunctions_1_1::~QOpenGLFunctions_1_1()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_1_1::initializeOpenGLFunctions()
@@ -104,34 +106,18 @@ bool QOpenGLFunctions_1_1::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_1_1.h b/src/gui/opengl/qopenglfunctions_1_1.h
index 3f196efac2..f312258f00 100644
--- a/src/gui/opengl/qopenglfunctions_1_1.h
+++ b/src/gui/opengl/qopenglfunctions_1_1.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -419,1688 +426,1688 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_1_1::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_1::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_1_1::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_1_1::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_1_1::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_1_1::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_1_1::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_1_1::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_1::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_1_1::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_1_1::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_1_1::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_1_1::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_1_1::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_1_1::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_1_1::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_1_1::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_1_1::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_1_1::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_1_1::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_1::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_1_1::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_1_1::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_1_1::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_1::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_1_1::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_1_1::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_1::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_1::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_1::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_1_1::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_1_1::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_1_1::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_1_1::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_1_1::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline void QOpenGLFunctions_1_1::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_1_1::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline GLboolean QOpenGLFunctions_1_1::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_1_1::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_1_1::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_1_1::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_1_1::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_1::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_1::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_1::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_1::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_1_1::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_1_1::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_1_1::glGetPointerv(GLenum pname, GLvoid* *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_1_1::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_1_1::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_1::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_1::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_1::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_1::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_1_1::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_1_1::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_1_1::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_1_1::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_1_1::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_1::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_1::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_1_1::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_1::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_1::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_1_1::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_1_1::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_1_1::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_1_1::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_1_1::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_1_1::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_1_1::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_1::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_1::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_1::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_1_1::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_1::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_1_1::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_1::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_1::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_1::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_1_1::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_1_1::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_1_1::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_1_1::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_1_1::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_1_1::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_1_1::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_1_1::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_1_1::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_1_1::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_1_1::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_1_1::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_1_1::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_1_1::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_1_1::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_1_1::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_1_1::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_1_1::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_1_1::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_1_1::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_1_1::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_1_1::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_1_1::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_1_1::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_1_1::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_1_1::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_1_1::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_1::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_1_1::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_1_1::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_1_1::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_1_1::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_1_1::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_1_1::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_1_1::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_1_1::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_1_1::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_1_1::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_1_1::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_1::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_1::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_1_1::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_1_1::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_1::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_1::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_1::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_1::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_1::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_1::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_1::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_1_1::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_1::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_1::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_1::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_1::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_1::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_1_1::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_1_1::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_1_1::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_1_1::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_1_1::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_1_1::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_1_1::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_1_1::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_1_1::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_1_1::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_1_1::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_1::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_1_1::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_1_1::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_1_1::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_1_1::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_1_1::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_1_1::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_1_1::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_1_1::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_1_1::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_1_1::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_1_1::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_1_1::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_1_1::glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_1::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_1::glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_1::glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_1::glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_1::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_1_1::glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_1::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_1_1::glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_1::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_1_2.cpp b/src/gui/opengl/qopenglfunctions_1_2.cpp
index 1a1d44c477..9eaa13862d 100644
--- a/src/gui/opengl/qopenglfunctions_1_2.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_2.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -72,30 +78,24 @@ QOpenGLFunctions_1_2::QOpenGLFunctions_1_2()
 
 QOpenGLFunctions_1_2::~QOpenGLFunctions_1_2()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_1_2::initializeOpenGLFunctions()
@@ -114,50 +114,26 @@ bool QOpenGLFunctions_1_2::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_1_2.h b/src/gui/opengl/qopenglfunctions_1_2.h
index 461084a6be..fd4e7f74f9 100644
--- a/src/gui/opengl/qopenglfunctions_1_2.h
+++ b/src/gui/opengl/qopenglfunctions_1_2.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -463,1882 +470,1882 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_1_2::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_2::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_1_2::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_1_2::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_1_2::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_1_2::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_1_2::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_1_2::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_2::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_1_2::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_1_2::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_1_2::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_1_2::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_1_2::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_1_2::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_1_2::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_1_2::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_1_2::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_1_2::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_1_2::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_2::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_1_2::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_1_2::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_1_2::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_2::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_1_2::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_1_2::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_2::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_2::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_2::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_1_2::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_1_2::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_1_2::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_1_2::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_1_2::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline void QOpenGLFunctions_1_2::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_1_2::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline GLboolean QOpenGLFunctions_1_2::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_1_2::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_1_2::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_1_2::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_1_2::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_2::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_2::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_2::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_2::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_1_2::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_1_2::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_1_2::glGetPointerv(GLenum pname, GLvoid* *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_1_2::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_1_2::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_2::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_2::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_2::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_1_2::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_1_2::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_1_2::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_2::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_2::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_2::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_2::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_1_2::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_1_2::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_1_2::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_1_2::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_1_2::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_2::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_2::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_1_2::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_2::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_2::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_1_2::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_1_2::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_1_2::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_1_2::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_1_2::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_1_2::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_1_2::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_2::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_2::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_2::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_1_2::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_2::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_1_2::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_2::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_2::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_2::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_1_2::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_1_2::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_1_2::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_1_2::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_1_2::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_1_2::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_1_2::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_1_2::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_1_2::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_1_2::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_1_2::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_1_2::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_1_2::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_1_2::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_1_2::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_1_2::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_1_2::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_1_2::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_1_2::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_1_2::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_1_2::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_1_2::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_1_2::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_1_2::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_1_2::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_1_2::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_1_2::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_2::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_1_2::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_1_2::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_1_2::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_1_2::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_1_2::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_1_2::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_1_2::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_1_2::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_1_2::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_1_2::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_1_2::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_2::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_1_2::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_1_2::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_2::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_2::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_2::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_2::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_2::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_2::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_2::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_1_2::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_2::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_2::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_2::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_2::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_2::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_1_2::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_1_2::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_1_2::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_1_2::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_1_2::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_1_2::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_1_2::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_1_2::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_1_2::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_1_2::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_1_2::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_2::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_1_2::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_1_2::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_1_2::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_1_2::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_1_2::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_1_2::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_1_2::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_1_2::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_1_2::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_1_2::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_1_2::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_1_2::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_1_2::glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_2::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_2::glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_2::glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_2::glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_2::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_1_2::glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_2::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_1_2::glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_2::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_1_2::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 inline void QOpenGLFunctions_1_2::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_1_2::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_1_2::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_1_2::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_1_2::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_1_2::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_1_2::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_1_2::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_1_2::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_2::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_2::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_1_2::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_1_2::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_2::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_1_2::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_1_2::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_2::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_2::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_1_3.cpp b/src/gui/opengl/qopenglfunctions_1_3.cpp
index 38a8b7e922..6211997302 100644
--- a/src/gui/opengl/qopenglfunctions_1_3.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_3.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -74,38 +80,30 @@ QOpenGLFunctions_1_3::QOpenGLFunctions_1_3()
 
 QOpenGLFunctions_1_3::~QOpenGLFunctions_1_3()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
-    if (d_1_3_Deprecated && !d_1_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Deprecated->context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        delete d_1_3_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
+    if (d_1_3_Deprecated)
+        d_1_3_Deprecated->refs.deref();
+    Q_ASSERT(d_1_3_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_1_3::initializeOpenGLFunctions()
@@ -124,66 +122,34 @@ bool QOpenGLFunctions_1_3::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_3_Deprecated = static_cast<QOpenGLFunctions_1_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_1_3.h b/src/gui/opengl/qopenglfunctions_1_3.h
index ce56a14d40..a8509c46c5 100644
--- a/src/gui/opengl/qopenglfunctions_1_3.h
+++ b/src/gui/opengl/qopenglfunctions_1_3.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -515,2116 +522,2116 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_1_3::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_3::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_1_3::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_1_3::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_1_3::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_1_3::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_1_3::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_1_3::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_3::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_1_3::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_1_3::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_1_3::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_1_3::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_1_3::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_1_3::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_1_3::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_1_3::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_1_3::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_1_3::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_1_3::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_3::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_1_3::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_1_3::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_1_3::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_3::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_1_3::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_1_3::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_3::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_3::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_3::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_1_3::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_1_3::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_1_3::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_1_3::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_1_3::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline void QOpenGLFunctions_1_3::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_1_3::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline GLboolean QOpenGLFunctions_1_3::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_1_3::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_1_3::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_1_3::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_1_3::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_3::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_3::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_3::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_3::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_1_3::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_1_3::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_1_3::glGetPointerv(GLenum pname, GLvoid* *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_1_3::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_1_3::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_3::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_3::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_3::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_1_3::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_1_3::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_1_3::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_1_3::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_3::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_3::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_3::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_3::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_3::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_3::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_1_3::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_1_3::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_3::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_3::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_3::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_3::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_1_3::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_1_3::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_1_3::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_1_3::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_1_3::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_3::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_3::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_1_3::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_3::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_3::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_1_3::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_1_3::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_1_3::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_1_3::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_1_3::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_1_3::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_1_3::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_3::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_3::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_3::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_1_3::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_3::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_1_3::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_3::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_3::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_3::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_1_3::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_1_3::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_1_3::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_1_3::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_1_3::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_1_3::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_1_3::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_1_3::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_1_3::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_1_3::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_1_3::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_1_3::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_1_3::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_1_3::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_1_3::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_1_3::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_1_3::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_1_3::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_1_3::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_1_3::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_1_3::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_1_3::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_1_3::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_1_3::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_1_3::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_1_3::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_1_3::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_3::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_1_3::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_1_3::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_1_3::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_1_3::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_1_3::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_1_3::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_1_3::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_1_3::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_1_3::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_1_3::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_1_3::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_3::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_1_3::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_1_3::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_3::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_3::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_3::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_3::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_3::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_3::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_3::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_1_3::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_3::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_3::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_3::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_3::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_3::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_1_3::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_1_3::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_1_3::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_1_3::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_1_3::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_1_3::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_1_3::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_1_3::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_1_3::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_1_3::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_1_3::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_3::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_1_3::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_1_3::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_1_3::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_1_3::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_1_3::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_1_3::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_1_3::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_1_3::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_1_3::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_1_3::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_1_3::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_1_3::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_1_3::glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_3::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_3::glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_3::glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_3::glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_3::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_1_3::glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_3::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_1_3::glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_3::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_1_3::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 inline void QOpenGLFunctions_1_3::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_1_3::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_1_3::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_1_3::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_1_3::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_1_3::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_1_3::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_1_3::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_1_3::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_3::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_3::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_1_3::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_1_3::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_3::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_1_3::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_1_3::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_3::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_3::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_1_3::glMultTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixd(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_3::glMultTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixf(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_3::glLoadTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixd(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_3::glLoadTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixf(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord4sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4sv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_3_Deprecated->MultiTexCoord4s(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4s(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord4iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4iv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_3_Deprecated->MultiTexCoord4i(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4i(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord4fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4fv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_3_Deprecated->MultiTexCoord4f(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4f(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4dv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_3_Deprecated->MultiTexCoord4d(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4d(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord3sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3sv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-    d_1_3_Deprecated->MultiTexCoord3s(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3s(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord3iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3iv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
-    d_1_3_Deprecated->MultiTexCoord3i(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3i(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord3fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3fv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_3_Deprecated->MultiTexCoord3f(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3f(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3dv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_3_Deprecated->MultiTexCoord3d(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3d(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord2sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2sv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
-    d_1_3_Deprecated->MultiTexCoord2s(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2s(target, s, t);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord2iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2iv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
-    d_1_3_Deprecated->MultiTexCoord2i(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2i(target, s, t);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord2fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2fv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t)
 {
-    d_1_3_Deprecated->MultiTexCoord2f(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2f(target, s, t);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2dv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
-    d_1_3_Deprecated->MultiTexCoord2d(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2d(target, s, t);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord1sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1sv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord1s(GLenum target, GLshort s)
 {
-    d_1_3_Deprecated->MultiTexCoord1s(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1s(target, s);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord1iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1iv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord1i(GLenum target, GLint s)
 {
-    d_1_3_Deprecated->MultiTexCoord1i(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1i(target, s);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord1fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1fv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord1f(GLenum target, GLfloat s)
 {
-    d_1_3_Deprecated->MultiTexCoord1f(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1f(target, s);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1dv(target, v);
 }
 
 inline void QOpenGLFunctions_1_3::glMultiTexCoord1d(GLenum target, GLdouble s)
 {
-    d_1_3_Deprecated->MultiTexCoord1d(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1d(target, s);
 }
 
 inline void QOpenGLFunctions_1_3::glClientActiveTexture(GLenum texture)
 {
-    d_1_3_Deprecated->ClientActiveTexture(texture);
+    d_1_3_Deprecated->f.ClientActiveTexture(texture);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_1_4.cpp b/src/gui/opengl/qopenglfunctions_1_4.cpp
index f3472d1e82..5ff2c24014 100644
--- a/src/gui/opengl/qopenglfunctions_1_4.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_4.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -76,46 +82,36 @@ QOpenGLFunctions_1_4::QOpenGLFunctions_1_4()
 
 QOpenGLFunctions_1_4::~QOpenGLFunctions_1_4()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
-    if (d_1_3_Deprecated && !d_1_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Deprecated->context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        delete d_1_3_Deprecated;
-    }
-    if (d_1_4_Deprecated && !d_1_4_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Deprecated->context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        delete d_1_4_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
+    if (d_1_3_Deprecated)
+        d_1_3_Deprecated->refs.deref();
+    Q_ASSERT(d_1_3_Deprecated->refs.load());
+    if (d_1_4_Deprecated)
+        d_1_4_Deprecated->refs.deref();
+    Q_ASSERT(d_1_4_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_1_4::initializeOpenGLFunctions()
@@ -134,82 +130,42 @@ bool QOpenGLFunctions_1_4::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_3_Deprecated = static_cast<QOpenGLFunctions_1_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_4_Deprecated = static_cast<QOpenGLFunctions_1_4_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_1_4.h b/src/gui/opengl/qopenglfunctions_1_4.h
index f97879a190..eeb99dbb1b 100644
--- a/src/gui/opengl/qopenglfunctions_1_4.h
+++ b/src/gui/opengl/qopenglfunctions_1_4.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -566,2345 +573,2345 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_1_4::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_4::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_1_4::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_1_4::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_1_4::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_1_4::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_1_4::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_1_4::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_4::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_1_4::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_1_4::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_1_4::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_1_4::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_1_4::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_1_4::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_1_4::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_1_4::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_1_4::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_1_4::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_1_4::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_4::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_1_4::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_1_4::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_1_4::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_4::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_1_4::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_1_4::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_4::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_4::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_4::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_1_4::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_1_4::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_1_4::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_1_4::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_1_4::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline void QOpenGLFunctions_1_4::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_1_4::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline GLboolean QOpenGLFunctions_1_4::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_1_4::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_1_4::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_1_4::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_1_4::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_4::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_4::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_4::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_4::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_1_4::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_1_4::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_1_4::glGetPointerv(GLenum pname, GLvoid* *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_1_4::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_1_4::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_4::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_4::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_4::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_1_4::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_1_4::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_1_4::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_1_4::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_4::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_4::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_4::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_4::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_4::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_4::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_1_4::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_1_4::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_1_4::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_1_4::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_1_4::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_1_4::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_1_4::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_4::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_4::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_1_4::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_4::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_4::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_1_4::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_1_4::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_1_4::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_1_4::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_1_4::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_1_4::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_1_4::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_4::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_4::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_4::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_1_4::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_4::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_1_4::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_4::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_4::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_4::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_1_4::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_1_4::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_1_4::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_1_4::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_1_4::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_1_4::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_1_4::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_1_4::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_1_4::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_1_4::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_1_4::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_1_4::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_1_4::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_1_4::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_1_4::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_1_4::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_1_4::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_1_4::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_1_4::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_1_4::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_1_4::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_1_4::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_1_4::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_1_4::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_1_4::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_1_4::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_1_4::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_4::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_1_4::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_1_4::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_1_4::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_1_4::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_1_4::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_1_4::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_1_4::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_1_4::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_1_4::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_1_4::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_1_4::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_4::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_1_4::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_1_4::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_4::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_4::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_4::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_4::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_4::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_4::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_4::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_1_4::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_4::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_4::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_4::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_4::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_4::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_1_4::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_1_4::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_1_4::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_1_4::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_1_4::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_1_4::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_1_4::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_1_4::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_1_4::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_1_4::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_1_4::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_1_4::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_1_4::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_1_4::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_1_4::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_1_4::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_1_4::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_1_4::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_1_4::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_1_4::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_1_4::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_1_4::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_1_4::glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_4::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_4::glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_4::glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_4::glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_4::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_1_4::glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_4::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_1_4::glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_4::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_1_4::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 inline void QOpenGLFunctions_1_4::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_1_4::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_1_4::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_1_4::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_1_4::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_1_4::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_1_4::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_1_4::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_1_4::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_4::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_4::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_1_4::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_1_4::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_4::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_1_4::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_1_4::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_4::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_4::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_1_4::glMultTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixd(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_4::glMultTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixf(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_4::glLoadTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixd(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_4::glLoadTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixf(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord4sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4sv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_3_Deprecated->MultiTexCoord4s(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4s(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord4iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4iv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_3_Deprecated->MultiTexCoord4i(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4i(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord4fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4fv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_3_Deprecated->MultiTexCoord4f(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4f(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4dv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_3_Deprecated->MultiTexCoord4d(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4d(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord3sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3sv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-    d_1_3_Deprecated->MultiTexCoord3s(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3s(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord3iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3iv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
-    d_1_3_Deprecated->MultiTexCoord3i(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3i(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord3fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3fv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_3_Deprecated->MultiTexCoord3f(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3f(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3dv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_3_Deprecated->MultiTexCoord3d(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3d(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord2sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2sv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
-    d_1_3_Deprecated->MultiTexCoord2s(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2s(target, s, t);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord2iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2iv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
-    d_1_3_Deprecated->MultiTexCoord2i(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2i(target, s, t);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord2fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2fv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t)
 {
-    d_1_3_Deprecated->MultiTexCoord2f(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2f(target, s, t);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2dv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
-    d_1_3_Deprecated->MultiTexCoord2d(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2d(target, s, t);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord1sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1sv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord1s(GLenum target, GLshort s)
 {
-    d_1_3_Deprecated->MultiTexCoord1s(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1s(target, s);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord1iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1iv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord1i(GLenum target, GLint s)
 {
-    d_1_3_Deprecated->MultiTexCoord1i(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1i(target, s);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord1fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1fv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord1f(GLenum target, GLfloat s)
 {
-    d_1_3_Deprecated->MultiTexCoord1f(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1f(target, s);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1dv(target, v);
 }
 
 inline void QOpenGLFunctions_1_4::glMultiTexCoord1d(GLenum target, GLdouble s)
 {
-    d_1_3_Deprecated->MultiTexCoord1d(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1d(target, s);
 }
 
 inline void QOpenGLFunctions_1_4::glClientActiveTexture(GLenum texture)
 {
-    d_1_3_Deprecated->ClientActiveTexture(texture);
+    d_1_3_Deprecated->f.ClientActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 deprecated functions
 inline void QOpenGLFunctions_1_4::glWindowPos3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos3sv(v);
+    d_1_4_Deprecated->f.WindowPos3sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_4_Deprecated->WindowPos3s(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos3iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos3iv(v);
+    d_1_4_Deprecated->f.WindowPos3iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_4_Deprecated->WindowPos3i(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos3fv(v);
+    d_1_4_Deprecated->f.WindowPos3fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_4_Deprecated->WindowPos3f(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos3dv(v);
+    d_1_4_Deprecated->f.WindowPos3dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_4_Deprecated->WindowPos3d(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos2sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos2sv(v);
+    d_1_4_Deprecated->f.WindowPos2sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos2s(GLshort x, GLshort y)
 {
-    d_1_4_Deprecated->WindowPos2s(x, y);
+    d_1_4_Deprecated->f.WindowPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos2iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos2iv(v);
+    d_1_4_Deprecated->f.WindowPos2iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos2i(GLint x, GLint y)
 {
-    d_1_4_Deprecated->WindowPos2i(x, y);
+    d_1_4_Deprecated->f.WindowPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos2fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos2fv(v);
+    d_1_4_Deprecated->f.WindowPos2fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos2f(GLfloat x, GLfloat y)
 {
-    d_1_4_Deprecated->WindowPos2f(x, y);
+    d_1_4_Deprecated->f.WindowPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos2dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos2dv(v);
+    d_1_4_Deprecated->f.WindowPos2dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glWindowPos2d(GLdouble x, GLdouble y)
 {
-    d_1_4_Deprecated->WindowPos2d(x, y);
+    d_1_4_Deprecated->f.WindowPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->SecondaryColorPointer(size, type, stride, pointer);
+    d_1_4_Deprecated->f.SecondaryColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3usv(const GLushort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3usv(v);
+    d_1_4_Deprecated->f.SecondaryColor3usv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3us(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3uiv(const GLuint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3uiv(v);
+    d_1_4_Deprecated->f.SecondaryColor3uiv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ui(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3ubv(const GLubyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3ubv(v);
+    d_1_4_Deprecated->f.SecondaryColor3ubv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ub(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3sv(v);
+    d_1_4_Deprecated->f.SecondaryColor3sv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3s(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3iv(const GLint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3iv(v);
+    d_1_4_Deprecated->f.SecondaryColor3iv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3i(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->SecondaryColor3fv(v);
+    d_1_4_Deprecated->f.SecondaryColor3fv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_4_Deprecated->SecondaryColor3f(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->SecondaryColor3dv(v);
+    d_1_4_Deprecated->f.SecondaryColor3dv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_4_Deprecated->SecondaryColor3d(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3bv(const GLbyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3bv(v);
+    d_1_4_Deprecated->f.SecondaryColor3bv(v);
 }
 
 inline void QOpenGLFunctions_1_4::glSecondaryColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3b(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_4::glFogCoordPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->FogCoordPointer(type, stride, pointer);
+    d_1_4_Deprecated->f.FogCoordPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_4::glFogCoorddv(const GLdouble *coord)
 {
-    d_1_4_Deprecated->FogCoorddv(coord);
+    d_1_4_Deprecated->f.FogCoorddv(coord);
 }
 
 inline void QOpenGLFunctions_1_4::glFogCoordd(GLdouble coord)
 {
-    d_1_4_Deprecated->FogCoordd(coord);
+    d_1_4_Deprecated->f.FogCoordd(coord);
 }
 
 inline void QOpenGLFunctions_1_4::glFogCoordfv(const GLfloat *coord)
 {
-    d_1_4_Deprecated->FogCoordfv(coord);
+    d_1_4_Deprecated->f.FogCoordfv(coord);
 }
 
 inline void QOpenGLFunctions_1_4::glFogCoordf(GLfloat coord)
 {
-    d_1_4_Deprecated->FogCoordf(coord);
+    d_1_4_Deprecated->f.FogCoordf(coord);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_1_5.cpp b/src/gui/opengl/qopenglfunctions_1_5.cpp
index ac7e3cd84d..d07f1decec 100644
--- a/src/gui/opengl/qopenglfunctions_1_5.cpp
+++ b/src/gui/opengl/qopenglfunctions_1_5.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -77,50 +83,39 @@ QOpenGLFunctions_1_5::QOpenGLFunctions_1_5()
 
 QOpenGLFunctions_1_5::~QOpenGLFunctions_1_5()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
-    if (d_1_3_Deprecated && !d_1_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Deprecated->context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        delete d_1_3_Deprecated;
-    }
-    if (d_1_4_Deprecated && !d_1_4_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Deprecated->context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        delete d_1_4_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
+    if (d_1_3_Deprecated)
+        d_1_3_Deprecated->refs.deref();
+    Q_ASSERT(d_1_3_Deprecated->refs.load());
+    if (d_1_4_Deprecated)
+        d_1_4_Deprecated->refs.deref();
+    Q_ASSERT(d_1_4_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_1_5::initializeOpenGLFunctions()
@@ -139,90 +134,46 @@ bool QOpenGLFunctions_1_5::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_3_Deprecated = static_cast<QOpenGLFunctions_1_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_4_Deprecated = static_cast<QOpenGLFunctions_1_4_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_1_5.h b/src/gui/opengl/qopenglfunctions_1_5.h
index edd3e9b71e..d5f23c146b 100644
--- a/src/gui/opengl/qopenglfunctions_1_5.h
+++ b/src/gui/opengl/qopenglfunctions_1_5.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -590,2442 +597,2442 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_1_5::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_5::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_1_5::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_1_5::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_1_5::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_1_5::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_1_5::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_1_5::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_5::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_1_5::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_1_5::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_1_5::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_1_5::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_1_5::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_1_5::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_1_5::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_1_5::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_1_5::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_1_5::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_1_5::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_5::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_1_5::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_1_5::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_1_5::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_5::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_1_5::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_1_5::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_5::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_5::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_5::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_1_5::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_1_5::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_1_5::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_1_5::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_1_5::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline void QOpenGLFunctions_1_5::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_1_5::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline GLboolean QOpenGLFunctions_1_5::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_1_5::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_1_5::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_1_5::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_1_5::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_5::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_5::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_5::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_5::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_1_5::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_1_5::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_1_5::glGetPointerv(GLenum pname, GLvoid* *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_1_5::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_1_5::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_5::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_5::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_5::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_1_5::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_1_5::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_1_5::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_1_5::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_5::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_5::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_5::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_5::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_5::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_1_5::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_1_5::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_1_5::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_1_5::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_1_5::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_1_5::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_1_5::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_1_5::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_1_5::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_1_5::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_1_5::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_1_5::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_1_5::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_1_5::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_1_5::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_1_5::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_1_5::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_1_5::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_1_5::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_1_5::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_1_5::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_1_5::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_1_5::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_5::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_5::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_1_5::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_5::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_5::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_1_5::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_1_5::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_1_5::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_1_5::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_1_5::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_1_5::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_1_5::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_5::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_5::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_1_5::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_1_5::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_1_5::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_1_5::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_5::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_5::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_1_5::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_1_5::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_1_5::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_1_5::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_1_5::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_1_5::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_1_5::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_1_5::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_1_5::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_1_5::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_1_5::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_1_5::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_1_5::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_1_5::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_1_5::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_1_5::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_1_5::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_1_5::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_1_5::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_1_5::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_1_5::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_1_5::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_1_5::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_1_5::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_1_5::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_1_5::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_1_5::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_1_5::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_5::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_1_5::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_1_5::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_1_5::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_1_5::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_1_5::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_1_5::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_1_5::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_1_5::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_1_5::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_1_5::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_1_5::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_1_5::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_1_5::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_1_5::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_5::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_5::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_5::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_5::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_5::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_5::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_1_5::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_1_5::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_5::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_5::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_5::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_5::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_1_5::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_1_5::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_1_5::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_1_5::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_1_5::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_1_5::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_1_5::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_1_5::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_1_5::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_1_5::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_1_5::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_1_5::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_1_5::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_1_5::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_1_5::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_1_5::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_1_5::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_1_5::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_1_5::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_1_5::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_1_5::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_1_5::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_1_5::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_1_5::glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_5::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_5::glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_5::glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_5::glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_5::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_1_5::glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_5::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_1_5::glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_5::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_1_5::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 inline void QOpenGLFunctions_1_5::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_1_5::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_1_5::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_1_5::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_1_5::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_1_5::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_1_5::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_1_5::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_1_5::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_1_5::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_5::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_1_5::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_1_5::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_5::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_1_5::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_1_5::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_1_5::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_1_5::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_1_5::glMultTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixd(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_5::glMultTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixf(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_5::glLoadTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixd(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_1_5::glLoadTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixf(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord4sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4sv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_3_Deprecated->MultiTexCoord4s(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4s(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord4iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4iv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_3_Deprecated->MultiTexCoord4i(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4i(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord4fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4fv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_3_Deprecated->MultiTexCoord4f(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4f(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4dv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_3_Deprecated->MultiTexCoord4d(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4d(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord3sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3sv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-    d_1_3_Deprecated->MultiTexCoord3s(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3s(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord3iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3iv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
-    d_1_3_Deprecated->MultiTexCoord3i(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3i(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord3fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3fv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_3_Deprecated->MultiTexCoord3f(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3f(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3dv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_3_Deprecated->MultiTexCoord3d(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3d(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord2sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2sv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
-    d_1_3_Deprecated->MultiTexCoord2s(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2s(target, s, t);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord2iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2iv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
-    d_1_3_Deprecated->MultiTexCoord2i(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2i(target, s, t);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord2fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2fv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t)
 {
-    d_1_3_Deprecated->MultiTexCoord2f(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2f(target, s, t);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2dv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
-    d_1_3_Deprecated->MultiTexCoord2d(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2d(target, s, t);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord1sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1sv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord1s(GLenum target, GLshort s)
 {
-    d_1_3_Deprecated->MultiTexCoord1s(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1s(target, s);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord1iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1iv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord1i(GLenum target, GLint s)
 {
-    d_1_3_Deprecated->MultiTexCoord1i(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1i(target, s);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord1fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1fv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord1f(GLenum target, GLfloat s)
 {
-    d_1_3_Deprecated->MultiTexCoord1f(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1f(target, s);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1dv(target, v);
 }
 
 inline void QOpenGLFunctions_1_5::glMultiTexCoord1d(GLenum target, GLdouble s)
 {
-    d_1_3_Deprecated->MultiTexCoord1d(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1d(target, s);
 }
 
 inline void QOpenGLFunctions_1_5::glClientActiveTexture(GLenum texture)
 {
-    d_1_3_Deprecated->ClientActiveTexture(texture);
+    d_1_3_Deprecated->f.ClientActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 deprecated functions
 inline void QOpenGLFunctions_1_5::glWindowPos3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos3sv(v);
+    d_1_4_Deprecated->f.WindowPos3sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_4_Deprecated->WindowPos3s(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos3iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos3iv(v);
+    d_1_4_Deprecated->f.WindowPos3iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_4_Deprecated->WindowPos3i(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos3fv(v);
+    d_1_4_Deprecated->f.WindowPos3fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_4_Deprecated->WindowPos3f(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos3dv(v);
+    d_1_4_Deprecated->f.WindowPos3dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_4_Deprecated->WindowPos3d(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos2sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos2sv(v);
+    d_1_4_Deprecated->f.WindowPos2sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos2s(GLshort x, GLshort y)
 {
-    d_1_4_Deprecated->WindowPos2s(x, y);
+    d_1_4_Deprecated->f.WindowPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos2iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos2iv(v);
+    d_1_4_Deprecated->f.WindowPos2iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos2i(GLint x, GLint y)
 {
-    d_1_4_Deprecated->WindowPos2i(x, y);
+    d_1_4_Deprecated->f.WindowPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos2fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos2fv(v);
+    d_1_4_Deprecated->f.WindowPos2fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos2f(GLfloat x, GLfloat y)
 {
-    d_1_4_Deprecated->WindowPos2f(x, y);
+    d_1_4_Deprecated->f.WindowPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos2dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos2dv(v);
+    d_1_4_Deprecated->f.WindowPos2dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glWindowPos2d(GLdouble x, GLdouble y)
 {
-    d_1_4_Deprecated->WindowPos2d(x, y);
+    d_1_4_Deprecated->f.WindowPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->SecondaryColorPointer(size, type, stride, pointer);
+    d_1_4_Deprecated->f.SecondaryColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3usv(const GLushort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3usv(v);
+    d_1_4_Deprecated->f.SecondaryColor3usv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3us(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3uiv(const GLuint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3uiv(v);
+    d_1_4_Deprecated->f.SecondaryColor3uiv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ui(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3ubv(const GLubyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3ubv(v);
+    d_1_4_Deprecated->f.SecondaryColor3ubv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ub(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3sv(v);
+    d_1_4_Deprecated->f.SecondaryColor3sv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3s(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3iv(const GLint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3iv(v);
+    d_1_4_Deprecated->f.SecondaryColor3iv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3i(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->SecondaryColor3fv(v);
+    d_1_4_Deprecated->f.SecondaryColor3fv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_4_Deprecated->SecondaryColor3f(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->SecondaryColor3dv(v);
+    d_1_4_Deprecated->f.SecondaryColor3dv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_4_Deprecated->SecondaryColor3d(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3bv(const GLbyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3bv(v);
+    d_1_4_Deprecated->f.SecondaryColor3bv(v);
 }
 
 inline void QOpenGLFunctions_1_5::glSecondaryColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3b(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_1_5::glFogCoordPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->FogCoordPointer(type, stride, pointer);
+    d_1_4_Deprecated->f.FogCoordPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_1_5::glFogCoorddv(const GLdouble *coord)
 {
-    d_1_4_Deprecated->FogCoorddv(coord);
+    d_1_4_Deprecated->f.FogCoorddv(coord);
 }
 
 inline void QOpenGLFunctions_1_5::glFogCoordd(GLdouble coord)
 {
-    d_1_4_Deprecated->FogCoordd(coord);
+    d_1_4_Deprecated->f.FogCoordd(coord);
 }
 
 inline void QOpenGLFunctions_1_5::glFogCoordfv(const GLfloat *coord)
 {
-    d_1_4_Deprecated->FogCoordfv(coord);
+    d_1_4_Deprecated->f.FogCoordfv(coord);
 }
 
 inline void QOpenGLFunctions_1_5::glFogCoordf(GLfloat coord)
 {
-    d_1_4_Deprecated->FogCoordf(coord);
+    d_1_4_Deprecated->f.FogCoordf(coord);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_2_0.cpp b/src/gui/opengl/qopenglfunctions_2_0.cpp
index a263f36e30..b7dc8ef458 100644
--- a/src/gui/opengl/qopenglfunctions_2_0.cpp
+++ b/src/gui/opengl/qopenglfunctions_2_0.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -79,54 +85,42 @@ QOpenGLFunctions_2_0::QOpenGLFunctions_2_0()
 
 QOpenGLFunctions_2_0::~QOpenGLFunctions_2_0()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
-    if (d_1_3_Deprecated && !d_1_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Deprecated->context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        delete d_1_3_Deprecated;
-    }
-    if (d_1_4_Deprecated && !d_1_4_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Deprecated->context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        delete d_1_4_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
+    if (d_1_3_Deprecated)
+        d_1_3_Deprecated->refs.deref();
+    Q_ASSERT(d_1_3_Deprecated->refs.load());
+    if (d_1_4_Deprecated)
+        d_1_4_Deprecated->refs.deref();
+    Q_ASSERT(d_1_4_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_2_0::initializeOpenGLFunctions()
@@ -145,98 +139,50 @@ bool QOpenGLFunctions_2_0::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_3_Deprecated = static_cast<QOpenGLFunctions_1_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_4_Deprecated = static_cast<QOpenGLFunctions_1_4_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_2_0.h b/src/gui/opengl/qopenglfunctions_2_0.h
index d1d3124a34..81b7274a93 100644
--- a/src/gui/opengl/qopenglfunctions_2_0.h
+++ b/src/gui/opengl/qopenglfunctions_2_0.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -689,2729 +696,2729 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_2_0::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_2_0::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_2_0::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_2_0::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_2_0::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_2_0::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_2_0::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_2_0::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_0::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_2_0::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_2_0::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_2_0::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_2_0::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_2_0::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_2_0::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_2_0::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_2_0::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_2_0::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_2_0::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_2_0::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_0::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_2_0::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_2_0::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_2_0::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_0::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_2_0::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_2_0::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_0::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_0::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_2_0::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_2_0::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_2_0::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_2_0::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_2_0::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_2_0::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline void QOpenGLFunctions_2_0::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_2_0::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline GLboolean QOpenGLFunctions_2_0::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_2_0::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_2_0::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_2_0::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_2_0::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_0::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_0::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_2_0::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_2_0::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_2_0::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_2_0::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_2_0::glGetPointerv(GLenum pname, GLvoid* *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_2_0::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_2_0::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_2_0::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_0::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_0::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_2_0::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_2_0::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_2_0::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_2_0::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_2_0::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_2_0::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_2_0::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_2_0::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_2_0::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_2_0::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_2_0::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_2_0::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_2_0::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_2_0::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_2_0::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_2_0::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_2_0::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_2_0::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_2_0::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_2_0::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_2_0::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_2_0::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_2_0::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_2_0::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_2_0::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_2_0::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_2_0::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_2_0::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_2_0::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_0::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_2_0::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_2_0::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_2_0::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_2_0::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_2_0::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_2_0::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_2_0::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_2_0::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_2_0::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_2_0::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_2_0::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_2_0::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_2_0::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_2_0::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_2_0::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_2_0::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_2_0::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_2_0::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_2_0::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_2_0::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_2_0::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_2_0::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_2_0::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_2_0::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_2_0::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_2_0::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_2_0::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_2_0::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_2_0::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_2_0::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_2_0::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_2_0::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_2_0::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_2_0::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_2_0::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_2_0::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_2_0::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_2_0::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_2_0::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_2_0::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_2_0::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_2_0::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_2_0::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_2_0::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_2_0::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_2_0::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_2_0::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_2_0::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_2_0::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_2_0::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_2_0::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_2_0::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_2_0::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_2_0::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_2_0::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_0::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_2_0::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_2_0::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_2_0::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_2_0::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_2_0::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_2_0::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_2_0::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_2_0::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_2_0::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_2_0::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_2_0::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_2_0::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_2_0::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_2_0::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_2_0::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_2_0::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_2_0::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_2_0::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_2_0::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_2_0::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_2_0::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_2_0::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_2_0::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_2_0::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_2_0::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_2_0::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_2_0::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_2_0::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_2_0::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_2_0::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_2_0::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_0::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_2_0::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_2_0::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_2_0::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_2_0::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_2_0::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_2_0::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_2_0::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_2_0::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_2_0::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_2_0::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_2_0::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_2_0::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_2_0::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_2_0::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_2_0::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_2_0::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_2_0::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_2_0::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_2_0::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_2_0::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_2_0::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_2_0::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_2_0::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_2_0::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_2_0::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_2_0::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_2_0::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_2_0::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_2_0::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_2_0::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_2_0::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_2_0::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_2_0::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_2_0::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_2_0::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_2_0::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_2_0::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_2_0::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_2_0::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_2_0::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_2_0::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_2_0::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_2_0::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_2_0::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_2_0::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_2_0::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_2_0::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_2_0::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_0::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_0::glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_0::glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_0::glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_0::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_2_0::glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_0::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_2_0::glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_0::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_2_0::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 inline void QOpenGLFunctions_2_0::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_2_0::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_2_0::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_2_0::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_2_0::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_2_0::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_2_0::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_2_0::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_2_0::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_2_0::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_2_0::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_2_0::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_2_0::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_2_0::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_2_0::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_2_0::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_2_0::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_0::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_2_0::glMultTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixd(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_2_0::glMultTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixf(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_2_0::glLoadTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixd(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_2_0::glLoadTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixf(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord4sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4sv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_3_Deprecated->MultiTexCoord4s(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4s(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord4iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4iv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_3_Deprecated->MultiTexCoord4i(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4i(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord4fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4fv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_3_Deprecated->MultiTexCoord4f(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4f(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4dv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_3_Deprecated->MultiTexCoord4d(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4d(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord3sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3sv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-    d_1_3_Deprecated->MultiTexCoord3s(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3s(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord3iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3iv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
-    d_1_3_Deprecated->MultiTexCoord3i(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3i(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord3fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3fv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_3_Deprecated->MultiTexCoord3f(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3f(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3dv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_3_Deprecated->MultiTexCoord3d(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3d(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord2sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2sv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
-    d_1_3_Deprecated->MultiTexCoord2s(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2s(target, s, t);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord2iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2iv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
-    d_1_3_Deprecated->MultiTexCoord2i(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2i(target, s, t);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord2fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2fv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t)
 {
-    d_1_3_Deprecated->MultiTexCoord2f(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2f(target, s, t);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2dv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
-    d_1_3_Deprecated->MultiTexCoord2d(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2d(target, s, t);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord1sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1sv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord1s(GLenum target, GLshort s)
 {
-    d_1_3_Deprecated->MultiTexCoord1s(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1s(target, s);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord1iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1iv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord1i(GLenum target, GLint s)
 {
-    d_1_3_Deprecated->MultiTexCoord1i(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1i(target, s);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord1fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1fv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord1f(GLenum target, GLfloat s)
 {
-    d_1_3_Deprecated->MultiTexCoord1f(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1f(target, s);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1dv(target, v);
 }
 
 inline void QOpenGLFunctions_2_0::glMultiTexCoord1d(GLenum target, GLdouble s)
 {
-    d_1_3_Deprecated->MultiTexCoord1d(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1d(target, s);
 }
 
 inline void QOpenGLFunctions_2_0::glClientActiveTexture(GLenum texture)
 {
-    d_1_3_Deprecated->ClientActiveTexture(texture);
+    d_1_3_Deprecated->f.ClientActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 deprecated functions
 inline void QOpenGLFunctions_2_0::glWindowPos3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos3sv(v);
+    d_1_4_Deprecated->f.WindowPos3sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_4_Deprecated->WindowPos3s(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos3iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos3iv(v);
+    d_1_4_Deprecated->f.WindowPos3iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_4_Deprecated->WindowPos3i(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos3fv(v);
+    d_1_4_Deprecated->f.WindowPos3fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_4_Deprecated->WindowPos3f(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos3dv(v);
+    d_1_4_Deprecated->f.WindowPos3dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_4_Deprecated->WindowPos3d(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos2sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos2sv(v);
+    d_1_4_Deprecated->f.WindowPos2sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos2s(GLshort x, GLshort y)
 {
-    d_1_4_Deprecated->WindowPos2s(x, y);
+    d_1_4_Deprecated->f.WindowPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos2iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos2iv(v);
+    d_1_4_Deprecated->f.WindowPos2iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos2i(GLint x, GLint y)
 {
-    d_1_4_Deprecated->WindowPos2i(x, y);
+    d_1_4_Deprecated->f.WindowPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos2fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos2fv(v);
+    d_1_4_Deprecated->f.WindowPos2fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos2f(GLfloat x, GLfloat y)
 {
-    d_1_4_Deprecated->WindowPos2f(x, y);
+    d_1_4_Deprecated->f.WindowPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos2dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos2dv(v);
+    d_1_4_Deprecated->f.WindowPos2dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glWindowPos2d(GLdouble x, GLdouble y)
 {
-    d_1_4_Deprecated->WindowPos2d(x, y);
+    d_1_4_Deprecated->f.WindowPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->SecondaryColorPointer(size, type, stride, pointer);
+    d_1_4_Deprecated->f.SecondaryColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3usv(const GLushort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3usv(v);
+    d_1_4_Deprecated->f.SecondaryColor3usv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3us(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3uiv(const GLuint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3uiv(v);
+    d_1_4_Deprecated->f.SecondaryColor3uiv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ui(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3ubv(const GLubyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3ubv(v);
+    d_1_4_Deprecated->f.SecondaryColor3ubv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ub(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3sv(v);
+    d_1_4_Deprecated->f.SecondaryColor3sv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3s(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3iv(const GLint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3iv(v);
+    d_1_4_Deprecated->f.SecondaryColor3iv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3i(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->SecondaryColor3fv(v);
+    d_1_4_Deprecated->f.SecondaryColor3fv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_4_Deprecated->SecondaryColor3f(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->SecondaryColor3dv(v);
+    d_1_4_Deprecated->f.SecondaryColor3dv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_4_Deprecated->SecondaryColor3d(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3bv(const GLbyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3bv(v);
+    d_1_4_Deprecated->f.SecondaryColor3bv(v);
 }
 
 inline void QOpenGLFunctions_2_0::glSecondaryColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3b(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_0::glFogCoordPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->FogCoordPointer(type, stride, pointer);
+    d_1_4_Deprecated->f.FogCoordPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_0::glFogCoorddv(const GLdouble *coord)
 {
-    d_1_4_Deprecated->FogCoorddv(coord);
+    d_1_4_Deprecated->f.FogCoorddv(coord);
 }
 
 inline void QOpenGLFunctions_2_0::glFogCoordd(GLdouble coord)
 {
-    d_1_4_Deprecated->FogCoordd(coord);
+    d_1_4_Deprecated->f.FogCoordd(coord);
 }
 
 inline void QOpenGLFunctions_2_0::glFogCoordfv(const GLfloat *coord)
 {
-    d_1_4_Deprecated->FogCoordfv(coord);
+    d_1_4_Deprecated->f.FogCoordfv(coord);
 }
 
 inline void QOpenGLFunctions_2_0::glFogCoordf(GLfloat coord)
 {
-    d_1_4_Deprecated->FogCoordf(coord);
+    d_1_4_Deprecated->f.FogCoordf(coord);
 }
 
 
@@ -3420,182 +3427,182 @@ inline void QOpenGLFunctions_2_0::glFogCoordf(GLfloat coord)
 // OpenGL 2.0 deprecated functions
 inline void QOpenGLFunctions_2_0::glVertexAttrib4usv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4usv(index, v);
+    d_2_0_Core->f.VertexAttrib4usv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4uiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4uiv(index, v);
+    d_2_0_Core->f.VertexAttrib4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4ubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4ubv(index, v);
+    d_2_0_Core->f.VertexAttrib4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4sv(index, v);
+    d_2_0_Core->f.VertexAttrib4sv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_2_0_Core->VertexAttrib4s(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4s(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4iv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4iv(index, v);
+    d_2_0_Core->f.VertexAttrib4iv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib4fv(index, v);
+    d_2_0_Core->f.VertexAttrib4fv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_2_0_Core->VertexAttrib4f(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4f(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib4dv(index, v);
+    d_2_0_Core->f.VertexAttrib4dv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_2_0_Core->VertexAttrib4d(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4bv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4bv(index, v);
+    d_2_0_Core->f.VertexAttrib4bv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4Nusv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4Nusv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nusv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4Nuiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4Nuiv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nuiv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4Nubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nubv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nubv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-    d_2_0_Core->VertexAttrib4Nub(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4Nub(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4Nsv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4Nsv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nsv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4Niv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4Niv(index, v);
+    d_2_0_Core->f.VertexAttrib4Niv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib4Nbv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nbv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nbv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib3sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib3sv(index, v);
+    d_2_0_Core->f.VertexAttrib3sv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-    d_2_0_Core->VertexAttrib3s(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3s(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib3fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib3fv(index, v);
+    d_2_0_Core->f.VertexAttrib3fv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_2_0_Core->VertexAttrib3f(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3f(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib3dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib3dv(index, v);
+    d_2_0_Core->f.VertexAttrib3dv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_2_0_Core->VertexAttrib3d(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib2sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib2sv(index, v);
+    d_2_0_Core->f.VertexAttrib2sv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib2s(GLuint index, GLshort x, GLshort y)
 {
-    d_2_0_Core->VertexAttrib2s(index, x, y);
+    d_2_0_Core->f.VertexAttrib2s(index, x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib2fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib2fv(index, v);
+    d_2_0_Core->f.VertexAttrib2fv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    d_2_0_Core->VertexAttrib2f(index, x, y);
+    d_2_0_Core->f.VertexAttrib2f(index, x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib2dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib2dv(index, v);
+    d_2_0_Core->f.VertexAttrib2dv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_2_0_Core->VertexAttrib2d(index, x, y);
+    d_2_0_Core->f.VertexAttrib2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib1sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib1sv(index, v);
+    d_2_0_Core->f.VertexAttrib1sv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib1s(GLuint index, GLshort x)
 {
-    d_2_0_Core->VertexAttrib1s(index, x);
+    d_2_0_Core->f.VertexAttrib1s(index, x);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib1fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib1fv(index, v);
+    d_2_0_Core->f.VertexAttrib1fv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    d_2_0_Core->VertexAttrib1f(index, x);
+    d_2_0_Core->f.VertexAttrib1f(index, x);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib1dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib1dv(index, v);
+    d_2_0_Core->f.VertexAttrib1dv(index, v);
 }
 
 inline void QOpenGLFunctions_2_0::glVertexAttrib1d(GLuint index, GLdouble x)
 {
-    d_2_0_Core->VertexAttrib1d(index, x);
+    d_2_0_Core->f.VertexAttrib1d(index, x);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_2_1.cpp b/src/gui/opengl/qopenglfunctions_2_1.cpp
index 1febd3b046..e756685d10 100644
--- a/src/gui/opengl/qopenglfunctions_2_1.cpp
+++ b/src/gui/opengl/qopenglfunctions_2_1.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -80,58 +86,45 @@ QOpenGLFunctions_2_1::QOpenGLFunctions_2_1()
 
 QOpenGLFunctions_2_1::~QOpenGLFunctions_2_1()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
-    if (d_1_3_Deprecated && !d_1_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Deprecated->context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        delete d_1_3_Deprecated;
-    }
-    if (d_1_4_Deprecated && !d_1_4_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Deprecated->context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        delete d_1_4_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
+    if (d_1_3_Deprecated)
+        d_1_3_Deprecated->refs.deref();
+    Q_ASSERT(d_1_3_Deprecated->refs.load());
+    if (d_1_4_Deprecated)
+        d_1_4_Deprecated->refs.deref();
+    Q_ASSERT(d_1_4_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_2_1::initializeOpenGLFunctions()
@@ -150,106 +143,54 @@ bool QOpenGLFunctions_2_1::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_3_Deprecated = static_cast<QOpenGLFunctions_1_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_4_Deprecated = static_cast<QOpenGLFunctions_1_4_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_2_1.h b/src/gui/opengl/qopenglfunctions_2_1.h
index 900b8753c4..7bac5af9da 100644
--- a/src/gui/opengl/qopenglfunctions_2_1.h
+++ b/src/gui/opengl/qopenglfunctions_2_1.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -700,2761 +707,2761 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_2_1::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_2_1::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_2_1::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_2_1::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_2_1::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_2_1::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_2_1::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_2_1::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_1::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_2_1::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_2_1::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_2_1::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_2_1::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_2_1::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_2_1::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_2_1::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_2_1::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_2_1::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_2_1::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_2_1::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_1::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_2_1::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_2_1::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_2_1::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_1::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_2_1::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_2_1::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_1::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_1::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_2_1::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_2_1::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_2_1::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_2_1::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_2_1::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_2_1::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline void QOpenGLFunctions_2_1::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_2_1::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline GLboolean QOpenGLFunctions_2_1::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_2_1::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_2_1::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_2_1::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_2_1::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_1::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_1::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_2_1::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_2_1::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_2_1::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_2_1::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_2_1::glGetPointerv(GLenum pname, GLvoid* *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_2_1::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_2_1::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_2_1::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_1::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_1::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_2_1::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_2_1::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_2_1::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_2_1::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_2_1::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_2_1::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_2_1::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_2_1::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_2_1::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_2_1::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_2_1::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_2_1::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_2_1::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_2_1::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_2_1::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_2_1::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_2_1::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_2_1::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_2_1::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_2_1::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_2_1::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_2_1::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_2_1::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_2_1::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_2_1::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_2_1::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_2_1::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_2_1::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_2_1::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_1::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_2_1::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_2_1::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_2_1::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_2_1::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_2_1::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_2_1::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_2_1::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_2_1::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_2_1::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_2_1::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_2_1::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_2_1::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_2_1::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_2_1::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_2_1::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_2_1::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_2_1::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_2_1::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_2_1::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_2_1::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_2_1::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_2_1::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_2_1::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_2_1::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_2_1::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_2_1::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_2_1::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_2_1::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_2_1::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_2_1::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_2_1::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_2_1::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_2_1::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_2_1::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_2_1::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_2_1::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_2_1::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_2_1::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_2_1::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_2_1::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_2_1::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_2_1::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_2_1::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_2_1::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_2_1::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_2_1::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_2_1::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_2_1::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_2_1::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_2_1::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_2_1::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_2_1::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_2_1::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_2_1::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_2_1::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_2_1::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_2_1::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_2_1::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_2_1::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_2_1::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_2_1::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_2_1::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_2_1::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_2_1::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_2_1::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_2_1::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_2_1::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_2_1::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_2_1::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_2_1::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_2_1::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_2_1::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_2_1::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_2_1::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_2_1::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_2_1::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_2_1::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_2_1::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_2_1::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_2_1::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_2_1::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_2_1::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_2_1::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_2_1::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_2_1::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_2_1::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_2_1::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_1::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_2_1::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_2_1::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_2_1::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_2_1::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_2_1::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_2_1::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_2_1::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_2_1::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_2_1::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_2_1::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_2_1::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_2_1::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_2_1::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_2_1::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_2_1::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_2_1::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_2_1::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_2_1::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_2_1::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_2_1::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_2_1::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_2_1::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_2_1::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_2_1::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_2_1::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_2_1::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_2_1::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_2_1::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_2_1::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_2_1::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_2_1::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_2_1::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_2_1::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_2_1::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_2_1::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_2_1::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_2_1::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_2_1::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_2_1::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_2_1::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_2_1::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_2_1::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_2_1::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_2_1::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_2_1::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_2_1::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_2_1::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_2_1::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_1::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_1::glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_1::glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_1::glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_1::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_2_1::glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_1::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_2_1::glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_1::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_2_1::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 inline void QOpenGLFunctions_2_1::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_2_1::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_2_1::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_2_1::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_2_1::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_2_1::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_2_1::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_2_1::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_2_1::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_2_1::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_2_1::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_2_1::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_2_1::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_2_1::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_2_1::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_2_1::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_2_1::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_2_1::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_2_1::glMultTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixd(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_2_1::glMultTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixf(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_2_1::glLoadTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixd(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_2_1::glLoadTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixf(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord4sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4sv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_3_Deprecated->MultiTexCoord4s(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4s(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord4iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4iv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_3_Deprecated->MultiTexCoord4i(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4i(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord4fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4fv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_3_Deprecated->MultiTexCoord4f(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4f(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4dv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_3_Deprecated->MultiTexCoord4d(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4d(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord3sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3sv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-    d_1_3_Deprecated->MultiTexCoord3s(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3s(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord3iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3iv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
-    d_1_3_Deprecated->MultiTexCoord3i(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3i(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord3fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3fv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_3_Deprecated->MultiTexCoord3f(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3f(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3dv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_3_Deprecated->MultiTexCoord3d(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3d(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord2sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2sv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
-    d_1_3_Deprecated->MultiTexCoord2s(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2s(target, s, t);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord2iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2iv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
-    d_1_3_Deprecated->MultiTexCoord2i(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2i(target, s, t);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord2fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2fv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t)
 {
-    d_1_3_Deprecated->MultiTexCoord2f(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2f(target, s, t);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2dv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
-    d_1_3_Deprecated->MultiTexCoord2d(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2d(target, s, t);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord1sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1sv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord1s(GLenum target, GLshort s)
 {
-    d_1_3_Deprecated->MultiTexCoord1s(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1s(target, s);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord1iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1iv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord1i(GLenum target, GLint s)
 {
-    d_1_3_Deprecated->MultiTexCoord1i(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1i(target, s);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord1fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1fv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord1f(GLenum target, GLfloat s)
 {
-    d_1_3_Deprecated->MultiTexCoord1f(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1f(target, s);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1dv(target, v);
 }
 
 inline void QOpenGLFunctions_2_1::glMultiTexCoord1d(GLenum target, GLdouble s)
 {
-    d_1_3_Deprecated->MultiTexCoord1d(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1d(target, s);
 }
 
 inline void QOpenGLFunctions_2_1::glClientActiveTexture(GLenum texture)
 {
-    d_1_3_Deprecated->ClientActiveTexture(texture);
+    d_1_3_Deprecated->f.ClientActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 deprecated functions
 inline void QOpenGLFunctions_2_1::glWindowPos3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos3sv(v);
+    d_1_4_Deprecated->f.WindowPos3sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_4_Deprecated->WindowPos3s(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos3iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos3iv(v);
+    d_1_4_Deprecated->f.WindowPos3iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_4_Deprecated->WindowPos3i(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos3fv(v);
+    d_1_4_Deprecated->f.WindowPos3fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_4_Deprecated->WindowPos3f(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos3dv(v);
+    d_1_4_Deprecated->f.WindowPos3dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_4_Deprecated->WindowPos3d(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos2sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos2sv(v);
+    d_1_4_Deprecated->f.WindowPos2sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos2s(GLshort x, GLshort y)
 {
-    d_1_4_Deprecated->WindowPos2s(x, y);
+    d_1_4_Deprecated->f.WindowPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos2iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos2iv(v);
+    d_1_4_Deprecated->f.WindowPos2iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos2i(GLint x, GLint y)
 {
-    d_1_4_Deprecated->WindowPos2i(x, y);
+    d_1_4_Deprecated->f.WindowPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos2fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos2fv(v);
+    d_1_4_Deprecated->f.WindowPos2fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos2f(GLfloat x, GLfloat y)
 {
-    d_1_4_Deprecated->WindowPos2f(x, y);
+    d_1_4_Deprecated->f.WindowPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos2dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos2dv(v);
+    d_1_4_Deprecated->f.WindowPos2dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glWindowPos2d(GLdouble x, GLdouble y)
 {
-    d_1_4_Deprecated->WindowPos2d(x, y);
+    d_1_4_Deprecated->f.WindowPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->SecondaryColorPointer(size, type, stride, pointer);
+    d_1_4_Deprecated->f.SecondaryColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3usv(const GLushort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3usv(v);
+    d_1_4_Deprecated->f.SecondaryColor3usv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3us(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3uiv(const GLuint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3uiv(v);
+    d_1_4_Deprecated->f.SecondaryColor3uiv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ui(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3ubv(const GLubyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3ubv(v);
+    d_1_4_Deprecated->f.SecondaryColor3ubv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ub(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3sv(v);
+    d_1_4_Deprecated->f.SecondaryColor3sv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3s(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3iv(const GLint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3iv(v);
+    d_1_4_Deprecated->f.SecondaryColor3iv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3i(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->SecondaryColor3fv(v);
+    d_1_4_Deprecated->f.SecondaryColor3fv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_4_Deprecated->SecondaryColor3f(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->SecondaryColor3dv(v);
+    d_1_4_Deprecated->f.SecondaryColor3dv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_4_Deprecated->SecondaryColor3d(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3bv(const GLbyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3bv(v);
+    d_1_4_Deprecated->f.SecondaryColor3bv(v);
 }
 
 inline void QOpenGLFunctions_2_1::glSecondaryColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3b(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_2_1::glFogCoordPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->FogCoordPointer(type, stride, pointer);
+    d_1_4_Deprecated->f.FogCoordPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_2_1::glFogCoorddv(const GLdouble *coord)
 {
-    d_1_4_Deprecated->FogCoorddv(coord);
+    d_1_4_Deprecated->f.FogCoorddv(coord);
 }
 
 inline void QOpenGLFunctions_2_1::glFogCoordd(GLdouble coord)
 {
-    d_1_4_Deprecated->FogCoordd(coord);
+    d_1_4_Deprecated->f.FogCoordd(coord);
 }
 
 inline void QOpenGLFunctions_2_1::glFogCoordfv(const GLfloat *coord)
 {
-    d_1_4_Deprecated->FogCoordfv(coord);
+    d_1_4_Deprecated->f.FogCoordfv(coord);
 }
 
 inline void QOpenGLFunctions_2_1::glFogCoordf(GLfloat coord)
 {
-    d_1_4_Deprecated->FogCoordf(coord);
+    d_1_4_Deprecated->f.FogCoordf(coord);
 }
 
 
@@ -3463,182 +3470,182 @@ inline void QOpenGLFunctions_2_1::glFogCoordf(GLfloat coord)
 // OpenGL 2.0 deprecated functions
 inline void QOpenGLFunctions_2_1::glVertexAttrib4usv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4usv(index, v);
+    d_2_0_Core->f.VertexAttrib4usv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4uiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4uiv(index, v);
+    d_2_0_Core->f.VertexAttrib4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4ubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4ubv(index, v);
+    d_2_0_Core->f.VertexAttrib4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4sv(index, v);
+    d_2_0_Core->f.VertexAttrib4sv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_2_0_Core->VertexAttrib4s(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4s(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4iv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4iv(index, v);
+    d_2_0_Core->f.VertexAttrib4iv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib4fv(index, v);
+    d_2_0_Core->f.VertexAttrib4fv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_2_0_Core->VertexAttrib4f(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4f(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib4dv(index, v);
+    d_2_0_Core->f.VertexAttrib4dv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_2_0_Core->VertexAttrib4d(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4bv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4bv(index, v);
+    d_2_0_Core->f.VertexAttrib4bv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4Nusv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4Nusv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nusv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4Nuiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4Nuiv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nuiv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4Nubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nubv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nubv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-    d_2_0_Core->VertexAttrib4Nub(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4Nub(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4Nsv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4Nsv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nsv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4Niv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4Niv(index, v);
+    d_2_0_Core->f.VertexAttrib4Niv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib4Nbv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nbv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nbv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib3sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib3sv(index, v);
+    d_2_0_Core->f.VertexAttrib3sv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-    d_2_0_Core->VertexAttrib3s(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3s(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib3fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib3fv(index, v);
+    d_2_0_Core->f.VertexAttrib3fv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_2_0_Core->VertexAttrib3f(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3f(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib3dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib3dv(index, v);
+    d_2_0_Core->f.VertexAttrib3dv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_2_0_Core->VertexAttrib3d(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib2sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib2sv(index, v);
+    d_2_0_Core->f.VertexAttrib2sv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib2s(GLuint index, GLshort x, GLshort y)
 {
-    d_2_0_Core->VertexAttrib2s(index, x, y);
+    d_2_0_Core->f.VertexAttrib2s(index, x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib2fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib2fv(index, v);
+    d_2_0_Core->f.VertexAttrib2fv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    d_2_0_Core->VertexAttrib2f(index, x, y);
+    d_2_0_Core->f.VertexAttrib2f(index, x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib2dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib2dv(index, v);
+    d_2_0_Core->f.VertexAttrib2dv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_2_0_Core->VertexAttrib2d(index, x, y);
+    d_2_0_Core->f.VertexAttrib2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib1sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib1sv(index, v);
+    d_2_0_Core->f.VertexAttrib1sv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib1s(GLuint index, GLshort x)
 {
-    d_2_0_Core->VertexAttrib1s(index, x);
+    d_2_0_Core->f.VertexAttrib1s(index, x);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib1fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib1fv(index, v);
+    d_2_0_Core->f.VertexAttrib1fv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    d_2_0_Core->VertexAttrib1f(index, x);
+    d_2_0_Core->f.VertexAttrib1f(index, x);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib1dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib1dv(index, v);
+    d_2_0_Core->f.VertexAttrib1dv(index, v);
 }
 
 inline void QOpenGLFunctions_2_1::glVertexAttrib1d(GLuint index, GLdouble x)
 {
-    d_2_0_Core->VertexAttrib1d(index, x);
+    d_2_0_Core->f.VertexAttrib1d(index, x);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_3_0.cpp b/src/gui/opengl/qopenglfunctions_3_0.cpp
index 2522941dd4..ee7f92855d 100644
--- a/src/gui/opengl/qopenglfunctions_3_0.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_0.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -82,62 +88,48 @@ QOpenGLFunctions_3_0::QOpenGLFunctions_3_0()
 
 QOpenGLFunctions_3_0::~QOpenGLFunctions_3_0()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
-    if (d_1_3_Deprecated && !d_1_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Deprecated->context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        delete d_1_3_Deprecated;
-    }
-    if (d_1_4_Deprecated && !d_1_4_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Deprecated->context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        delete d_1_4_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
+    if (d_1_3_Deprecated)
+        d_1_3_Deprecated->refs.deref();
+    Q_ASSERT(d_1_3_Deprecated->refs.load());
+    if (d_1_4_Deprecated)
+        d_1_4_Deprecated->refs.deref();
+    Q_ASSERT(d_1_4_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_3_0::initializeOpenGLFunctions()
@@ -156,114 +148,58 @@ bool QOpenGLFunctions_3_0::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_3_Deprecated = static_cast<QOpenGLFunctions_1_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_4_Deprecated = static_cast<QOpenGLFunctions_1_4_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_3_0.h b/src/gui/opengl/qopenglfunctions_3_0.h
index c9ed7493c4..da8d5ec5ff 100644
--- a/src/gui/opengl/qopenglfunctions_3_0.h
+++ b/src/gui/opengl/qopenglfunctions_3_0.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -790,3083 +797,3083 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_3_0::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_0::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_3_0::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_3_0::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_3_0::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_3_0::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_3_0::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_3_0::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_0::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_3_0::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_3_0::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_3_0::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_3_0::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_3_0::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_3_0::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_3_0::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_3_0::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_3_0::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_3_0::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_3_0::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_0::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_3_0::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_3_0::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_3_0::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_0::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_3_0::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_3_0::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_0::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_0::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_0::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_3_0::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_3_0::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_3_0::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_3_0::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_3_0::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline void QOpenGLFunctions_3_0::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_3_0::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline GLboolean QOpenGLFunctions_3_0::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_3_0::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_3_0::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_3_0::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_3_0::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_0::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_0::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_0::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_0::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_3_0::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_3_0::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_3_0::glGetPointerv(GLenum pname, GLvoid* *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_3_0::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_3_0::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_0::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_0::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_0::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_3_0::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_3_0::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_3_0::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_3_0::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_0::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_0::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_0::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_0::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_0::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_0::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_3_0::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_3_0::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_3_0::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_3_0::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_3_0::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_3_0::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_3_0::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_3_0::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_3_0::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_3_0::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_3_0::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_3_0::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_3_0::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_3_0::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_3_0::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_3_0::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_3_0::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_3_0::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_3_0::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_0::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_3_0::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_3_0::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_3_0::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_3_0::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_3_0::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_3_0::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_3_0::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_3_0::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_3_0::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_0::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_3_0::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_3_0::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_3_0::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_3_0::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_0::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_3_0::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_0::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_0::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_3_0::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_3_0::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_3_0::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_3_0::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_3_0::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_3_0::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_3_0::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_3_0::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_3_0::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_3_0::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_3_0::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_3_0::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_3_0::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_3_0::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_3_0::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_3_0::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_3_0::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_3_0::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_3_0::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_3_0::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline GLvoid* QOpenGLFunctions_3_0::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_3_0::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_3_0::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_3_0::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_3_0::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_3_0::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_3_0::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_3_0::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_3_0::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_3_0::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_3_0::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_3_0::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_3_0::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_3_0::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_3_0::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_3_0::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_3_0::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_3_0::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_3_0::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_3_0::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_3_0::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_3_0::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_0::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_0::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_0::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_0::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_3_0::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_0::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_3_0::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_0::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_3_0::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_3_0::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_3_0::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_0::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_3_0::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_3_0::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_3_0::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_3_0::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_3_0::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_3_0::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_3_0::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_3_0::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_3_0::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_3_0::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_3_0::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_3_0::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_3_0::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_3_0::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_3_0::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_3_0::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_3_0::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_3_0::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_3_0::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_3_0::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_3_0::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_3_0::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_3_0::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_3_0::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_3_0::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_3_0::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_3_0::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_3_0::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_3_0::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_3_0::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_0::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_3_0::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_3_0::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_3_0::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_3_0::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_3_0::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_3_0::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_3_0::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_3_0::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_3_0::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_3_0::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_3_0::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_3_0::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_3_0::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_3_0::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_3_0::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_3_0::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_3_0::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_3_0::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_0::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_0::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_3_0::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_3_0::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_3_0::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_3_0::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_3_0::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_3_0::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_3_0::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_3_0::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_3_0::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_3_0::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_3_0::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_0::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_3_0::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_3_0::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_3_0::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_3_0::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_3_0::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_3_0::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_3_0::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_3_0::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_3_0::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_3_0::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_3_0::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_0::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_3_0::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_3_0::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_3_0::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_3_0::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_3_0::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_3_0::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_3_0::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_3_0::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_3_0::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_0::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_0::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_0::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_0::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_0::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_3_0::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_3_0::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_3_0::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_3_0::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_3_0::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_3_0::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_3_0::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_3_0::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_3_0::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_3_0::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_3_0::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_3_0::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_3_0::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_3_0::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_3_0::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_3_0::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_3_0::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_3_0::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_3_0::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_3_0::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_3_0::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_3_0::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_0::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_0::glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_0::glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_0::glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_0::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_3_0::glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_0::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_3_0::glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_0::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_3_0::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 inline void QOpenGLFunctions_3_0::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_3_0::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_3_0::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_3_0::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_3_0::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_3_0::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_3_0::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_3_0::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_3_0::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_0::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_0::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_3_0::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_3_0::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_0::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_3_0::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_3_0::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_0::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_0::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_3_0::glMultTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixd(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_3_0::glMultTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixf(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_3_0::glLoadTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixd(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_3_0::glLoadTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixf(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord4sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4sv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_3_Deprecated->MultiTexCoord4s(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4s(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord4iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4iv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_3_Deprecated->MultiTexCoord4i(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4i(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord4fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4fv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_3_Deprecated->MultiTexCoord4f(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4f(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4dv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_3_Deprecated->MultiTexCoord4d(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4d(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord3sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3sv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-    d_1_3_Deprecated->MultiTexCoord3s(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3s(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord3iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3iv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
-    d_1_3_Deprecated->MultiTexCoord3i(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3i(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord3fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3fv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_3_Deprecated->MultiTexCoord3f(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3f(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3dv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_3_Deprecated->MultiTexCoord3d(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3d(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord2sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2sv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
-    d_1_3_Deprecated->MultiTexCoord2s(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2s(target, s, t);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord2iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2iv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
-    d_1_3_Deprecated->MultiTexCoord2i(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2i(target, s, t);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord2fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2fv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t)
 {
-    d_1_3_Deprecated->MultiTexCoord2f(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2f(target, s, t);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2dv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
-    d_1_3_Deprecated->MultiTexCoord2d(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2d(target, s, t);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord1sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1sv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord1s(GLenum target, GLshort s)
 {
-    d_1_3_Deprecated->MultiTexCoord1s(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1s(target, s);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord1iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1iv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord1i(GLenum target, GLint s)
 {
-    d_1_3_Deprecated->MultiTexCoord1i(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1i(target, s);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord1fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1fv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord1f(GLenum target, GLfloat s)
 {
-    d_1_3_Deprecated->MultiTexCoord1f(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1f(target, s);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1dv(target, v);
 }
 
 inline void QOpenGLFunctions_3_0::glMultiTexCoord1d(GLenum target, GLdouble s)
 {
-    d_1_3_Deprecated->MultiTexCoord1d(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1d(target, s);
 }
 
 inline void QOpenGLFunctions_3_0::glClientActiveTexture(GLenum texture)
 {
-    d_1_3_Deprecated->ClientActiveTexture(texture);
+    d_1_3_Deprecated->f.ClientActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 deprecated functions
 inline void QOpenGLFunctions_3_0::glWindowPos3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos3sv(v);
+    d_1_4_Deprecated->f.WindowPos3sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_4_Deprecated->WindowPos3s(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos3iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos3iv(v);
+    d_1_4_Deprecated->f.WindowPos3iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_4_Deprecated->WindowPos3i(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos3fv(v);
+    d_1_4_Deprecated->f.WindowPos3fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_4_Deprecated->WindowPos3f(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos3dv(v);
+    d_1_4_Deprecated->f.WindowPos3dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_4_Deprecated->WindowPos3d(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos2sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos2sv(v);
+    d_1_4_Deprecated->f.WindowPos2sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos2s(GLshort x, GLshort y)
 {
-    d_1_4_Deprecated->WindowPos2s(x, y);
+    d_1_4_Deprecated->f.WindowPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos2iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos2iv(v);
+    d_1_4_Deprecated->f.WindowPos2iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos2i(GLint x, GLint y)
 {
-    d_1_4_Deprecated->WindowPos2i(x, y);
+    d_1_4_Deprecated->f.WindowPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos2fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos2fv(v);
+    d_1_4_Deprecated->f.WindowPos2fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos2f(GLfloat x, GLfloat y)
 {
-    d_1_4_Deprecated->WindowPos2f(x, y);
+    d_1_4_Deprecated->f.WindowPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos2dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos2dv(v);
+    d_1_4_Deprecated->f.WindowPos2dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glWindowPos2d(GLdouble x, GLdouble y)
 {
-    d_1_4_Deprecated->WindowPos2d(x, y);
+    d_1_4_Deprecated->f.WindowPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->SecondaryColorPointer(size, type, stride, pointer);
+    d_1_4_Deprecated->f.SecondaryColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3usv(const GLushort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3usv(v);
+    d_1_4_Deprecated->f.SecondaryColor3usv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3us(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3uiv(const GLuint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3uiv(v);
+    d_1_4_Deprecated->f.SecondaryColor3uiv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ui(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3ubv(const GLubyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3ubv(v);
+    d_1_4_Deprecated->f.SecondaryColor3ubv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ub(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3sv(v);
+    d_1_4_Deprecated->f.SecondaryColor3sv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3s(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3iv(const GLint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3iv(v);
+    d_1_4_Deprecated->f.SecondaryColor3iv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3i(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->SecondaryColor3fv(v);
+    d_1_4_Deprecated->f.SecondaryColor3fv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_4_Deprecated->SecondaryColor3f(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->SecondaryColor3dv(v);
+    d_1_4_Deprecated->f.SecondaryColor3dv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_4_Deprecated->SecondaryColor3d(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3bv(const GLbyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3bv(v);
+    d_1_4_Deprecated->f.SecondaryColor3bv(v);
 }
 
 inline void QOpenGLFunctions_3_0::glSecondaryColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3b(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_0::glFogCoordPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->FogCoordPointer(type, stride, pointer);
+    d_1_4_Deprecated->f.FogCoordPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_0::glFogCoorddv(const GLdouble *coord)
 {
-    d_1_4_Deprecated->FogCoorddv(coord);
+    d_1_4_Deprecated->f.FogCoorddv(coord);
 }
 
 inline void QOpenGLFunctions_3_0::glFogCoordd(GLdouble coord)
 {
-    d_1_4_Deprecated->FogCoordd(coord);
+    d_1_4_Deprecated->f.FogCoordd(coord);
 }
 
 inline void QOpenGLFunctions_3_0::glFogCoordfv(const GLfloat *coord)
 {
-    d_1_4_Deprecated->FogCoordfv(coord);
+    d_1_4_Deprecated->f.FogCoordfv(coord);
 }
 
 inline void QOpenGLFunctions_3_0::glFogCoordf(GLfloat coord)
 {
-    d_1_4_Deprecated->FogCoordf(coord);
+    d_1_4_Deprecated->f.FogCoordf(coord);
 }
 
 
@@ -3875,182 +3882,182 @@ inline void QOpenGLFunctions_3_0::glFogCoordf(GLfloat coord)
 // OpenGL 2.0 deprecated functions
 inline void QOpenGLFunctions_3_0::glVertexAttrib4usv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4usv(index, v);
+    d_2_0_Core->f.VertexAttrib4usv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4uiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4uiv(index, v);
+    d_2_0_Core->f.VertexAttrib4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4ubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4ubv(index, v);
+    d_2_0_Core->f.VertexAttrib4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4sv(index, v);
+    d_2_0_Core->f.VertexAttrib4sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_2_0_Core->VertexAttrib4s(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4s(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4iv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4iv(index, v);
+    d_2_0_Core->f.VertexAttrib4iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib4fv(index, v);
+    d_2_0_Core->f.VertexAttrib4fv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_2_0_Core->VertexAttrib4f(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4f(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib4dv(index, v);
+    d_2_0_Core->f.VertexAttrib4dv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_2_0_Core->VertexAttrib4d(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4bv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4bv(index, v);
+    d_2_0_Core->f.VertexAttrib4bv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4Nusv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4Nusv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nusv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4Nuiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4Nuiv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nuiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4Nubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nubv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nubv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-    d_2_0_Core->VertexAttrib4Nub(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4Nub(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4Nsv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4Nsv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nsv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4Niv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4Niv(index, v);
+    d_2_0_Core->f.VertexAttrib4Niv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib4Nbv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nbv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nbv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib3sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib3sv(index, v);
+    d_2_0_Core->f.VertexAttrib3sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-    d_2_0_Core->VertexAttrib3s(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3s(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib3fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib3fv(index, v);
+    d_2_0_Core->f.VertexAttrib3fv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_2_0_Core->VertexAttrib3f(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3f(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib3dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib3dv(index, v);
+    d_2_0_Core->f.VertexAttrib3dv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_2_0_Core->VertexAttrib3d(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib2sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib2sv(index, v);
+    d_2_0_Core->f.VertexAttrib2sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib2s(GLuint index, GLshort x, GLshort y)
 {
-    d_2_0_Core->VertexAttrib2s(index, x, y);
+    d_2_0_Core->f.VertexAttrib2s(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib2fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib2fv(index, v);
+    d_2_0_Core->f.VertexAttrib2fv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    d_2_0_Core->VertexAttrib2f(index, x, y);
+    d_2_0_Core->f.VertexAttrib2f(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib2dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib2dv(index, v);
+    d_2_0_Core->f.VertexAttrib2dv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_2_0_Core->VertexAttrib2d(index, x, y);
+    d_2_0_Core->f.VertexAttrib2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib1sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib1sv(index, v);
+    d_2_0_Core->f.VertexAttrib1sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib1s(GLuint index, GLshort x)
 {
-    d_2_0_Core->VertexAttrib1s(index, x);
+    d_2_0_Core->f.VertexAttrib1s(index, x);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib1fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib1fv(index, v);
+    d_2_0_Core->f.VertexAttrib1fv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    d_2_0_Core->VertexAttrib1f(index, x);
+    d_2_0_Core->f.VertexAttrib1f(index, x);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib1dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib1dv(index, v);
+    d_2_0_Core->f.VertexAttrib1dv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttrib1d(GLuint index, GLdouble x)
 {
-    d_2_0_Core->VertexAttrib1d(index, x);
+    d_2_0_Core->f.VertexAttrib1d(index, x);
 }
 
 
@@ -4059,102 +4066,102 @@ inline void QOpenGLFunctions_3_0::glVertexAttrib1d(GLuint index, GLdouble x)
 // OpenGL 3.0 deprecated functions
 inline void QOpenGLFunctions_3_0::glVertexAttribI4usv(GLuint index, const GLushort *v)
 {
-    d_3_0_Core->VertexAttribI4usv(index, v);
+    d_3_0_Core->f.VertexAttribI4usv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI4ubv(GLuint index, const GLubyte *v)
 {
-    d_3_0_Core->VertexAttribI4ubv(index, v);
+    d_3_0_Core->f.VertexAttribI4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI4sv(GLuint index, const GLshort *v)
 {
-    d_3_0_Core->VertexAttribI4sv(index, v);
+    d_3_0_Core->f.VertexAttribI4sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI4bv(GLuint index, const GLbyte *v)
 {
-    d_3_0_Core->VertexAttribI4bv(index, v);
+    d_3_0_Core->f.VertexAttribI4bv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI4uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI4uiv(index, v);
+    d_3_0_Core->f.VertexAttribI4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI3uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI3uiv(index, v);
+    d_3_0_Core->f.VertexAttribI3uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI2uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI2uiv(index, v);
+    d_3_0_Core->f.VertexAttribI2uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI1uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI1uiv(index, v);
+    d_3_0_Core->f.VertexAttribI1uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI4iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI4iv(index, v);
+    d_3_0_Core->f.VertexAttribI4iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI3iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI3iv(index, v);
+    d_3_0_Core->f.VertexAttribI3iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI2iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI2iv(index, v);
+    d_3_0_Core->f.VertexAttribI2iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI1iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI1iv(index, v);
+    d_3_0_Core->f.VertexAttribI1iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
-    d_3_0_Core->VertexAttribI4ui(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4ui(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI3ui(GLuint index, GLuint x, GLuint y, GLuint z)
 {
-    d_3_0_Core->VertexAttribI3ui(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3ui(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI2ui(GLuint index, GLuint x, GLuint y)
 {
-    d_3_0_Core->VertexAttribI2ui(index, x, y);
+    d_3_0_Core->f.VertexAttribI2ui(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI1ui(GLuint index, GLuint x)
 {
-    d_3_0_Core->VertexAttribI1ui(index, x);
+    d_3_0_Core->f.VertexAttribI1ui(index, x);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
-    d_3_0_Core->VertexAttribI4i(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4i(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI3i(GLuint index, GLint x, GLint y, GLint z)
 {
-    d_3_0_Core->VertexAttribI3i(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3i(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI2i(GLuint index, GLint x, GLint y)
 {
-    d_3_0_Core->VertexAttribI2i(index, x, y);
+    d_3_0_Core->f.VertexAttribI2i(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_0::glVertexAttribI1i(GLuint index, GLint x)
 {
-    d_3_0_Core->VertexAttribI1i(index, x);
+    d_3_0_Core->f.VertexAttribI1i(index, x);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_3_1.cpp b/src/gui/opengl/qopenglfunctions_3_1.cpp
index 80512821bb..a459ddf244 100644
--- a/src/gui/opengl/qopenglfunctions_3_1.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_1.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -76,46 +82,36 @@ QOpenGLFunctions_3_1::QOpenGLFunctions_3_1()
 
 QOpenGLFunctions_3_1::~QOpenGLFunctions_3_1()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
 }
 
 bool QOpenGLFunctions_3_1::initializeOpenGLFunctions()
@@ -134,82 +130,42 @@ bool QOpenGLFunctions_3_1::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_3_1.h b/src/gui/opengl/qopenglfunctions_3_1.h
index da726150b9..d5957381e9 100644
--- a/src/gui/opengl/qopenglfunctions_3_1.h
+++ b/src/gui/opengl/qopenglfunctions_3_1.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -345,242 +352,242 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_3_1::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_1::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_3_1::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_3_1::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_3_1::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_3_1::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_3_1::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_3_1::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_1::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_3_1::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_3_1::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_3_1::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_3_1::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_3_1::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_3_1::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_3_1::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_3_1::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_3_1::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_3_1::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_3_1::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_3_1::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_3_1::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_1::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_3_1::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_3_1::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_3_1::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_1::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_3_1::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_3_1::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_1::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_1::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_1::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_1::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_1::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_3_1::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_3_1::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_3_1::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_3_1::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_3_1::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
@@ -599,57 +606,57 @@ inline void QOpenGLFunctions_3_1::glIndexub(GLubyte c)
 
 inline GLboolean QOpenGLFunctions_3_1::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_3_1::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_3_1::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_3_1::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_3_1::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_1::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_1::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_1::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_1::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_3_1::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_3_1::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_3_1::glGetPointerv(GLenum pname, GLvoid* *params)
@@ -661,928 +668,928 @@ inline void QOpenGLFunctions_3_1::glGetPointerv(GLenum pname, GLvoid* *params)
 
 inline void QOpenGLFunctions_3_1::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_3_1::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_3_1::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_1::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_1::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_1::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_3_1::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_3_1::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_3_1::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_3_1::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_1::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_1::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_1::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_1::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_1::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_1::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_3_1::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_3_1::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_3_1::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_1::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_3_1::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_3_1::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_3_1::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_3_1::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_3_1::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_3_1::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_3_1::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_3_1::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_3_1::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_3_1::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_3_1::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_3_1::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_3_1::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_3_1::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_3_1::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_3_1::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_3_1::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_3_1::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_1::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_3_1::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_3_1::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_3_1::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_3_1::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_3_1::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_3_1::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_3_1::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_3_1::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_3_1::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_1::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_3_1::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_3_1::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_3_1::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_3_1::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_1::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_3_1::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_1::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_1::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_3_1::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_3_1::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_3_1::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_3_1::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_3_1::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_3_1::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_3_1::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_3_1::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_3_1::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_3_1::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_3_1::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_3_1::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_3_1::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_3_1::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_3_1::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_3_1::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_3_1::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_3_1::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_3_1::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_3_1::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline GLvoid* QOpenGLFunctions_3_1::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_3_1::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_3_1::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_3_1::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_3_1::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_3_1::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_3_1::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_3_1::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_3_1::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_3_1::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_3_1::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_3_1::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_3_1::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_3_1::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_3_1::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_3_1::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_3_1::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_3_1::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_3_1::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_3_1::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_3_1::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_3_1::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_1::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_1::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_1::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_1::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_3_1::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_1::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_3_1::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_1::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_3_1::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_3_1::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_3_1::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_1::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_3_1::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_3_1::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_3_1::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_3_1::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_3_1::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_3_1::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_3_1::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_3_1::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_3_1::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_3_1::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_3_1::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_3_1::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_3_1::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_3_1::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_3_1::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_3_1::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_3_1::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_3_1::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_3_1::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_3_1::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_3_1::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_3_1::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp b/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp
index 81bf9a7768..09402db09a 100644
--- a/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -84,70 +90,54 @@ QOpenGLFunctions_3_2_Compatibility::QOpenGLFunctions_3_2_Compatibility()
 
 QOpenGLFunctions_3_2_Compatibility::~QOpenGLFunctions_3_2_Compatibility()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
-    if (d_1_3_Deprecated && !d_1_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Deprecated->context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        delete d_1_3_Deprecated;
-    }
-    if (d_1_4_Deprecated && !d_1_4_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Deprecated->context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        delete d_1_4_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
+    if (d_1_3_Deprecated)
+        d_1_3_Deprecated->refs.deref();
+    Q_ASSERT(d_1_3_Deprecated->refs.load());
+    if (d_1_4_Deprecated)
+        d_1_4_Deprecated->refs.deref();
+    Q_ASSERT(d_1_4_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_3_2_Compatibility::initializeOpenGLFunctions()
@@ -166,130 +156,66 @@ bool QOpenGLFunctions_3_2_Compatibility::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_3_Deprecated = static_cast<QOpenGLFunctions_1_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_4_Deprecated = static_cast<QOpenGLFunctions_1_4_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_3_2_compatibility.h b/src/gui/opengl/qopenglfunctions_3_2_compatibility.h
index 9b768bf154..44fa6759e5 100644
--- a/src/gui/opengl/qopenglfunctions_3_2_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_3_2_compatibility.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -831,3242 +838,3242 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_3_2_Compatibility::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Compatibility::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_3_2_Compatibility::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_3_2_Compatibility::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline void QOpenGLFunctions_3_2_Compatibility::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Compatibility::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetPointerv(GLenum pname, GLvoid* *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_3_2_Compatibility::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_3_2_Compatibility::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_3_2_Compatibility::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_3_2_Compatibility::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Compatibility::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_3_2_Compatibility::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Compatibility::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Compatibility::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Compatibility::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Compatibility::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_3_2_Compatibility::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_3_2_Compatibility::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_3_2_Compatibility::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_3_2_Compatibility::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_3_2_Compatibility::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_3_2_Compatibility::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline GLvoid* QOpenGLFunctions_3_2_Compatibility::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_3_2_Compatibility::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Compatibility::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Compatibility::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_3_2_Compatibility::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_3_2_Compatibility::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Compatibility::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_3_2_Compatibility::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_3_2_Compatibility::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_3_2_Compatibility::glSampleMaski(GLuint index, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(index, mask);
+    d_3_2_Core->f.SampleMaski(index, mask);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetInteger64v(GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetInteger64v(pname, params);
+    d_3_2_Core->f.GetInteger64v(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_3_2_Compatibility::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Compatibility::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_3_2_Compatibility::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_3_2_Compatibility::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Compatibility::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_3_2_Compatibility::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_3_2_Compatibility::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_3_2_Compatibility::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Compatibility::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_3_2_Compatibility::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_3_2_Compatibility::glMultTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixd(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixf(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLoadTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixd(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glLoadTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixf(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord4sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4sv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_3_Deprecated->MultiTexCoord4s(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4s(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord4iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4iv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_3_Deprecated->MultiTexCoord4i(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4i(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord4fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4fv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_3_Deprecated->MultiTexCoord4f(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4f(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4dv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_3_Deprecated->MultiTexCoord4d(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4d(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord3sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3sv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-    d_1_3_Deprecated->MultiTexCoord3s(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3s(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord3iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3iv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
-    d_1_3_Deprecated->MultiTexCoord3i(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3i(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord3fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3fv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_3_Deprecated->MultiTexCoord3f(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3f(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3dv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_3_Deprecated->MultiTexCoord3d(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3d(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord2sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2sv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
-    d_1_3_Deprecated->MultiTexCoord2s(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2s(target, s, t);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord2iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2iv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
-    d_1_3_Deprecated->MultiTexCoord2i(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2i(target, s, t);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord2fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2fv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t)
 {
-    d_1_3_Deprecated->MultiTexCoord2f(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2f(target, s, t);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2dv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
-    d_1_3_Deprecated->MultiTexCoord2d(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2d(target, s, t);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord1sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1sv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord1s(GLenum target, GLshort s)
 {
-    d_1_3_Deprecated->MultiTexCoord1s(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1s(target, s);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord1iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1iv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord1i(GLenum target, GLint s)
 {
-    d_1_3_Deprecated->MultiTexCoord1i(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1i(target, s);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord1fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1fv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord1f(GLenum target, GLfloat s)
 {
-    d_1_3_Deprecated->MultiTexCoord1f(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1f(target, s);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1dv(target, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glMultiTexCoord1d(GLenum target, GLdouble s)
 {
-    d_1_3_Deprecated->MultiTexCoord1d(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1d(target, s);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glClientActiveTexture(GLenum texture)
 {
-    d_1_3_Deprecated->ClientActiveTexture(texture);
+    d_1_3_Deprecated->f.ClientActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 deprecated functions
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos3sv(v);
+    d_1_4_Deprecated->f.WindowPos3sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_4_Deprecated->WindowPos3s(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos3iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos3iv(v);
+    d_1_4_Deprecated->f.WindowPos3iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_4_Deprecated->WindowPos3i(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos3fv(v);
+    d_1_4_Deprecated->f.WindowPos3fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_4_Deprecated->WindowPos3f(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos3dv(v);
+    d_1_4_Deprecated->f.WindowPos3dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_4_Deprecated->WindowPos3d(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos2sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos2sv(v);
+    d_1_4_Deprecated->f.WindowPos2sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos2s(GLshort x, GLshort y)
 {
-    d_1_4_Deprecated->WindowPos2s(x, y);
+    d_1_4_Deprecated->f.WindowPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos2iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos2iv(v);
+    d_1_4_Deprecated->f.WindowPos2iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos2i(GLint x, GLint y)
 {
-    d_1_4_Deprecated->WindowPos2i(x, y);
+    d_1_4_Deprecated->f.WindowPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos2fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos2fv(v);
+    d_1_4_Deprecated->f.WindowPos2fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos2f(GLfloat x, GLfloat y)
 {
-    d_1_4_Deprecated->WindowPos2f(x, y);
+    d_1_4_Deprecated->f.WindowPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos2dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos2dv(v);
+    d_1_4_Deprecated->f.WindowPos2dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glWindowPos2d(GLdouble x, GLdouble y)
 {
-    d_1_4_Deprecated->WindowPos2d(x, y);
+    d_1_4_Deprecated->f.WindowPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->SecondaryColorPointer(size, type, stride, pointer);
+    d_1_4_Deprecated->f.SecondaryColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3usv(const GLushort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3usv(v);
+    d_1_4_Deprecated->f.SecondaryColor3usv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3us(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3uiv(const GLuint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3uiv(v);
+    d_1_4_Deprecated->f.SecondaryColor3uiv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ui(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3ubv(const GLubyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3ubv(v);
+    d_1_4_Deprecated->f.SecondaryColor3ubv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ub(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3sv(v);
+    d_1_4_Deprecated->f.SecondaryColor3sv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3s(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3iv(const GLint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3iv(v);
+    d_1_4_Deprecated->f.SecondaryColor3iv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3i(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->SecondaryColor3fv(v);
+    d_1_4_Deprecated->f.SecondaryColor3fv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_4_Deprecated->SecondaryColor3f(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->SecondaryColor3dv(v);
+    d_1_4_Deprecated->f.SecondaryColor3dv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_4_Deprecated->SecondaryColor3d(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3bv(const GLbyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3bv(v);
+    d_1_4_Deprecated->f.SecondaryColor3bv(v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glSecondaryColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3b(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFogCoordPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->FogCoordPointer(type, stride, pointer);
+    d_1_4_Deprecated->f.FogCoordPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFogCoorddv(const GLdouble *coord)
 {
-    d_1_4_Deprecated->FogCoorddv(coord);
+    d_1_4_Deprecated->f.FogCoorddv(coord);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFogCoordd(GLdouble coord)
 {
-    d_1_4_Deprecated->FogCoordd(coord);
+    d_1_4_Deprecated->f.FogCoordd(coord);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFogCoordfv(const GLfloat *coord)
 {
-    d_1_4_Deprecated->FogCoordfv(coord);
+    d_1_4_Deprecated->f.FogCoordfv(coord);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glFogCoordf(GLfloat coord)
 {
-    d_1_4_Deprecated->FogCoordf(coord);
+    d_1_4_Deprecated->f.FogCoordf(coord);
 }
 
 
@@ -4075,182 +4082,182 @@ inline void QOpenGLFunctions_3_2_Compatibility::glFogCoordf(GLfloat coord)
 // OpenGL 2.0 deprecated functions
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4usv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4usv(index, v);
+    d_2_0_Core->f.VertexAttrib4usv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4uiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4uiv(index, v);
+    d_2_0_Core->f.VertexAttrib4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4ubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4ubv(index, v);
+    d_2_0_Core->f.VertexAttrib4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4sv(index, v);
+    d_2_0_Core->f.VertexAttrib4sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_2_0_Core->VertexAttrib4s(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4s(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4iv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4iv(index, v);
+    d_2_0_Core->f.VertexAttrib4iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib4fv(index, v);
+    d_2_0_Core->f.VertexAttrib4fv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_2_0_Core->VertexAttrib4f(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4f(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib4dv(index, v);
+    d_2_0_Core->f.VertexAttrib4dv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_2_0_Core->VertexAttrib4d(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4bv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4bv(index, v);
+    d_2_0_Core->f.VertexAttrib4bv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4Nusv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4Nusv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nusv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4Nuiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4Nuiv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nuiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4Nubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nubv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nubv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-    d_2_0_Core->VertexAttrib4Nub(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4Nub(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4Nsv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4Nsv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nsv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4Niv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4Niv(index, v);
+    d_2_0_Core->f.VertexAttrib4Niv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib4Nbv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nbv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nbv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib3sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib3sv(index, v);
+    d_2_0_Core->f.VertexAttrib3sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-    d_2_0_Core->VertexAttrib3s(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3s(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib3fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib3fv(index, v);
+    d_2_0_Core->f.VertexAttrib3fv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_2_0_Core->VertexAttrib3f(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3f(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib3dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib3dv(index, v);
+    d_2_0_Core->f.VertexAttrib3dv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_2_0_Core->VertexAttrib3d(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib2sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib2sv(index, v);
+    d_2_0_Core->f.VertexAttrib2sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib2s(GLuint index, GLshort x, GLshort y)
 {
-    d_2_0_Core->VertexAttrib2s(index, x, y);
+    d_2_0_Core->f.VertexAttrib2s(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib2fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib2fv(index, v);
+    d_2_0_Core->f.VertexAttrib2fv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    d_2_0_Core->VertexAttrib2f(index, x, y);
+    d_2_0_Core->f.VertexAttrib2f(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib2dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib2dv(index, v);
+    d_2_0_Core->f.VertexAttrib2dv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_2_0_Core->VertexAttrib2d(index, x, y);
+    d_2_0_Core->f.VertexAttrib2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib1sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib1sv(index, v);
+    d_2_0_Core->f.VertexAttrib1sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib1s(GLuint index, GLshort x)
 {
-    d_2_0_Core->VertexAttrib1s(index, x);
+    d_2_0_Core->f.VertexAttrib1s(index, x);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib1fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib1fv(index, v);
+    d_2_0_Core->f.VertexAttrib1fv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    d_2_0_Core->VertexAttrib1f(index, x);
+    d_2_0_Core->f.VertexAttrib1f(index, x);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib1dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib1dv(index, v);
+    d_2_0_Core->f.VertexAttrib1dv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib1d(GLuint index, GLdouble x)
 {
-    d_2_0_Core->VertexAttrib1d(index, x);
+    d_2_0_Core->f.VertexAttrib1d(index, x);
 }
 
 
@@ -4259,102 +4266,102 @@ inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttrib1d(GLuint index, G
 // OpenGL 3.0 deprecated functions
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI4usv(GLuint index, const GLushort *v)
 {
-    d_3_0_Core->VertexAttribI4usv(index, v);
+    d_3_0_Core->f.VertexAttribI4usv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI4ubv(GLuint index, const GLubyte *v)
 {
-    d_3_0_Core->VertexAttribI4ubv(index, v);
+    d_3_0_Core->f.VertexAttribI4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI4sv(GLuint index, const GLshort *v)
 {
-    d_3_0_Core->VertexAttribI4sv(index, v);
+    d_3_0_Core->f.VertexAttribI4sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI4bv(GLuint index, const GLbyte *v)
 {
-    d_3_0_Core->VertexAttribI4bv(index, v);
+    d_3_0_Core->f.VertexAttribI4bv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI4uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI4uiv(index, v);
+    d_3_0_Core->f.VertexAttribI4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI3uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI3uiv(index, v);
+    d_3_0_Core->f.VertexAttribI3uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI2uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI2uiv(index, v);
+    d_3_0_Core->f.VertexAttribI2uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI1uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI1uiv(index, v);
+    d_3_0_Core->f.VertexAttribI1uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI4iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI4iv(index, v);
+    d_3_0_Core->f.VertexAttribI4iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI3iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI3iv(index, v);
+    d_3_0_Core->f.VertexAttribI3iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI2iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI2iv(index, v);
+    d_3_0_Core->f.VertexAttribI2iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI1iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI1iv(index, v);
+    d_3_0_Core->f.VertexAttribI1iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
-    d_3_0_Core->VertexAttribI4ui(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4ui(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI3ui(GLuint index, GLuint x, GLuint y, GLuint z)
 {
-    d_3_0_Core->VertexAttribI3ui(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3ui(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI2ui(GLuint index, GLuint x, GLuint y)
 {
-    d_3_0_Core->VertexAttribI2ui(index, x, y);
+    d_3_0_Core->f.VertexAttribI2ui(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI1ui(GLuint index, GLuint x)
 {
-    d_3_0_Core->VertexAttribI1ui(index, x);
+    d_3_0_Core->f.VertexAttribI1ui(index, x);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
-    d_3_0_Core->VertexAttribI4i(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4i(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI3i(GLuint index, GLint x, GLint y, GLint z)
 {
-    d_3_0_Core->VertexAttribI3i(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3i(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI2i(GLuint index, GLint x, GLint y)
 {
-    d_3_0_Core->VertexAttribI2i(index, x, y);
+    d_3_0_Core->f.VertexAttribI2i(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_2_Compatibility::glVertexAttribI1i(GLuint index, GLint x)
 {
-    d_3_0_Core->VertexAttribI1i(index, x);
+    d_3_0_Core->f.VertexAttribI1i(index, x);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_3_2_core.cpp b/src/gui/opengl/qopenglfunctions_3_2_core.cpp
index 86e28f9bd8..177dc9e25d 100644
--- a/src/gui/opengl/qopenglfunctions_3_2_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_2_core.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -77,50 +83,39 @@ QOpenGLFunctions_3_2_Core::QOpenGLFunctions_3_2_Core()
 
 QOpenGLFunctions_3_2_Core::~QOpenGLFunctions_3_2_Core()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
 }
 
 bool QOpenGLFunctions_3_2_Core::initializeOpenGLFunctions()
@@ -139,90 +134,46 @@ bool QOpenGLFunctions_3_2_Core::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_3_2_core.h b/src/gui/opengl/qopenglfunctions_3_2_core.h
index b2f7e275dc..36f959c04b 100644
--- a/src/gui/opengl/qopenglfunctions_3_2_core.h
+++ b/src/gui/opengl/qopenglfunctions_3_2_core.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -367,242 +374,242 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_3_2_Core::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Core::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_3_2_Core::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_3_2_Core::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_3_2_Core::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_3_2_Core::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
@@ -621,57 +628,57 @@ inline void QOpenGLFunctions_3_2_Core::glIndexub(GLubyte c)
 
 inline GLboolean QOpenGLFunctions_3_2_Core::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetPointerv(GLenum pname, GLvoid* *params)
@@ -683,1025 +690,1025 @@ inline void QOpenGLFunctions_3_2_Core::glGetPointerv(GLenum pname, GLvoid* *para
 
 inline void QOpenGLFunctions_3_2_Core::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_3_2_Core::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_3_2_Core::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_3_2_Core::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_3_2_Core::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Core::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_3_2_Core::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Core::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Core::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_3_2_Core::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Core::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Core::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_3_2_Core::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_3_2_Core::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_3_2_Core::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_3_2_Core::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_3_2_Core::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_3_2_Core::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_3_2_Core::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline GLvoid* QOpenGLFunctions_3_2_Core::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_3_2_Core::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Core::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Core::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_3_2_Core::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_3_2_Core::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_3_2_Core::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Core::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_3_2_Core::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_3_2_Core::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_3_2_Core::glSampleMaski(GLuint index, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(index, mask);
+    d_3_2_Core->f.SampleMaski(index, mask);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetInteger64v(GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetInteger64v(pname, params);
+    d_3_2_Core->f.GetInteger64v(pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_3_2_Core::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_3_2_Core::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_3_2_Core::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_2_Core::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp b/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp
index a561238ffd..110a49ea53 100644
--- a/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -85,78 +91,60 @@ QOpenGLFunctions_3_3_Compatibility::QOpenGLFunctions_3_3_Compatibility()
 
 QOpenGLFunctions_3_3_Compatibility::~QOpenGLFunctions_3_3_Compatibility()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_3_3_Core && !d_3_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Core->context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        delete d_3_3_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
-    if (d_1_3_Deprecated && !d_1_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Deprecated->context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        delete d_1_3_Deprecated;
-    }
-    if (d_1_4_Deprecated && !d_1_4_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Deprecated->context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        delete d_1_4_Deprecated;
-    }
-    if (d_3_3_Deprecated && !d_3_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Deprecated->context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus());
-        delete d_3_3_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_3_3_Core)
+        d_3_3_Core->refs.deref();
+    Q_ASSERT(d_3_3_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
+    if (d_1_3_Deprecated)
+        d_1_3_Deprecated->refs.deref();
+    Q_ASSERT(d_1_3_Deprecated->refs.load());
+    if (d_1_4_Deprecated)
+        d_1_4_Deprecated->refs.deref();
+    Q_ASSERT(d_1_4_Deprecated->refs.load());
+    if (d_3_3_Deprecated)
+        d_3_3_Deprecated->refs.deref();
+    Q_ASSERT(d_3_3_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_3_3_Compatibility::initializeOpenGLFunctions()
@@ -175,146 +163,74 @@ bool QOpenGLFunctions_3_3_Compatibility::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus(), d);
-        }
         d_3_3_Core = static_cast<QOpenGLFunctions_3_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_3_Deprecated = static_cast<QOpenGLFunctions_1_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_4_Deprecated = static_cast<QOpenGLFunctions_1_4_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_3_3_Deprecated = static_cast<QOpenGLFunctions_3_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_3_3_compatibility.h b/src/gui/opengl/qopenglfunctions_3_3_compatibility.h
index f4876523d1..126cc16858 100644
--- a/src/gui/opengl/qopenglfunctions_3_3_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_3_3_compatibility.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -894,3534 +901,3534 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_3_3_Compatibility::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_3_3_Compatibility::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_3_3_Compatibility::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline void QOpenGLFunctions_3_3_Compatibility::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetPointerv(GLenum pname, GLvoid* *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_3_3_Compatibility::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_3_3_Compatibility::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_3_3_Compatibility::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_3_3_Compatibility::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_3_3_Compatibility::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_3_3_Compatibility::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_3_3_Compatibility::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_3_3_Compatibility::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_3_3_Compatibility::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_3_3_Compatibility::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline GLvoid* QOpenGLFunctions_3_3_Compatibility::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_3_3_Compatibility::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_3_3_Compatibility::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_3_3_Compatibility::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_3_3_Compatibility::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_3_3_Compatibility::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_3_3_Compatibility::glSampleMaski(GLuint index, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(index, mask);
+    d_3_2_Core->f.SampleMaski(index, mask);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetInteger64v(GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetInteger64v(pname, params);
+    d_3_2_Core->f.GetInteger64v(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_3_3_Compatibility::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_3_3_Compatibility::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 
 // OpenGL 3.3 core functions
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP4uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribP4ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP4ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribP3uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP3uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribP3ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP3ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribP2uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP2uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP2ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP1uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP1ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->SecondaryColorP3uiv(type, color);
+    d_3_3_Deprecated->f.SecondaryColorP3uiv(type, color);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColorP3ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->SecondaryColorP3ui(type, color);
+    d_3_3_Deprecated->f.SecondaryColorP3ui(type, color);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColorP4uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->ColorP4uiv(type, color);
+    d_3_3_Deprecated->f.ColorP4uiv(type, color);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColorP4ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->ColorP4ui(type, color);
+    d_3_3_Deprecated->f.ColorP4ui(type, color);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColorP3uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->ColorP3uiv(type, color);
+    d_3_3_Deprecated->f.ColorP3uiv(type, color);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColorP3ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->ColorP3ui(type, color);
+    d_3_3_Deprecated->f.ColorP3ui(type, color);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glNormalP3uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->NormalP3uiv(type, coords);
+    d_3_3_Deprecated->f.NormalP3uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glNormalP3ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->NormalP3ui(type, coords);
+    d_3_3_Deprecated->f.NormalP3ui(type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoordP4uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP4uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP4uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoordP4ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP4ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP4ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoordP3uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP3uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP3uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoordP3ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP3ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP3ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoordP2uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP2uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP2uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoordP2ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP2ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP2ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoordP1uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP1uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP1uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoordP1ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP1ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP1ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoordP4uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP4uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP4uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoordP4ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP4ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP4ui(type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoordP3uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP3uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP3uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoordP3ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP3ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP3ui(type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoordP2uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP2uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP2uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoordP2ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP2ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP2ui(type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoordP1uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP1uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP1uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoordP1ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP1ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP1ui(type, coords);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexP4uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP4uiv(type, value);
+    d_3_3_Deprecated->f.VertexP4uiv(type, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexP4ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP4ui(type, value);
+    d_3_3_Deprecated->f.VertexP4ui(type, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexP3uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP3uiv(type, value);
+    d_3_3_Deprecated->f.VertexP3uiv(type, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexP3ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP3ui(type, value);
+    d_3_3_Deprecated->f.VertexP3ui(type, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexP2uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP2uiv(type, value);
+    d_3_3_Deprecated->f.VertexP2uiv(type, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexP2ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP2ui(type, value);
+    d_3_3_Deprecated->f.VertexP2ui(type, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
 {
-    d_3_3_Core->GetQueryObjectui64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
 {
-    d_3_3_Core->GetQueryObjecti64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjecti64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glQueryCounter(GLuint id, GLenum target)
 {
-    d_3_3_Core->QueryCounter(id, target);
+    d_3_3_Core->f.QueryCounter(id, target);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
 {
-    d_3_3_Core->GetSamplerParameterIuiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIuiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
 {
-    d_3_3_Core->GetSamplerParameterfv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterfv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameterIiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameteriv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameteriv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
 {
-    d_3_3_Core->SamplerParameterIuiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIuiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameterIiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
 {
-    d_3_3_Core->SamplerParameterfv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterfv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-    d_3_3_Core->SamplerParameterf(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterf(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameteriv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteriv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-    d_3_3_Core->SamplerParameteri(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteri(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBindSampler(GLuint unit, GLuint sampler)
 {
-    d_3_3_Core->BindSampler(unit, sampler);
+    d_3_3_Core->f.BindSampler(unit, sampler);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glIsSampler(GLuint sampler)
 {
-    return d_3_3_Core->IsSampler(sampler);
+    return d_3_3_Core->f.IsSampler(sampler);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDeleteSamplers(GLsizei count, const GLuint *samplers)
 {
-    d_3_3_Core->DeleteSamplers(count, samplers);
+    d_3_3_Core->f.DeleteSamplers(count, samplers);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGenSamplers(GLsizei count, GLuint *samplers)
 {
-    d_3_3_Core->GenSamplers(count, samplers);
+    d_3_3_Core->f.GenSamplers(count, samplers);
 }
 
 inline GLint QOpenGLFunctions_3_3_Compatibility::glGetFragDataIndex(GLuint program, const GLchar *name)
 {
-    return d_3_3_Core->GetFragDataIndex(program, name);
+    return d_3_3_Core->f.GetFragDataIndex(program, name);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
-    d_3_3_Core->BindFragDataLocationIndexed(program, colorNumber, index, name);
+    d_3_3_Core->f.BindFragDataLocationIndexed(program, colorNumber, index, name);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-    d_3_3_Core->VertexAttribDivisor(index, divisor);
+    d_3_3_Core->f.VertexAttribDivisor(index, divisor);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_3_3_Compatibility::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_3_3_Compatibility::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_3_3_Compatibility::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_3_3_Compatibility::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Compatibility::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_3_3_Compatibility::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_3_3_Compatibility::glMultTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixd(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixf(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLoadTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixd(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glLoadTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixf(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord4sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4sv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_3_Deprecated->MultiTexCoord4s(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4s(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord4iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4iv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_3_Deprecated->MultiTexCoord4i(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4i(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord4fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4fv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_3_Deprecated->MultiTexCoord4f(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4f(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4dv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_3_Deprecated->MultiTexCoord4d(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4d(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord3sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3sv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-    d_1_3_Deprecated->MultiTexCoord3s(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3s(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord3iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3iv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
-    d_1_3_Deprecated->MultiTexCoord3i(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3i(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord3fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3fv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_3_Deprecated->MultiTexCoord3f(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3f(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3dv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_3_Deprecated->MultiTexCoord3d(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3d(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord2sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2sv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
-    d_1_3_Deprecated->MultiTexCoord2s(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2s(target, s, t);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord2iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2iv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
-    d_1_3_Deprecated->MultiTexCoord2i(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2i(target, s, t);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord2fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2fv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t)
 {
-    d_1_3_Deprecated->MultiTexCoord2f(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2f(target, s, t);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2dv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
-    d_1_3_Deprecated->MultiTexCoord2d(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2d(target, s, t);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord1sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1sv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord1s(GLenum target, GLshort s)
 {
-    d_1_3_Deprecated->MultiTexCoord1s(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1s(target, s);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord1iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1iv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord1i(GLenum target, GLint s)
 {
-    d_1_3_Deprecated->MultiTexCoord1i(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1i(target, s);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord1fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1fv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord1f(GLenum target, GLfloat s)
 {
-    d_1_3_Deprecated->MultiTexCoord1f(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1f(target, s);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1dv(target, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glMultiTexCoord1d(GLenum target, GLdouble s)
 {
-    d_1_3_Deprecated->MultiTexCoord1d(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1d(target, s);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glClientActiveTexture(GLenum texture)
 {
-    d_1_3_Deprecated->ClientActiveTexture(texture);
+    d_1_3_Deprecated->f.ClientActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 deprecated functions
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos3sv(v);
+    d_1_4_Deprecated->f.WindowPos3sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_4_Deprecated->WindowPos3s(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos3iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos3iv(v);
+    d_1_4_Deprecated->f.WindowPos3iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_4_Deprecated->WindowPos3i(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos3fv(v);
+    d_1_4_Deprecated->f.WindowPos3fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_4_Deprecated->WindowPos3f(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos3dv(v);
+    d_1_4_Deprecated->f.WindowPos3dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_4_Deprecated->WindowPos3d(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos2sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos2sv(v);
+    d_1_4_Deprecated->f.WindowPos2sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos2s(GLshort x, GLshort y)
 {
-    d_1_4_Deprecated->WindowPos2s(x, y);
+    d_1_4_Deprecated->f.WindowPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos2iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos2iv(v);
+    d_1_4_Deprecated->f.WindowPos2iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos2i(GLint x, GLint y)
 {
-    d_1_4_Deprecated->WindowPos2i(x, y);
+    d_1_4_Deprecated->f.WindowPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos2fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos2fv(v);
+    d_1_4_Deprecated->f.WindowPos2fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos2f(GLfloat x, GLfloat y)
 {
-    d_1_4_Deprecated->WindowPos2f(x, y);
+    d_1_4_Deprecated->f.WindowPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos2dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos2dv(v);
+    d_1_4_Deprecated->f.WindowPos2dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glWindowPos2d(GLdouble x, GLdouble y)
 {
-    d_1_4_Deprecated->WindowPos2d(x, y);
+    d_1_4_Deprecated->f.WindowPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->SecondaryColorPointer(size, type, stride, pointer);
+    d_1_4_Deprecated->f.SecondaryColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3usv(const GLushort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3usv(v);
+    d_1_4_Deprecated->f.SecondaryColor3usv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3us(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3uiv(const GLuint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3uiv(v);
+    d_1_4_Deprecated->f.SecondaryColor3uiv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ui(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3ubv(const GLubyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3ubv(v);
+    d_1_4_Deprecated->f.SecondaryColor3ubv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ub(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3sv(v);
+    d_1_4_Deprecated->f.SecondaryColor3sv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3s(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3iv(const GLint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3iv(v);
+    d_1_4_Deprecated->f.SecondaryColor3iv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3i(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->SecondaryColor3fv(v);
+    d_1_4_Deprecated->f.SecondaryColor3fv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_4_Deprecated->SecondaryColor3f(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->SecondaryColor3dv(v);
+    d_1_4_Deprecated->f.SecondaryColor3dv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_4_Deprecated->SecondaryColor3d(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3bv(const GLbyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3bv(v);
+    d_1_4_Deprecated->f.SecondaryColor3bv(v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glSecondaryColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3b(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFogCoordPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->FogCoordPointer(type, stride, pointer);
+    d_1_4_Deprecated->f.FogCoordPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFogCoorddv(const GLdouble *coord)
 {
-    d_1_4_Deprecated->FogCoorddv(coord);
+    d_1_4_Deprecated->f.FogCoorddv(coord);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFogCoordd(GLdouble coord)
 {
-    d_1_4_Deprecated->FogCoordd(coord);
+    d_1_4_Deprecated->f.FogCoordd(coord);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFogCoordfv(const GLfloat *coord)
 {
-    d_1_4_Deprecated->FogCoordfv(coord);
+    d_1_4_Deprecated->f.FogCoordfv(coord);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glFogCoordf(GLfloat coord)
 {
-    d_1_4_Deprecated->FogCoordf(coord);
+    d_1_4_Deprecated->f.FogCoordf(coord);
 }
 
 
@@ -4430,182 +4437,182 @@ inline void QOpenGLFunctions_3_3_Compatibility::glFogCoordf(GLfloat coord)
 // OpenGL 2.0 deprecated functions
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4usv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4usv(index, v);
+    d_2_0_Core->f.VertexAttrib4usv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4uiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4uiv(index, v);
+    d_2_0_Core->f.VertexAttrib4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4ubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4ubv(index, v);
+    d_2_0_Core->f.VertexAttrib4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4sv(index, v);
+    d_2_0_Core->f.VertexAttrib4sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_2_0_Core->VertexAttrib4s(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4s(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4iv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4iv(index, v);
+    d_2_0_Core->f.VertexAttrib4iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib4fv(index, v);
+    d_2_0_Core->f.VertexAttrib4fv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_2_0_Core->VertexAttrib4f(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4f(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib4dv(index, v);
+    d_2_0_Core->f.VertexAttrib4dv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_2_0_Core->VertexAttrib4d(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4bv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4bv(index, v);
+    d_2_0_Core->f.VertexAttrib4bv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4Nusv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4Nusv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nusv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4Nuiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4Nuiv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nuiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4Nubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nubv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nubv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-    d_2_0_Core->VertexAttrib4Nub(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4Nub(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4Nsv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4Nsv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nsv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4Niv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4Niv(index, v);
+    d_2_0_Core->f.VertexAttrib4Niv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib4Nbv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nbv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nbv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib3sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib3sv(index, v);
+    d_2_0_Core->f.VertexAttrib3sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-    d_2_0_Core->VertexAttrib3s(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3s(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib3fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib3fv(index, v);
+    d_2_0_Core->f.VertexAttrib3fv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_2_0_Core->VertexAttrib3f(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3f(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib3dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib3dv(index, v);
+    d_2_0_Core->f.VertexAttrib3dv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_2_0_Core->VertexAttrib3d(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib2sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib2sv(index, v);
+    d_2_0_Core->f.VertexAttrib2sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib2s(GLuint index, GLshort x, GLshort y)
 {
-    d_2_0_Core->VertexAttrib2s(index, x, y);
+    d_2_0_Core->f.VertexAttrib2s(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib2fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib2fv(index, v);
+    d_2_0_Core->f.VertexAttrib2fv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    d_2_0_Core->VertexAttrib2f(index, x, y);
+    d_2_0_Core->f.VertexAttrib2f(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib2dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib2dv(index, v);
+    d_2_0_Core->f.VertexAttrib2dv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_2_0_Core->VertexAttrib2d(index, x, y);
+    d_2_0_Core->f.VertexAttrib2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib1sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib1sv(index, v);
+    d_2_0_Core->f.VertexAttrib1sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib1s(GLuint index, GLshort x)
 {
-    d_2_0_Core->VertexAttrib1s(index, x);
+    d_2_0_Core->f.VertexAttrib1s(index, x);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib1fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib1fv(index, v);
+    d_2_0_Core->f.VertexAttrib1fv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    d_2_0_Core->VertexAttrib1f(index, x);
+    d_2_0_Core->f.VertexAttrib1f(index, x);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib1dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib1dv(index, v);
+    d_2_0_Core->f.VertexAttrib1dv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib1d(GLuint index, GLdouble x)
 {
-    d_2_0_Core->VertexAttrib1d(index, x);
+    d_2_0_Core->f.VertexAttrib1d(index, x);
 }
 
 
@@ -4614,102 +4621,102 @@ inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttrib1d(GLuint index, G
 // OpenGL 3.0 deprecated functions
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI4usv(GLuint index, const GLushort *v)
 {
-    d_3_0_Core->VertexAttribI4usv(index, v);
+    d_3_0_Core->f.VertexAttribI4usv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI4ubv(GLuint index, const GLubyte *v)
 {
-    d_3_0_Core->VertexAttribI4ubv(index, v);
+    d_3_0_Core->f.VertexAttribI4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI4sv(GLuint index, const GLshort *v)
 {
-    d_3_0_Core->VertexAttribI4sv(index, v);
+    d_3_0_Core->f.VertexAttribI4sv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI4bv(GLuint index, const GLbyte *v)
 {
-    d_3_0_Core->VertexAttribI4bv(index, v);
+    d_3_0_Core->f.VertexAttribI4bv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI4uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI4uiv(index, v);
+    d_3_0_Core->f.VertexAttribI4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI3uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI3uiv(index, v);
+    d_3_0_Core->f.VertexAttribI3uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI2uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI2uiv(index, v);
+    d_3_0_Core->f.VertexAttribI2uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI1uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI1uiv(index, v);
+    d_3_0_Core->f.VertexAttribI1uiv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI4iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI4iv(index, v);
+    d_3_0_Core->f.VertexAttribI4iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI3iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI3iv(index, v);
+    d_3_0_Core->f.VertexAttribI3iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI2iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI2iv(index, v);
+    d_3_0_Core->f.VertexAttribI2iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI1iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI1iv(index, v);
+    d_3_0_Core->f.VertexAttribI1iv(index, v);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
-    d_3_0_Core->VertexAttribI4ui(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4ui(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI3ui(GLuint index, GLuint x, GLuint y, GLuint z)
 {
-    d_3_0_Core->VertexAttribI3ui(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3ui(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI2ui(GLuint index, GLuint x, GLuint y)
 {
-    d_3_0_Core->VertexAttribI2ui(index, x, y);
+    d_3_0_Core->f.VertexAttribI2ui(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI1ui(GLuint index, GLuint x)
 {
-    d_3_0_Core->VertexAttribI1ui(index, x);
+    d_3_0_Core->f.VertexAttribI1ui(index, x);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
-    d_3_0_Core->VertexAttribI4i(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4i(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI3i(GLuint index, GLint x, GLint y, GLint z)
 {
-    d_3_0_Core->VertexAttribI3i(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3i(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI2i(GLuint index, GLint x, GLint y)
 {
-    d_3_0_Core->VertexAttribI2i(index, x, y);
+    d_3_0_Core->f.VertexAttribI2i(index, x, y);
 }
 
 inline void QOpenGLFunctions_3_3_Compatibility::glVertexAttribI1i(GLuint index, GLint x)
 {
-    d_3_0_Core->VertexAttribI1i(index, x);
+    d_3_0_Core->f.VertexAttribI1i(index, x);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_3_3_core.cpp b/src/gui/opengl/qopenglfunctions_3_3_core.cpp
index d3070fc1ed..2e706724d9 100644
--- a/src/gui/opengl/qopenglfunctions_3_3_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_3_3_core.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -78,54 +84,42 @@ QOpenGLFunctions_3_3_Core::QOpenGLFunctions_3_3_Core()
 
 QOpenGLFunctions_3_3_Core::~QOpenGLFunctions_3_3_Core()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_3_3_Core && !d_3_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Core->context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        delete d_3_3_Core;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_3_3_Core)
+        d_3_3_Core->refs.deref();
+    Q_ASSERT(d_3_3_Core->refs.load());
 }
 
 bool QOpenGLFunctions_3_3_Core::initializeOpenGLFunctions()
@@ -144,98 +138,50 @@ bool QOpenGLFunctions_3_3_Core::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus(), d);
-        }
         d_3_3_Core = static_cast<QOpenGLFunctions_3_3_CoreBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_3_3_core.h b/src/gui/opengl/qopenglfunctions_3_3_core.h
index 9ce643ccca..15a62802ab 100644
--- a/src/gui/opengl/qopenglfunctions_3_3_core.h
+++ b/src/gui/opengl/qopenglfunctions_3_3_core.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -428,242 +435,242 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_3_3_Core::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Core::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_3_3_Core::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_3_3_Core::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_3_3_Core::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_3_3_Core::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
@@ -682,57 +689,57 @@ inline void QOpenGLFunctions_3_3_Core::glIndexub(GLubyte c)
 
 inline GLboolean QOpenGLFunctions_3_3_Core::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetPointerv(GLenum pname, GLvoid* *params)
@@ -744,1067 +751,1067 @@ inline void QOpenGLFunctions_3_3_Core::glGetPointerv(GLenum pname, GLvoid* *para
 
 inline void QOpenGLFunctions_3_3_Core::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_3_3_Core::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_3_3_Core::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_3_3_Core::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_3_3_Core::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Core::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_3_3_Core::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Core::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Core::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_3_3_Core::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Core::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Core::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_3_3_Core::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_3_3_Core::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_3_3_Core::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_3_3_Core::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_3_3_Core::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_3_3_Core::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_3_3_Core::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline GLvoid* QOpenGLFunctions_3_3_Core::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_3_3_Core::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Core::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Core::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_3_3_Core::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_3_3_Core::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Core::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_3_3_Core::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_3_3_Core::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_3_3_Core::glSampleMaski(GLuint index, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(index, mask);
+    d_3_2_Core->f.SampleMaski(index, mask);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetInteger64v(GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetInteger64v(pname, params);
+    d_3_2_Core->f.GetInteger64v(pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_3_3_Core::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Core::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_3_3_Core::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 
 // OpenGL 3.3 core functions
 inline void QOpenGLFunctions_3_3_Core::glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP4uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glVertexAttribP4ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP4ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glVertexAttribP3uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP3uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glVertexAttribP3ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP3ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glVertexAttribP2uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP2uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP2ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP1uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP1ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
@@ -2027,102 +2034,102 @@ inline void QOpenGLFunctions_3_3_Core::glVertexP2ui(GLenum type, GLuint value)
 
 inline void QOpenGLFunctions_3_3_Core::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
 {
-    d_3_3_Core->GetQueryObjectui64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
 {
-    d_3_3_Core->GetQueryObjecti64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjecti64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glQueryCounter(GLuint id, GLenum target)
 {
-    d_3_3_Core->QueryCounter(id, target);
+    d_3_3_Core->f.QueryCounter(id, target);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
 {
-    d_3_3_Core->GetSamplerParameterIuiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIuiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
 {
-    d_3_3_Core->GetSamplerParameterfv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterfv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameterIiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameteriv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameteriv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
 {
-    d_3_3_Core->SamplerParameterIuiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIuiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameterIiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
 {
-    d_3_3_Core->SamplerParameterfv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterfv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-    d_3_3_Core->SamplerParameterf(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterf(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameteriv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteriv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-    d_3_3_Core->SamplerParameteri(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteri(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBindSampler(GLuint unit, GLuint sampler)
 {
-    d_3_3_Core->BindSampler(unit, sampler);
+    d_3_3_Core->f.BindSampler(unit, sampler);
 }
 
 inline GLboolean QOpenGLFunctions_3_3_Core::glIsSampler(GLuint sampler)
 {
-    return d_3_3_Core->IsSampler(sampler);
+    return d_3_3_Core->f.IsSampler(sampler);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glDeleteSamplers(GLsizei count, const GLuint *samplers)
 {
-    d_3_3_Core->DeleteSamplers(count, samplers);
+    d_3_3_Core->f.DeleteSamplers(count, samplers);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glGenSamplers(GLsizei count, GLuint *samplers)
 {
-    d_3_3_Core->GenSamplers(count, samplers);
+    d_3_3_Core->f.GenSamplers(count, samplers);
 }
 
 inline GLint QOpenGLFunctions_3_3_Core::glGetFragDataIndex(GLuint program, const GLchar *name)
 {
-    return d_3_3_Core->GetFragDataIndex(program, name);
+    return d_3_3_Core->f.GetFragDataIndex(program, name);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glBindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
-    d_3_3_Core->BindFragDataLocationIndexed(program, colorNumber, index, name);
+    d_3_3_Core->f.BindFragDataLocationIndexed(program, colorNumber, index, name);
 }
 
 inline void QOpenGLFunctions_3_3_Core::glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-    d_3_3_Core->VertexAttribDivisor(index, divisor);
+    d_3_3_Core->f.VertexAttribDivisor(index, divisor);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp
index 35d7246241..14fb168c94 100644
--- a/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -86,82 +92,63 @@ QOpenGLFunctions_4_0_Compatibility::QOpenGLFunctions_4_0_Compatibility()
 
 QOpenGLFunctions_4_0_Compatibility::~QOpenGLFunctions_4_0_Compatibility()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_3_3_Core && !d_3_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Core->context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        delete d_3_3_Core;
-    }
-    if (d_4_0_Core && !d_4_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_0_Core->context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        delete d_4_0_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
-    if (d_1_3_Deprecated && !d_1_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Deprecated->context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        delete d_1_3_Deprecated;
-    }
-    if (d_1_4_Deprecated && !d_1_4_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Deprecated->context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        delete d_1_4_Deprecated;
-    }
-    if (d_3_3_Deprecated && !d_3_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Deprecated->context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus());
-        delete d_3_3_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_3_3_Core)
+        d_3_3_Core->refs.deref();
+    Q_ASSERT(d_3_3_Core->refs.load());
+    if (d_4_0_Core)
+        d_4_0_Core->refs.deref();
+    Q_ASSERT(d_4_0_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
+    if (d_1_3_Deprecated)
+        d_1_3_Deprecated->refs.deref();
+    Q_ASSERT(d_1_3_Deprecated->refs.load());
+    if (d_1_4_Deprecated)
+        d_1_4_Deprecated->refs.deref();
+    Q_ASSERT(d_1_4_Deprecated->refs.load());
+    if (d_3_3_Deprecated)
+        d_3_3_Deprecated->refs.deref();
+    Q_ASSERT(d_3_3_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_4_0_Compatibility::initializeOpenGLFunctions()
@@ -180,154 +167,78 @@ bool QOpenGLFunctions_4_0_Compatibility::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus(), d);
-        }
         d_3_3_Core = static_cast<QOpenGLFunctions_3_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus(), d);
-        }
         d_4_0_Core = static_cast<QOpenGLFunctions_4_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_3_Deprecated = static_cast<QOpenGLFunctions_1_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_4_Deprecated = static_cast<QOpenGLFunctions_1_4_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_3_3_Deprecated = static_cast<QOpenGLFunctions_3_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_4_0_compatibility.h b/src/gui/opengl/qopenglfunctions_4_0_compatibility.h
index 63828b2c28..9ca6eb8a36 100644
--- a/src/gui/opengl/qopenglfunctions_4_0_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_4_0_compatibility.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -945,3766 +952,3766 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_4_0_Compatibility::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_0_Compatibility::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_4_0_Compatibility::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline void QOpenGLFunctions_4_0_Compatibility::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetPointerv(GLenum pname, GLvoid* *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_4_0_Compatibility::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_4_0_Compatibility::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_4_0_Compatibility::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_4_0_Compatibility::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_4_0_Compatibility::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_4_0_Compatibility::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_4_0_Compatibility::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_4_0_Compatibility::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_4_0_Compatibility::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline GLvoid* QOpenGLFunctions_4_0_Compatibility::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_4_0_Compatibility::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_0_Compatibility::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_4_0_Compatibility::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_4_0_Compatibility::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_4_0_Compatibility::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_4_0_Compatibility::glSampleMaski(GLuint index, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(index, mask);
+    d_3_2_Core->f.SampleMaski(index, mask);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetInteger64v(GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetInteger64v(pname, params);
+    d_3_2_Core->f.GetInteger64v(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_4_0_Compatibility::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_4_0_Compatibility::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 
 // OpenGL 3.3 core functions
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP4uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribP4ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP4ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribP3uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP3uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribP3ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP3ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribP2uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP2uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP2ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP1uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP1ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->SecondaryColorP3uiv(type, color);
+    d_3_3_Deprecated->f.SecondaryColorP3uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColorP3ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->SecondaryColorP3ui(type, color);
+    d_3_3_Deprecated->f.SecondaryColorP3ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColorP4uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->ColorP4uiv(type, color);
+    d_3_3_Deprecated->f.ColorP4uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColorP4ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->ColorP4ui(type, color);
+    d_3_3_Deprecated->f.ColorP4ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColorP3uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->ColorP3uiv(type, color);
+    d_3_3_Deprecated->f.ColorP3uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColorP3ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->ColorP3ui(type, color);
+    d_3_3_Deprecated->f.ColorP3ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glNormalP3uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->NormalP3uiv(type, coords);
+    d_3_3_Deprecated->f.NormalP3uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glNormalP3ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->NormalP3ui(type, coords);
+    d_3_3_Deprecated->f.NormalP3ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoordP4uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP4uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP4uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoordP4ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP4ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP4ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoordP3uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP3uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP3uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoordP3ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP3ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP3ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoordP2uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP2uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP2uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoordP2ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP2ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP2ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoordP1uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP1uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP1uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoordP1ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP1ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP1ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoordP4uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP4uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP4uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoordP4ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP4ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP4ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoordP3uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP3uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP3uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoordP3ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP3ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP3ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoordP2uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP2uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP2uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoordP2ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP2ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP2ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoordP1uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP1uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP1uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoordP1ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP1ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP1ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexP4uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP4uiv(type, value);
+    d_3_3_Deprecated->f.VertexP4uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexP4ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP4ui(type, value);
+    d_3_3_Deprecated->f.VertexP4ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexP3uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP3uiv(type, value);
+    d_3_3_Deprecated->f.VertexP3uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexP3ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP3ui(type, value);
+    d_3_3_Deprecated->f.VertexP3ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexP2uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP2uiv(type, value);
+    d_3_3_Deprecated->f.VertexP2uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexP2ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP2ui(type, value);
+    d_3_3_Deprecated->f.VertexP2ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
 {
-    d_3_3_Core->GetQueryObjectui64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
 {
-    d_3_3_Core->GetQueryObjecti64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjecti64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glQueryCounter(GLuint id, GLenum target)
 {
-    d_3_3_Core->QueryCounter(id, target);
+    d_3_3_Core->f.QueryCounter(id, target);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
 {
-    d_3_3_Core->GetSamplerParameterIuiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIuiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
 {
-    d_3_3_Core->GetSamplerParameterfv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterfv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameterIiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameteriv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameteriv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
 {
-    d_3_3_Core->SamplerParameterIuiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIuiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameterIiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
 {
-    d_3_3_Core->SamplerParameterfv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterfv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-    d_3_3_Core->SamplerParameterf(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterf(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameteriv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteriv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-    d_3_3_Core->SamplerParameteri(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteri(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBindSampler(GLuint unit, GLuint sampler)
 {
-    d_3_3_Core->BindSampler(unit, sampler);
+    d_3_3_Core->f.BindSampler(unit, sampler);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glIsSampler(GLuint sampler)
 {
-    return d_3_3_Core->IsSampler(sampler);
+    return d_3_3_Core->f.IsSampler(sampler);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDeleteSamplers(GLsizei count, const GLuint *samplers)
 {
-    d_3_3_Core->DeleteSamplers(count, samplers);
+    d_3_3_Core->f.DeleteSamplers(count, samplers);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGenSamplers(GLsizei count, GLuint *samplers)
 {
-    d_3_3_Core->GenSamplers(count, samplers);
+    d_3_3_Core->f.GenSamplers(count, samplers);
 }
 
 inline GLint QOpenGLFunctions_4_0_Compatibility::glGetFragDataIndex(GLuint program, const GLchar *name)
 {
-    return d_3_3_Core->GetFragDataIndex(program, name);
+    return d_3_3_Core->f.GetFragDataIndex(program, name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
-    d_3_3_Core->BindFragDataLocationIndexed(program, colorNumber, index, name);
+    d_3_3_Core->f.BindFragDataLocationIndexed(program, colorNumber, index, name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-    d_3_3_Core->VertexAttribDivisor(index, divisor);
+    d_3_3_Core->f.VertexAttribDivisor(index, divisor);
 }
 
 
 // OpenGL 4.0 core functions
 inline void QOpenGLFunctions_4_0_Compatibility::glGetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params)
 {
-    d_4_0_Core->GetQueryIndexediv(target, index, pname, params);
+    d_4_0_Core->f.GetQueryIndexediv(target, index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEndQueryIndexed(GLenum target, GLuint index)
 {
-    d_4_0_Core->EndQueryIndexed(target, index);
+    d_4_0_Core->f.EndQueryIndexed(target, index);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBeginQueryIndexed(GLenum target, GLuint index, GLuint id)
 {
-    d_4_0_Core->BeginQueryIndexed(target, index, id);
+    d_4_0_Core->f.BeginQueryIndexed(target, index, id);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawTransformFeedbackStream(GLenum mode, GLuint id, GLuint stream)
 {
-    d_4_0_Core->DrawTransformFeedbackStream(mode, id, stream);
+    d_4_0_Core->f.DrawTransformFeedbackStream(mode, id, stream);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawTransformFeedback(GLenum mode, GLuint id)
 {
-    d_4_0_Core->DrawTransformFeedback(mode, id);
+    d_4_0_Core->f.DrawTransformFeedback(mode, id);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glResumeTransformFeedback()
 {
-    d_4_0_Core->ResumeTransformFeedback();
+    d_4_0_Core->f.ResumeTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPauseTransformFeedback()
 {
-    d_4_0_Core->PauseTransformFeedback();
+    d_4_0_Core->f.PauseTransformFeedback();
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glIsTransformFeedback(GLuint id)
 {
-    return d_4_0_Core->IsTransformFeedback(id);
+    return d_4_0_Core->f.IsTransformFeedback(id);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGenTransformFeedbacks(GLsizei n, GLuint *ids)
 {
-    d_4_0_Core->GenTransformFeedbacks(n, ids);
+    d_4_0_Core->f.GenTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
 {
-    d_4_0_Core->DeleteTransformFeedbacks(n, ids);
+    d_4_0_Core->f.DeleteTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBindTransformFeedback(GLenum target, GLuint id)
 {
-    d_4_0_Core->BindTransformFeedback(target, id);
+    d_4_0_Core->f.BindTransformFeedback(target, id);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPatchParameterfv(GLenum pname, const GLfloat *values)
 {
-    d_4_0_Core->PatchParameterfv(pname, values);
+    d_4_0_Core->f.PatchParameterfv(pname, values);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPatchParameteri(GLenum pname, GLint value)
 {
-    d_4_0_Core->PatchParameteri(pname, value);
+    d_4_0_Core->f.PatchParameteri(pname, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetProgramStageiv(GLuint program, GLenum shadertype, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetProgramStageiv(program, shadertype, pname, values);
+    d_4_0_Core->f.GetProgramStageiv(program, shadertype, pname, values);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetUniformSubroutineuiv(GLenum shadertype, GLint location, GLuint *params)
 {
-    d_4_0_Core->GetUniformSubroutineuiv(shadertype, location, params);
+    d_4_0_Core->f.GetUniformSubroutineuiv(shadertype, location, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformSubroutinesuiv(GLenum shadertype, GLsizei count, const GLuint *indices)
 {
-    d_4_0_Core->UniformSubroutinesuiv(shadertype, count, indices);
+    d_4_0_Core->f.UniformSubroutinesuiv(shadertype, count, indices);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetActiveSubroutineName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetActiveSubroutineUniformName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
+    d_4_0_Core->f.GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
 }
 
 inline GLuint QOpenGLFunctions_4_0_Compatibility::glGetSubroutineIndex(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineIndex(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineIndex(program, shadertype, name);
 }
 
 inline GLint QOpenGLFunctions_4_0_Compatibility::glGetSubroutineUniformLocation(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineUniformLocation(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineUniformLocation(program, shadertype, name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetUniformdv(GLuint program, GLint location, GLdouble *params)
 {
-    d_4_0_Core->GetUniformdv(program, location, params);
+    d_4_0_Core->f.GetUniformdv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix4x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix4x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix3x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix3x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix2x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix2x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniformMatrix2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform4dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform4dv(location, count, value);
+    d_4_0_Core->f.Uniform4dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform3dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform3dv(location, count, value);
+    d_4_0_Core->f.Uniform3dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform2dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform2dv(location, count, value);
+    d_4_0_Core->f.Uniform2dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform1dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform1dv(location, count, value);
+    d_4_0_Core->f.Uniform1dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform4d(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_0_Core->Uniform4d(location, x, y, z, w);
+    d_4_0_Core->f.Uniform4d(location, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform3d(GLint location, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_0_Core->Uniform3d(location, x, y, z);
+    d_4_0_Core->f.Uniform3d(location, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform2d(GLint location, GLdouble x, GLdouble y)
 {
-    d_4_0_Core->Uniform2d(location, x, y);
+    d_4_0_Core->f.Uniform2d(location, x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glUniform1d(GLint location, GLdouble x)
 {
-    d_4_0_Core->Uniform1d(location, x);
+    d_4_0_Core->f.Uniform1d(location, x);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawElementsIndirect(GLenum mode, GLenum type, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawElementsIndirect(mode, type, indirect);
+    d_4_0_Core->f.DrawElementsIndirect(mode, type, indirect);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawArraysIndirect(GLenum mode, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawArraysIndirect(mode, indirect);
+    d_4_0_Core->f.DrawArraysIndirect(mode, indirect);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
 {
-    d_4_0_Core->BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+    d_4_0_Core->f.BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBlendFunci(GLuint buf, GLenum src, GLenum dst)
 {
-    d_4_0_Core->BlendFunci(buf, src, dst);
+    d_4_0_Core->f.BlendFunci(buf, src, dst);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
 {
-    d_4_0_Core->BlendEquationSeparatei(buf, modeRGB, modeAlpha);
+    d_4_0_Core->f.BlendEquationSeparatei(buf, modeRGB, modeAlpha);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBlendEquationi(GLuint buf, GLenum mode)
 {
-    d_4_0_Core->BlendEquationi(buf, mode);
+    d_4_0_Core->f.BlendEquationi(buf, mode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMinSampleShading(GLfloat value)
 {
-    d_4_0_Core->MinSampleShading(value);
+    d_4_0_Core->f.MinSampleShading(value);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_4_0_Compatibility::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_4_0_Compatibility::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_4_0_Compatibility::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_4_0_Compatibility::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Compatibility::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_4_0_Compatibility::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_4_0_Compatibility::glMultTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixd(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixf(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLoadTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixd(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glLoadTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixf(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord4sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_3_Deprecated->MultiTexCoord4s(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4s(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord4iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_3_Deprecated->MultiTexCoord4i(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4i(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord4fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_3_Deprecated->MultiTexCoord4f(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4f(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_3_Deprecated->MultiTexCoord4d(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4d(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord3sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-    d_1_3_Deprecated->MultiTexCoord3s(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3s(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord3iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
-    d_1_3_Deprecated->MultiTexCoord3i(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3i(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord3fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_3_Deprecated->MultiTexCoord3f(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3f(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_3_Deprecated->MultiTexCoord3d(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3d(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord2sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
-    d_1_3_Deprecated->MultiTexCoord2s(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2s(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord2iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
-    d_1_3_Deprecated->MultiTexCoord2i(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2i(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord2fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t)
 {
-    d_1_3_Deprecated->MultiTexCoord2f(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2f(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
-    d_1_3_Deprecated->MultiTexCoord2d(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2d(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord1sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord1s(GLenum target, GLshort s)
 {
-    d_1_3_Deprecated->MultiTexCoord1s(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1s(target, s);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord1iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord1i(GLenum target, GLint s)
 {
-    d_1_3_Deprecated->MultiTexCoord1i(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1i(target, s);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord1fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord1f(GLenum target, GLfloat s)
 {
-    d_1_3_Deprecated->MultiTexCoord1f(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1f(target, s);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glMultiTexCoord1d(GLenum target, GLdouble s)
 {
-    d_1_3_Deprecated->MultiTexCoord1d(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1d(target, s);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glClientActiveTexture(GLenum texture)
 {
-    d_1_3_Deprecated->ClientActiveTexture(texture);
+    d_1_3_Deprecated->f.ClientActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 deprecated functions
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos3sv(v);
+    d_1_4_Deprecated->f.WindowPos3sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_4_Deprecated->WindowPos3s(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos3iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos3iv(v);
+    d_1_4_Deprecated->f.WindowPos3iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_4_Deprecated->WindowPos3i(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos3fv(v);
+    d_1_4_Deprecated->f.WindowPos3fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_4_Deprecated->WindowPos3f(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos3dv(v);
+    d_1_4_Deprecated->f.WindowPos3dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_4_Deprecated->WindowPos3d(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos2sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos2sv(v);
+    d_1_4_Deprecated->f.WindowPos2sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos2s(GLshort x, GLshort y)
 {
-    d_1_4_Deprecated->WindowPos2s(x, y);
+    d_1_4_Deprecated->f.WindowPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos2iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos2iv(v);
+    d_1_4_Deprecated->f.WindowPos2iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos2i(GLint x, GLint y)
 {
-    d_1_4_Deprecated->WindowPos2i(x, y);
+    d_1_4_Deprecated->f.WindowPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos2fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos2fv(v);
+    d_1_4_Deprecated->f.WindowPos2fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos2f(GLfloat x, GLfloat y)
 {
-    d_1_4_Deprecated->WindowPos2f(x, y);
+    d_1_4_Deprecated->f.WindowPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos2dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos2dv(v);
+    d_1_4_Deprecated->f.WindowPos2dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glWindowPos2d(GLdouble x, GLdouble y)
 {
-    d_1_4_Deprecated->WindowPos2d(x, y);
+    d_1_4_Deprecated->f.WindowPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->SecondaryColorPointer(size, type, stride, pointer);
+    d_1_4_Deprecated->f.SecondaryColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3usv(const GLushort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3usv(v);
+    d_1_4_Deprecated->f.SecondaryColor3usv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3us(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3uiv(const GLuint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3uiv(v);
+    d_1_4_Deprecated->f.SecondaryColor3uiv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ui(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3ubv(const GLubyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3ubv(v);
+    d_1_4_Deprecated->f.SecondaryColor3ubv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ub(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3sv(v);
+    d_1_4_Deprecated->f.SecondaryColor3sv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3s(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3iv(const GLint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3iv(v);
+    d_1_4_Deprecated->f.SecondaryColor3iv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3i(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->SecondaryColor3fv(v);
+    d_1_4_Deprecated->f.SecondaryColor3fv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_4_Deprecated->SecondaryColor3f(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->SecondaryColor3dv(v);
+    d_1_4_Deprecated->f.SecondaryColor3dv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_4_Deprecated->SecondaryColor3d(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3bv(const GLbyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3bv(v);
+    d_1_4_Deprecated->f.SecondaryColor3bv(v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glSecondaryColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3b(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFogCoordPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->FogCoordPointer(type, stride, pointer);
+    d_1_4_Deprecated->f.FogCoordPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFogCoorddv(const GLdouble *coord)
 {
-    d_1_4_Deprecated->FogCoorddv(coord);
+    d_1_4_Deprecated->f.FogCoorddv(coord);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFogCoordd(GLdouble coord)
 {
-    d_1_4_Deprecated->FogCoordd(coord);
+    d_1_4_Deprecated->f.FogCoordd(coord);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFogCoordfv(const GLfloat *coord)
 {
-    d_1_4_Deprecated->FogCoordfv(coord);
+    d_1_4_Deprecated->f.FogCoordfv(coord);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glFogCoordf(GLfloat coord)
 {
-    d_1_4_Deprecated->FogCoordf(coord);
+    d_1_4_Deprecated->f.FogCoordf(coord);
 }
 
 
@@ -4713,182 +4720,182 @@ inline void QOpenGLFunctions_4_0_Compatibility::glFogCoordf(GLfloat coord)
 // OpenGL 2.0 deprecated functions
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4usv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4usv(index, v);
+    d_2_0_Core->f.VertexAttrib4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4uiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4uiv(index, v);
+    d_2_0_Core->f.VertexAttrib4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4ubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4ubv(index, v);
+    d_2_0_Core->f.VertexAttrib4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4sv(index, v);
+    d_2_0_Core->f.VertexAttrib4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_2_0_Core->VertexAttrib4s(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4s(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4iv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4iv(index, v);
+    d_2_0_Core->f.VertexAttrib4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib4fv(index, v);
+    d_2_0_Core->f.VertexAttrib4fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_2_0_Core->VertexAttrib4f(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4f(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib4dv(index, v);
+    d_2_0_Core->f.VertexAttrib4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_2_0_Core->VertexAttrib4d(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4bv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4bv(index, v);
+    d_2_0_Core->f.VertexAttrib4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4Nusv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4Nusv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nusv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4Nuiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4Nuiv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nuiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4Nubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nubv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-    d_2_0_Core->VertexAttrib4Nub(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4Nub(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4Nsv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4Nsv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nsv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4Niv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4Niv(index, v);
+    d_2_0_Core->f.VertexAttrib4Niv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib4Nbv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nbv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nbv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib3sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib3sv(index, v);
+    d_2_0_Core->f.VertexAttrib3sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-    d_2_0_Core->VertexAttrib3s(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3s(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib3fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib3fv(index, v);
+    d_2_0_Core->f.VertexAttrib3fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_2_0_Core->VertexAttrib3f(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3f(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib3dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib3dv(index, v);
+    d_2_0_Core->f.VertexAttrib3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_2_0_Core->VertexAttrib3d(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib2sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib2sv(index, v);
+    d_2_0_Core->f.VertexAttrib2sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib2s(GLuint index, GLshort x, GLshort y)
 {
-    d_2_0_Core->VertexAttrib2s(index, x, y);
+    d_2_0_Core->f.VertexAttrib2s(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib2fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib2fv(index, v);
+    d_2_0_Core->f.VertexAttrib2fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    d_2_0_Core->VertexAttrib2f(index, x, y);
+    d_2_0_Core->f.VertexAttrib2f(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib2dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib2dv(index, v);
+    d_2_0_Core->f.VertexAttrib2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_2_0_Core->VertexAttrib2d(index, x, y);
+    d_2_0_Core->f.VertexAttrib2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib1sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib1sv(index, v);
+    d_2_0_Core->f.VertexAttrib1sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib1s(GLuint index, GLshort x)
 {
-    d_2_0_Core->VertexAttrib1s(index, x);
+    d_2_0_Core->f.VertexAttrib1s(index, x);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib1fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib1fv(index, v);
+    d_2_0_Core->f.VertexAttrib1fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    d_2_0_Core->VertexAttrib1f(index, x);
+    d_2_0_Core->f.VertexAttrib1f(index, x);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib1dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib1dv(index, v);
+    d_2_0_Core->f.VertexAttrib1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib1d(GLuint index, GLdouble x)
 {
-    d_2_0_Core->VertexAttrib1d(index, x);
+    d_2_0_Core->f.VertexAttrib1d(index, x);
 }
 
 
@@ -4897,102 +4904,102 @@ inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttrib1d(GLuint index, G
 // OpenGL 3.0 deprecated functions
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI4usv(GLuint index, const GLushort *v)
 {
-    d_3_0_Core->VertexAttribI4usv(index, v);
+    d_3_0_Core->f.VertexAttribI4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI4ubv(GLuint index, const GLubyte *v)
 {
-    d_3_0_Core->VertexAttribI4ubv(index, v);
+    d_3_0_Core->f.VertexAttribI4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI4sv(GLuint index, const GLshort *v)
 {
-    d_3_0_Core->VertexAttribI4sv(index, v);
+    d_3_0_Core->f.VertexAttribI4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI4bv(GLuint index, const GLbyte *v)
 {
-    d_3_0_Core->VertexAttribI4bv(index, v);
+    d_3_0_Core->f.VertexAttribI4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI4uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI4uiv(index, v);
+    d_3_0_Core->f.VertexAttribI4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI3uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI3uiv(index, v);
+    d_3_0_Core->f.VertexAttribI3uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI2uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI2uiv(index, v);
+    d_3_0_Core->f.VertexAttribI2uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI1uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI1uiv(index, v);
+    d_3_0_Core->f.VertexAttribI1uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI4iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI4iv(index, v);
+    d_3_0_Core->f.VertexAttribI4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI3iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI3iv(index, v);
+    d_3_0_Core->f.VertexAttribI3iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI2iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI2iv(index, v);
+    d_3_0_Core->f.VertexAttribI2iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI1iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI1iv(index, v);
+    d_3_0_Core->f.VertexAttribI1iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
-    d_3_0_Core->VertexAttribI4ui(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4ui(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI3ui(GLuint index, GLuint x, GLuint y, GLuint z)
 {
-    d_3_0_Core->VertexAttribI3ui(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3ui(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI2ui(GLuint index, GLuint x, GLuint y)
 {
-    d_3_0_Core->VertexAttribI2ui(index, x, y);
+    d_3_0_Core->f.VertexAttribI2ui(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI1ui(GLuint index, GLuint x)
 {
-    d_3_0_Core->VertexAttribI1ui(index, x);
+    d_3_0_Core->f.VertexAttribI1ui(index, x);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
-    d_3_0_Core->VertexAttribI4i(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4i(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI3i(GLuint index, GLint x, GLint y, GLint z)
 {
-    d_3_0_Core->VertexAttribI3i(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3i(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI2i(GLuint index, GLint x, GLint y)
 {
-    d_3_0_Core->VertexAttribI2i(index, x, y);
+    d_3_0_Core->f.VertexAttribI2i(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Compatibility::glVertexAttribI1i(GLuint index, GLint x)
 {
-    d_3_0_Core->VertexAttribI1i(index, x);
+    d_3_0_Core->f.VertexAttribI1i(index, x);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_4_0_core.cpp b/src/gui/opengl/qopenglfunctions_4_0_core.cpp
index d4d0979ca4..6dc94153c8 100644
--- a/src/gui/opengl/qopenglfunctions_4_0_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_0_core.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -79,58 +85,45 @@ QOpenGLFunctions_4_0_Core::QOpenGLFunctions_4_0_Core()
 
 QOpenGLFunctions_4_0_Core::~QOpenGLFunctions_4_0_Core()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_3_3_Core && !d_3_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Core->context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        delete d_3_3_Core;
-    }
-    if (d_4_0_Core && !d_4_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_0_Core->context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        delete d_4_0_Core;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_3_3_Core)
+        d_3_3_Core->refs.deref();
+    Q_ASSERT(d_3_3_Core->refs.load());
+    if (d_4_0_Core)
+        d_4_0_Core->refs.deref();
+    Q_ASSERT(d_4_0_Core->refs.load());
 }
 
 bool QOpenGLFunctions_4_0_Core::initializeOpenGLFunctions()
@@ -149,106 +142,54 @@ bool QOpenGLFunctions_4_0_Core::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus(), d);
-        }
         d_3_3_Core = static_cast<QOpenGLFunctions_3_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus(), d);
-        }
         d_4_0_Core = static_cast<QOpenGLFunctions_4_0_CoreBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_4_0_core.h b/src/gui/opengl/qopenglfunctions_4_0_core.h
index 8ac35488b1..c3e1e9ce5a 100644
--- a/src/gui/opengl/qopenglfunctions_4_0_core.h
+++ b/src/gui/opengl/qopenglfunctions_4_0_core.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -477,242 +484,242 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_4_0_Core::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Core::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_0_Core::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_4_0_Core::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_4_0_Core::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_4_0_Core::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
@@ -731,57 +738,57 @@ inline void QOpenGLFunctions_4_0_Core::glIndexub(GLubyte c)
 
 inline GLboolean QOpenGLFunctions_4_0_Core::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetPointerv(GLenum pname, GLvoid* *params)
@@ -793,1067 +800,1067 @@ inline void QOpenGLFunctions_4_0_Core::glGetPointerv(GLenum pname, GLvoid* *para
 
 inline void QOpenGLFunctions_4_0_Core::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_4_0_Core::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_4_0_Core::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_4_0_Core::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_4_0_Core::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Core::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_4_0_Core::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Core::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Core::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_4_0_Core::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Core::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Core::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_4_0_Core::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_4_0_Core::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_4_0_Core::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_4_0_Core::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_4_0_Core::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_4_0_Core::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline GLvoid* QOpenGLFunctions_4_0_Core::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_4_0_Core::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Core::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Core::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_0_Core::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_4_0_Core::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Core::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_4_0_Core::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_4_0_Core::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_4_0_Core::glSampleMaski(GLuint index, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(index, mask);
+    d_3_2_Core->f.SampleMaski(index, mask);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetInteger64v(GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetInteger64v(pname, params);
+    d_3_2_Core->f.GetInteger64v(pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_4_0_Core::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Core::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_4_0_Core::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 
 // OpenGL 3.3 core functions
 inline void QOpenGLFunctions_4_0_Core::glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP4uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glVertexAttribP4ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP4ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glVertexAttribP3uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP3uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glVertexAttribP3ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP3ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glVertexAttribP2uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP2uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP2ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP1uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP1ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
@@ -2076,334 +2083,334 @@ inline void QOpenGLFunctions_4_0_Core::glVertexP2ui(GLenum type, GLuint value)
 
 inline void QOpenGLFunctions_4_0_Core::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
 {
-    d_3_3_Core->GetQueryObjectui64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
 {
-    d_3_3_Core->GetQueryObjecti64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjecti64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glQueryCounter(GLuint id, GLenum target)
 {
-    d_3_3_Core->QueryCounter(id, target);
+    d_3_3_Core->f.QueryCounter(id, target);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
 {
-    d_3_3_Core->GetSamplerParameterIuiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIuiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
 {
-    d_3_3_Core->GetSamplerParameterfv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterfv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameterIiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameteriv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameteriv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
 {
-    d_3_3_Core->SamplerParameterIuiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIuiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameterIiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
 {
-    d_3_3_Core->SamplerParameterfv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterfv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-    d_3_3_Core->SamplerParameterf(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterf(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameteriv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteriv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-    d_3_3_Core->SamplerParameteri(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteri(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBindSampler(GLuint unit, GLuint sampler)
 {
-    d_3_3_Core->BindSampler(unit, sampler);
+    d_3_3_Core->f.BindSampler(unit, sampler);
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Core::glIsSampler(GLuint sampler)
 {
-    return d_3_3_Core->IsSampler(sampler);
+    return d_3_3_Core->f.IsSampler(sampler);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDeleteSamplers(GLsizei count, const GLuint *samplers)
 {
-    d_3_3_Core->DeleteSamplers(count, samplers);
+    d_3_3_Core->f.DeleteSamplers(count, samplers);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGenSamplers(GLsizei count, GLuint *samplers)
 {
-    d_3_3_Core->GenSamplers(count, samplers);
+    d_3_3_Core->f.GenSamplers(count, samplers);
 }
 
 inline GLint QOpenGLFunctions_4_0_Core::glGetFragDataIndex(GLuint program, const GLchar *name)
 {
-    return d_3_3_Core->GetFragDataIndex(program, name);
+    return d_3_3_Core->f.GetFragDataIndex(program, name);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
-    d_3_3_Core->BindFragDataLocationIndexed(program, colorNumber, index, name);
+    d_3_3_Core->f.BindFragDataLocationIndexed(program, colorNumber, index, name);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-    d_3_3_Core->VertexAttribDivisor(index, divisor);
+    d_3_3_Core->f.VertexAttribDivisor(index, divisor);
 }
 
 
 // OpenGL 4.0 core functions
 inline void QOpenGLFunctions_4_0_Core::glGetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params)
 {
-    d_4_0_Core->GetQueryIndexediv(target, index, pname, params);
+    d_4_0_Core->f.GetQueryIndexediv(target, index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glEndQueryIndexed(GLenum target, GLuint index)
 {
-    d_4_0_Core->EndQueryIndexed(target, index);
+    d_4_0_Core->f.EndQueryIndexed(target, index);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBeginQueryIndexed(GLenum target, GLuint index, GLuint id)
 {
-    d_4_0_Core->BeginQueryIndexed(target, index, id);
+    d_4_0_Core->f.BeginQueryIndexed(target, index, id);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDrawTransformFeedbackStream(GLenum mode, GLuint id, GLuint stream)
 {
-    d_4_0_Core->DrawTransformFeedbackStream(mode, id, stream);
+    d_4_0_Core->f.DrawTransformFeedbackStream(mode, id, stream);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDrawTransformFeedback(GLenum mode, GLuint id)
 {
-    d_4_0_Core->DrawTransformFeedback(mode, id);
+    d_4_0_Core->f.DrawTransformFeedback(mode, id);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glResumeTransformFeedback()
 {
-    d_4_0_Core->ResumeTransformFeedback();
+    d_4_0_Core->f.ResumeTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_0_Core::glPauseTransformFeedback()
 {
-    d_4_0_Core->PauseTransformFeedback();
+    d_4_0_Core->f.PauseTransformFeedback();
 }
 
 inline GLboolean QOpenGLFunctions_4_0_Core::glIsTransformFeedback(GLuint id)
 {
-    return d_4_0_Core->IsTransformFeedback(id);
+    return d_4_0_Core->f.IsTransformFeedback(id);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGenTransformFeedbacks(GLsizei n, GLuint *ids)
 {
-    d_4_0_Core->GenTransformFeedbacks(n, ids);
+    d_4_0_Core->f.GenTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
 {
-    d_4_0_Core->DeleteTransformFeedbacks(n, ids);
+    d_4_0_Core->f.DeleteTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBindTransformFeedback(GLenum target, GLuint id)
 {
-    d_4_0_Core->BindTransformFeedback(target, id);
+    d_4_0_Core->f.BindTransformFeedback(target, id);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glPatchParameterfv(GLenum pname, const GLfloat *values)
 {
-    d_4_0_Core->PatchParameterfv(pname, values);
+    d_4_0_Core->f.PatchParameterfv(pname, values);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glPatchParameteri(GLenum pname, GLint value)
 {
-    d_4_0_Core->PatchParameteri(pname, value);
+    d_4_0_Core->f.PatchParameteri(pname, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetProgramStageiv(GLuint program, GLenum shadertype, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetProgramStageiv(program, shadertype, pname, values);
+    d_4_0_Core->f.GetProgramStageiv(program, shadertype, pname, values);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetUniformSubroutineuiv(GLenum shadertype, GLint location, GLuint *params)
 {
-    d_4_0_Core->GetUniformSubroutineuiv(shadertype, location, params);
+    d_4_0_Core->f.GetUniformSubroutineuiv(shadertype, location, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformSubroutinesuiv(GLenum shadertype, GLsizei count, const GLuint *indices)
 {
-    d_4_0_Core->UniformSubroutinesuiv(shadertype, count, indices);
+    d_4_0_Core->f.UniformSubroutinesuiv(shadertype, count, indices);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetActiveSubroutineName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetActiveSubroutineUniformName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
+    d_4_0_Core->f.GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
 }
 
 inline GLuint QOpenGLFunctions_4_0_Core::glGetSubroutineIndex(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineIndex(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineIndex(program, shadertype, name);
 }
 
 inline GLint QOpenGLFunctions_4_0_Core::glGetSubroutineUniformLocation(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineUniformLocation(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineUniformLocation(program, shadertype, name);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glGetUniformdv(GLuint program, GLint location, GLdouble *params)
 {
-    d_4_0_Core->GetUniformdv(program, location, params);
+    d_4_0_Core->f.GetUniformdv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix4x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix4x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix3x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix3x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix2x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix2x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniformMatrix2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform4dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform4dv(location, count, value);
+    d_4_0_Core->f.Uniform4dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform3dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform3dv(location, count, value);
+    d_4_0_Core->f.Uniform3dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform2dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform2dv(location, count, value);
+    d_4_0_Core->f.Uniform2dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform1dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform1dv(location, count, value);
+    d_4_0_Core->f.Uniform1dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform4d(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_0_Core->Uniform4d(location, x, y, z, w);
+    d_4_0_Core->f.Uniform4d(location, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform3d(GLint location, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_0_Core->Uniform3d(location, x, y, z);
+    d_4_0_Core->f.Uniform3d(location, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform2d(GLint location, GLdouble x, GLdouble y)
 {
-    d_4_0_Core->Uniform2d(location, x, y);
+    d_4_0_Core->f.Uniform2d(location, x, y);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glUniform1d(GLint location, GLdouble x)
 {
-    d_4_0_Core->Uniform1d(location, x);
+    d_4_0_Core->f.Uniform1d(location, x);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDrawElementsIndirect(GLenum mode, GLenum type, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawElementsIndirect(mode, type, indirect);
+    d_4_0_Core->f.DrawElementsIndirect(mode, type, indirect);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glDrawArraysIndirect(GLenum mode, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawArraysIndirect(mode, indirect);
+    d_4_0_Core->f.DrawArraysIndirect(mode, indirect);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
 {
-    d_4_0_Core->BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+    d_4_0_Core->f.BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBlendFunci(GLuint buf, GLenum src, GLenum dst)
 {
-    d_4_0_Core->BlendFunci(buf, src, dst);
+    d_4_0_Core->f.BlendFunci(buf, src, dst);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
 {
-    d_4_0_Core->BlendEquationSeparatei(buf, modeRGB, modeAlpha);
+    d_4_0_Core->f.BlendEquationSeparatei(buf, modeRGB, modeAlpha);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glBlendEquationi(GLuint buf, GLenum mode)
 {
-    d_4_0_Core->BlendEquationi(buf, mode);
+    d_4_0_Core->f.BlendEquationi(buf, mode);
 }
 
 inline void QOpenGLFunctions_4_0_Core::glMinSampleShading(GLfloat value)
 {
-    d_4_0_Core->MinSampleShading(value);
+    d_4_0_Core->f.MinSampleShading(value);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp
index d38cbbe49d..293409ddef 100644
--- a/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -87,86 +93,66 @@ QOpenGLFunctions_4_1_Compatibility::QOpenGLFunctions_4_1_Compatibility()
 
 QOpenGLFunctions_4_1_Compatibility::~QOpenGLFunctions_4_1_Compatibility()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_3_3_Core && !d_3_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Core->context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        delete d_3_3_Core;
-    }
-    if (d_4_0_Core && !d_4_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_0_Core->context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        delete d_4_0_Core;
-    }
-    if (d_4_1_Core && !d_4_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_1_Core->context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        delete d_4_1_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
-    if (d_1_3_Deprecated && !d_1_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Deprecated->context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        delete d_1_3_Deprecated;
-    }
-    if (d_1_4_Deprecated && !d_1_4_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Deprecated->context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        delete d_1_4_Deprecated;
-    }
-    if (d_3_3_Deprecated && !d_3_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Deprecated->context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus());
-        delete d_3_3_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_3_3_Core)
+        d_3_3_Core->refs.deref();
+    Q_ASSERT(d_3_3_Core->refs.load());
+    if (d_4_0_Core)
+        d_4_0_Core->refs.deref();
+    Q_ASSERT(d_4_0_Core->refs.load());
+    if (d_4_1_Core)
+        d_4_1_Core->refs.deref();
+    Q_ASSERT(d_4_1_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
+    if (d_1_3_Deprecated)
+        d_1_3_Deprecated->refs.deref();
+    Q_ASSERT(d_1_3_Deprecated->refs.load());
+    if (d_1_4_Deprecated)
+        d_1_4_Deprecated->refs.deref();
+    Q_ASSERT(d_1_4_Deprecated->refs.load());
+    if (d_3_3_Deprecated)
+        d_3_3_Deprecated->refs.deref();
+    Q_ASSERT(d_3_3_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_4_1_Compatibility::initializeOpenGLFunctions()
@@ -185,162 +171,82 @@ bool QOpenGLFunctions_4_1_Compatibility::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus(), d);
-        }
         d_3_3_Core = static_cast<QOpenGLFunctions_3_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus(), d);
-        }
         d_4_0_Core = static_cast<QOpenGLFunctions_4_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus(), d);
-        }
         d_4_1_Core = static_cast<QOpenGLFunctions_4_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_3_Deprecated = static_cast<QOpenGLFunctions_1_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_4_Deprecated = static_cast<QOpenGLFunctions_1_4_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_3_3_Deprecated = static_cast<QOpenGLFunctions_3_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_4_1_compatibility.h b/src/gui/opengl/qopenglfunctions_4_1_compatibility.h
index 7a9394ff79..e06803f0aa 100644
--- a/src/gui/opengl/qopenglfunctions_4_1_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_4_1_compatibility.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -1038,4208 +1045,4208 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_4_1_Compatibility::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_1_Compatibility::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_4_1_Compatibility::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline void QOpenGLFunctions_4_1_Compatibility::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetPointerv(GLenum pname, GLvoid* *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_4_1_Compatibility::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_4_1_Compatibility::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_4_1_Compatibility::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_4_1_Compatibility::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_4_1_Compatibility::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_4_1_Compatibility::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_4_1_Compatibility::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_4_1_Compatibility::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_4_1_Compatibility::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline GLvoid* QOpenGLFunctions_4_1_Compatibility::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_4_1_Compatibility::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_1_Compatibility::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_4_1_Compatibility::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_4_1_Compatibility::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_4_1_Compatibility::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_4_1_Compatibility::glSampleMaski(GLuint index, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(index, mask);
+    d_3_2_Core->f.SampleMaski(index, mask);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetInteger64v(GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetInteger64v(pname, params);
+    d_3_2_Core->f.GetInteger64v(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_4_1_Compatibility::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_4_1_Compatibility::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 
 // OpenGL 3.3 core functions
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP4uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribP4ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP4ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribP3uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP3uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribP3ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP3ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribP2uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP2uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP2ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP1uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP1ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->SecondaryColorP3uiv(type, color);
+    d_3_3_Deprecated->f.SecondaryColorP3uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColorP3ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->SecondaryColorP3ui(type, color);
+    d_3_3_Deprecated->f.SecondaryColorP3ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColorP4uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->ColorP4uiv(type, color);
+    d_3_3_Deprecated->f.ColorP4uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColorP4ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->ColorP4ui(type, color);
+    d_3_3_Deprecated->f.ColorP4ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColorP3uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->ColorP3uiv(type, color);
+    d_3_3_Deprecated->f.ColorP3uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColorP3ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->ColorP3ui(type, color);
+    d_3_3_Deprecated->f.ColorP3ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glNormalP3uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->NormalP3uiv(type, coords);
+    d_3_3_Deprecated->f.NormalP3uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glNormalP3ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->NormalP3ui(type, coords);
+    d_3_3_Deprecated->f.NormalP3ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoordP4uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP4uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP4uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoordP4ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP4ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP4ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoordP3uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP3uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP3uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoordP3ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP3ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP3ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoordP2uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP2uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP2uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoordP2ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP2ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP2ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoordP1uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP1uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP1uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoordP1ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP1ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP1ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoordP4uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP4uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP4uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoordP4ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP4ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP4ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoordP3uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP3uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP3uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoordP3ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP3ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP3ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoordP2uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP2uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP2uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoordP2ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP2ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP2ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoordP1uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP1uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP1uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoordP1ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP1ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP1ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexP4uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP4uiv(type, value);
+    d_3_3_Deprecated->f.VertexP4uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexP4ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP4ui(type, value);
+    d_3_3_Deprecated->f.VertexP4ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexP3uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP3uiv(type, value);
+    d_3_3_Deprecated->f.VertexP3uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexP3ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP3ui(type, value);
+    d_3_3_Deprecated->f.VertexP3ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexP2uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP2uiv(type, value);
+    d_3_3_Deprecated->f.VertexP2uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexP2ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP2ui(type, value);
+    d_3_3_Deprecated->f.VertexP2ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
 {
-    d_3_3_Core->GetQueryObjectui64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
 {
-    d_3_3_Core->GetQueryObjecti64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjecti64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glQueryCounter(GLuint id, GLenum target)
 {
-    d_3_3_Core->QueryCounter(id, target);
+    d_3_3_Core->f.QueryCounter(id, target);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
 {
-    d_3_3_Core->GetSamplerParameterIuiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIuiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
 {
-    d_3_3_Core->GetSamplerParameterfv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterfv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameterIiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameteriv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameteriv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
 {
-    d_3_3_Core->SamplerParameterIuiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIuiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameterIiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
 {
-    d_3_3_Core->SamplerParameterfv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterfv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-    d_3_3_Core->SamplerParameterf(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterf(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameteriv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteriv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-    d_3_3_Core->SamplerParameteri(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteri(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBindSampler(GLuint unit, GLuint sampler)
 {
-    d_3_3_Core->BindSampler(unit, sampler);
+    d_3_3_Core->f.BindSampler(unit, sampler);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsSampler(GLuint sampler)
 {
-    return d_3_3_Core->IsSampler(sampler);
+    return d_3_3_Core->f.IsSampler(sampler);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDeleteSamplers(GLsizei count, const GLuint *samplers)
 {
-    d_3_3_Core->DeleteSamplers(count, samplers);
+    d_3_3_Core->f.DeleteSamplers(count, samplers);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGenSamplers(GLsizei count, GLuint *samplers)
 {
-    d_3_3_Core->GenSamplers(count, samplers);
+    d_3_3_Core->f.GenSamplers(count, samplers);
 }
 
 inline GLint QOpenGLFunctions_4_1_Compatibility::glGetFragDataIndex(GLuint program, const GLchar *name)
 {
-    return d_3_3_Core->GetFragDataIndex(program, name);
+    return d_3_3_Core->f.GetFragDataIndex(program, name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
-    d_3_3_Core->BindFragDataLocationIndexed(program, colorNumber, index, name);
+    d_3_3_Core->f.BindFragDataLocationIndexed(program, colorNumber, index, name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-    d_3_3_Core->VertexAttribDivisor(index, divisor);
+    d_3_3_Core->f.VertexAttribDivisor(index, divisor);
 }
 
 
 // OpenGL 4.0 core functions
 inline void QOpenGLFunctions_4_1_Compatibility::glGetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params)
 {
-    d_4_0_Core->GetQueryIndexediv(target, index, pname, params);
+    d_4_0_Core->f.GetQueryIndexediv(target, index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEndQueryIndexed(GLenum target, GLuint index)
 {
-    d_4_0_Core->EndQueryIndexed(target, index);
+    d_4_0_Core->f.EndQueryIndexed(target, index);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBeginQueryIndexed(GLenum target, GLuint index, GLuint id)
 {
-    d_4_0_Core->BeginQueryIndexed(target, index, id);
+    d_4_0_Core->f.BeginQueryIndexed(target, index, id);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawTransformFeedbackStream(GLenum mode, GLuint id, GLuint stream)
 {
-    d_4_0_Core->DrawTransformFeedbackStream(mode, id, stream);
+    d_4_0_Core->f.DrawTransformFeedbackStream(mode, id, stream);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawTransformFeedback(GLenum mode, GLuint id)
 {
-    d_4_0_Core->DrawTransformFeedback(mode, id);
+    d_4_0_Core->f.DrawTransformFeedback(mode, id);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glResumeTransformFeedback()
 {
-    d_4_0_Core->ResumeTransformFeedback();
+    d_4_0_Core->f.ResumeTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPauseTransformFeedback()
 {
-    d_4_0_Core->PauseTransformFeedback();
+    d_4_0_Core->f.PauseTransformFeedback();
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsTransformFeedback(GLuint id)
 {
-    return d_4_0_Core->IsTransformFeedback(id);
+    return d_4_0_Core->f.IsTransformFeedback(id);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGenTransformFeedbacks(GLsizei n, GLuint *ids)
 {
-    d_4_0_Core->GenTransformFeedbacks(n, ids);
+    d_4_0_Core->f.GenTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
 {
-    d_4_0_Core->DeleteTransformFeedbacks(n, ids);
+    d_4_0_Core->f.DeleteTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBindTransformFeedback(GLenum target, GLuint id)
 {
-    d_4_0_Core->BindTransformFeedback(target, id);
+    d_4_0_Core->f.BindTransformFeedback(target, id);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPatchParameterfv(GLenum pname, const GLfloat *values)
 {
-    d_4_0_Core->PatchParameterfv(pname, values);
+    d_4_0_Core->f.PatchParameterfv(pname, values);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPatchParameteri(GLenum pname, GLint value)
 {
-    d_4_0_Core->PatchParameteri(pname, value);
+    d_4_0_Core->f.PatchParameteri(pname, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetProgramStageiv(GLuint program, GLenum shadertype, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetProgramStageiv(program, shadertype, pname, values);
+    d_4_0_Core->f.GetProgramStageiv(program, shadertype, pname, values);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetUniformSubroutineuiv(GLenum shadertype, GLint location, GLuint *params)
 {
-    d_4_0_Core->GetUniformSubroutineuiv(shadertype, location, params);
+    d_4_0_Core->f.GetUniformSubroutineuiv(shadertype, location, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformSubroutinesuiv(GLenum shadertype, GLsizei count, const GLuint *indices)
 {
-    d_4_0_Core->UniformSubroutinesuiv(shadertype, count, indices);
+    d_4_0_Core->f.UniformSubroutinesuiv(shadertype, count, indices);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetActiveSubroutineName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetActiveSubroutineUniformName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
+    d_4_0_Core->f.GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
 }
 
 inline GLuint QOpenGLFunctions_4_1_Compatibility::glGetSubroutineIndex(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineIndex(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineIndex(program, shadertype, name);
 }
 
 inline GLint QOpenGLFunctions_4_1_Compatibility::glGetSubroutineUniformLocation(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineUniformLocation(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineUniformLocation(program, shadertype, name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetUniformdv(GLuint program, GLint location, GLdouble *params)
 {
-    d_4_0_Core->GetUniformdv(program, location, params);
+    d_4_0_Core->f.GetUniformdv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix4x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix4x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix3x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix3x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix2x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix2x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniformMatrix2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform4dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform4dv(location, count, value);
+    d_4_0_Core->f.Uniform4dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform3dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform3dv(location, count, value);
+    d_4_0_Core->f.Uniform3dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform2dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform2dv(location, count, value);
+    d_4_0_Core->f.Uniform2dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform1dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform1dv(location, count, value);
+    d_4_0_Core->f.Uniform1dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform4d(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_0_Core->Uniform4d(location, x, y, z, w);
+    d_4_0_Core->f.Uniform4d(location, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform3d(GLint location, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_0_Core->Uniform3d(location, x, y, z);
+    d_4_0_Core->f.Uniform3d(location, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform2d(GLint location, GLdouble x, GLdouble y)
 {
-    d_4_0_Core->Uniform2d(location, x, y);
+    d_4_0_Core->f.Uniform2d(location, x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUniform1d(GLint location, GLdouble x)
 {
-    d_4_0_Core->Uniform1d(location, x);
+    d_4_0_Core->f.Uniform1d(location, x);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawElementsIndirect(GLenum mode, GLenum type, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawElementsIndirect(mode, type, indirect);
+    d_4_0_Core->f.DrawElementsIndirect(mode, type, indirect);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawArraysIndirect(GLenum mode, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawArraysIndirect(mode, indirect);
+    d_4_0_Core->f.DrawArraysIndirect(mode, indirect);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
 {
-    d_4_0_Core->BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+    d_4_0_Core->f.BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBlendFunci(GLuint buf, GLenum src, GLenum dst)
 {
-    d_4_0_Core->BlendFunci(buf, src, dst);
+    d_4_0_Core->f.BlendFunci(buf, src, dst);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
 {
-    d_4_0_Core->BlendEquationSeparatei(buf, modeRGB, modeAlpha);
+    d_4_0_Core->f.BlendEquationSeparatei(buf, modeRGB, modeAlpha);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBlendEquationi(GLuint buf, GLenum mode)
 {
-    d_4_0_Core->BlendEquationi(buf, mode);
+    d_4_0_Core->f.BlendEquationi(buf, mode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMinSampleShading(GLfloat value)
 {
-    d_4_0_Core->MinSampleShading(value);
+    d_4_0_Core->f.MinSampleShading(value);
 }
 
 
 // OpenGL 4.1 core functions
 inline void QOpenGLFunctions_4_1_Compatibility::glGetDoublei_v(GLenum target, GLuint index, GLdouble *data)
 {
-    d_4_1_Core->GetDoublei_v(target, index, data);
+    d_4_1_Core->f.GetDoublei_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetFloati_v(GLenum target, GLuint index, GLfloat *data)
 {
-    d_4_1_Core->GetFloati_v(target, index, data);
+    d_4_1_Core->f.GetFloati_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDepthRangeIndexed(GLuint index, GLdouble n, GLdouble f)
 {
-    d_4_1_Core->DepthRangeIndexed(index, n, f);
+    d_4_1_Core->f.DepthRangeIndexed(index, n, f);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDepthRangeArrayv(GLuint first, GLsizei count, const GLdouble *v)
 {
-    d_4_1_Core->DepthRangeArrayv(first, count, v);
+    d_4_1_Core->f.DepthRangeArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glScissorIndexedv(GLuint index, const GLint *v)
 {
-    d_4_1_Core->ScissorIndexedv(index, v);
+    d_4_1_Core->f.ScissorIndexedv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glScissorIndexed(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height)
 {
-    d_4_1_Core->ScissorIndexed(index, left, bottom, width, height);
+    d_4_1_Core->f.ScissorIndexed(index, left, bottom, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glScissorArrayv(GLuint first, GLsizei count, const GLint *v)
 {
-    d_4_1_Core->ScissorArrayv(first, count, v);
+    d_4_1_Core->f.ScissorArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glViewportIndexedfv(GLuint index, const GLfloat *v)
 {
-    d_4_1_Core->ViewportIndexedfv(index, v);
+    d_4_1_Core->f.ViewportIndexedfv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glViewportIndexedf(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h)
 {
-    d_4_1_Core->ViewportIndexedf(index, x, y, w, h);
+    d_4_1_Core->f.ViewportIndexedf(index, x, y, w, h);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glViewportArrayv(GLuint first, GLsizei count, const GLfloat *v)
 {
-    d_4_1_Core->ViewportArrayv(first, count, v);
+    d_4_1_Core->f.ViewportArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetVertexAttribLdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_4_1_Core->GetVertexAttribLdv(index, pname, params);
+    d_4_1_Core->f.GetVertexAttribLdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribLPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_4_1_Core->VertexAttribLPointer(index, size, type, stride, pointer);
+    d_4_1_Core->f.VertexAttribLPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribL4dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL4dv(index, v);
+    d_4_1_Core->f.VertexAttribL4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribL3dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL3dv(index, v);
+    d_4_1_Core->f.VertexAttribL3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribL2dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL2dv(index, v);
+    d_4_1_Core->f.VertexAttribL2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribL1dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL1dv(index, v);
+    d_4_1_Core->f.VertexAttribL1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribL4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_1_Core->VertexAttribL4d(index, x, y, z, w);
+    d_4_1_Core->f.VertexAttribL4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribL3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_1_Core->VertexAttribL3d(index, x, y, z);
+    d_4_1_Core->f.VertexAttribL3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribL2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_4_1_Core->VertexAttribL2d(index, x, y);
+    d_4_1_Core->f.VertexAttribL2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribL1d(GLuint index, GLdouble x)
 {
-    d_4_1_Core->VertexAttribL1d(index, x);
+    d_4_1_Core->f.VertexAttribL1d(index, x);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetProgramPipelineInfoLog(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_4_1_Core->GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
+    d_4_1_Core->f.GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glValidateProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->ValidateProgramPipeline(pipeline);
+    d_4_1_Core->f.ValidateProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix4x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix3x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix4x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix2x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix3x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix2x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix4x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix3x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix4x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix2x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix3x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix2x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniformMatrix2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform4uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform4uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_4_1_Core->ProgramUniform4ui(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4ui(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform4dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform4dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform4d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3)
 {
-    d_4_1_Core->ProgramUniform4d(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4d(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform4fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform4fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_4_1_Core->ProgramUniform4f(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4f(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform4iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform4iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_4_1_Core->ProgramUniform4i(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4i(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform3uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform3uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_4_1_Core->ProgramUniform3ui(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3ui(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform3dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform3dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform3d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2)
 {
-    d_4_1_Core->ProgramUniform3d(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3d(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform3fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform3fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_4_1_Core->ProgramUniform3f(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3f(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform3iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform3iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_4_1_Core->ProgramUniform3i(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3i(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform2uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform2uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
 {
-    d_4_1_Core->ProgramUniform2ui(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2ui(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform2dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform2dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform2d(GLuint program, GLint location, GLdouble v0, GLdouble v1)
 {
-    d_4_1_Core->ProgramUniform2d(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2d(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform2fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform2fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1)
 {
-    d_4_1_Core->ProgramUniform2f(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2f(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform2iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform2iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
 {
-    d_4_1_Core->ProgramUniform2i(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2i(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform1uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform1uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform1ui(GLuint program, GLint location, GLuint v0)
 {
-    d_4_1_Core->ProgramUniform1ui(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1ui(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform1dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform1dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform1d(GLuint program, GLint location, GLdouble v0)
 {
-    d_4_1_Core->ProgramUniform1d(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1d(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform1fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform1fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform1f(GLuint program, GLint location, GLfloat v0)
 {
-    d_4_1_Core->ProgramUniform1f(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1f(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform1iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform1iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramUniform1i(GLuint program, GLint location, GLint v0)
 {
-    d_4_1_Core->ProgramUniform1i(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1i(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
 {
-    d_4_1_Core->GetProgramPipelineiv(pipeline, pname, params);
+    d_4_1_Core->f.GetProgramPipelineiv(pipeline, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsProgramPipeline(GLuint pipeline)
 {
-    return d_4_1_Core->IsProgramPipeline(pipeline);
+    return d_4_1_Core->f.IsProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGenProgramPipelines(GLsizei n, GLuint *pipelines)
 {
-    d_4_1_Core->GenProgramPipelines(n, pipelines);
+    d_4_1_Core->f.GenProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
 {
-    d_4_1_Core->DeleteProgramPipelines(n, pipelines);
+    d_4_1_Core->f.DeleteProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBindProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->BindProgramPipeline(pipeline);
+    d_4_1_Core->f.BindProgramPipeline(pipeline);
 }
 
 inline GLuint QOpenGLFunctions_4_1_Compatibility::glCreateShaderProgramv(GLenum type, GLsizei count, const GLchar* const *strings)
 {
-    return d_4_1_Core->CreateShaderProgramv(type, count, strings);
+    return d_4_1_Core->f.CreateShaderProgramv(type, count, strings);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glActiveShaderProgram(GLuint pipeline, GLuint program)
 {
-    d_4_1_Core->ActiveShaderProgram(pipeline, program);
+    d_4_1_Core->f.ActiveShaderProgram(pipeline, program);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glUseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
 {
-    d_4_1_Core->UseProgramStages(pipeline, stages, program);
+    d_4_1_Core->f.UseProgramStages(pipeline, stages, program);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramParameteri(GLuint program, GLenum pname, GLint value)
 {
-    d_4_1_Core->ProgramParameteri(program, pname, value);
+    d_4_1_Core->f.ProgramParameteri(program, pname, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glProgramBinary(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length)
 {
-    d_4_1_Core->ProgramBinary(program, binaryFormat, binary, length);
+    d_4_1_Core->f.ProgramBinary(program, binaryFormat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary)
 {
-    d_4_1_Core->GetProgramBinary(program, bufSize, length, binaryFormat, binary);
+    d_4_1_Core->f.GetProgramBinary(program, bufSize, length, binaryFormat, binary);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glClearDepthf(GLfloat dd)
 {
-    d_4_1_Core->ClearDepthf(dd);
+    d_4_1_Core->f.ClearDepthf(dd);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDepthRangef(GLfloat n, GLfloat f)
 {
-    d_4_1_Core->DepthRangef(n, f);
+    d_4_1_Core->f.DepthRangef(n, f);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)
 {
-    d_4_1_Core->GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+    d_4_1_Core->f.GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glShaderBinary(GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length)
 {
-    d_4_1_Core->ShaderBinary(count, shaders, binaryformat, binary, length);
+    d_4_1_Core->f.ShaderBinary(count, shaders, binaryformat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glReleaseShaderCompiler()
 {
-    d_4_1_Core->ReleaseShaderCompiler();
+    d_4_1_Core->f.ReleaseShaderCompiler();
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_4_1_Compatibility::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_4_1_Compatibility::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_4_1_Compatibility::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_4_1_Compatibility::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Compatibility::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_4_1_Compatibility::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_4_1_Compatibility::glMultTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixd(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixf(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLoadTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixd(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glLoadTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixf(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord4sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_3_Deprecated->MultiTexCoord4s(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4s(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord4iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_3_Deprecated->MultiTexCoord4i(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4i(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord4fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_3_Deprecated->MultiTexCoord4f(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4f(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_3_Deprecated->MultiTexCoord4d(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4d(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord3sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-    d_1_3_Deprecated->MultiTexCoord3s(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3s(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord3iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
-    d_1_3_Deprecated->MultiTexCoord3i(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3i(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord3fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_3_Deprecated->MultiTexCoord3f(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3f(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_3_Deprecated->MultiTexCoord3d(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3d(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord2sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
-    d_1_3_Deprecated->MultiTexCoord2s(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2s(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord2iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
-    d_1_3_Deprecated->MultiTexCoord2i(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2i(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord2fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t)
 {
-    d_1_3_Deprecated->MultiTexCoord2f(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2f(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
-    d_1_3_Deprecated->MultiTexCoord2d(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2d(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord1sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord1s(GLenum target, GLshort s)
 {
-    d_1_3_Deprecated->MultiTexCoord1s(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1s(target, s);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord1iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord1i(GLenum target, GLint s)
 {
-    d_1_3_Deprecated->MultiTexCoord1i(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1i(target, s);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord1fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord1f(GLenum target, GLfloat s)
 {
-    d_1_3_Deprecated->MultiTexCoord1f(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1f(target, s);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glMultiTexCoord1d(GLenum target, GLdouble s)
 {
-    d_1_3_Deprecated->MultiTexCoord1d(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1d(target, s);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glClientActiveTexture(GLenum texture)
 {
-    d_1_3_Deprecated->ClientActiveTexture(texture);
+    d_1_3_Deprecated->f.ClientActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 deprecated functions
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos3sv(v);
+    d_1_4_Deprecated->f.WindowPos3sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_4_Deprecated->WindowPos3s(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos3iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos3iv(v);
+    d_1_4_Deprecated->f.WindowPos3iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_4_Deprecated->WindowPos3i(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos3fv(v);
+    d_1_4_Deprecated->f.WindowPos3fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_4_Deprecated->WindowPos3f(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos3dv(v);
+    d_1_4_Deprecated->f.WindowPos3dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_4_Deprecated->WindowPos3d(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos2sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos2sv(v);
+    d_1_4_Deprecated->f.WindowPos2sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos2s(GLshort x, GLshort y)
 {
-    d_1_4_Deprecated->WindowPos2s(x, y);
+    d_1_4_Deprecated->f.WindowPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos2iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos2iv(v);
+    d_1_4_Deprecated->f.WindowPos2iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos2i(GLint x, GLint y)
 {
-    d_1_4_Deprecated->WindowPos2i(x, y);
+    d_1_4_Deprecated->f.WindowPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos2fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos2fv(v);
+    d_1_4_Deprecated->f.WindowPos2fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos2f(GLfloat x, GLfloat y)
 {
-    d_1_4_Deprecated->WindowPos2f(x, y);
+    d_1_4_Deprecated->f.WindowPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos2dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos2dv(v);
+    d_1_4_Deprecated->f.WindowPos2dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glWindowPos2d(GLdouble x, GLdouble y)
 {
-    d_1_4_Deprecated->WindowPos2d(x, y);
+    d_1_4_Deprecated->f.WindowPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->SecondaryColorPointer(size, type, stride, pointer);
+    d_1_4_Deprecated->f.SecondaryColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3usv(const GLushort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3usv(v);
+    d_1_4_Deprecated->f.SecondaryColor3usv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3us(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3uiv(const GLuint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3uiv(v);
+    d_1_4_Deprecated->f.SecondaryColor3uiv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ui(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3ubv(const GLubyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3ubv(v);
+    d_1_4_Deprecated->f.SecondaryColor3ubv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ub(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3sv(v);
+    d_1_4_Deprecated->f.SecondaryColor3sv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3s(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3iv(const GLint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3iv(v);
+    d_1_4_Deprecated->f.SecondaryColor3iv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3i(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->SecondaryColor3fv(v);
+    d_1_4_Deprecated->f.SecondaryColor3fv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_4_Deprecated->SecondaryColor3f(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->SecondaryColor3dv(v);
+    d_1_4_Deprecated->f.SecondaryColor3dv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_4_Deprecated->SecondaryColor3d(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3bv(const GLbyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3bv(v);
+    d_1_4_Deprecated->f.SecondaryColor3bv(v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glSecondaryColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3b(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFogCoordPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->FogCoordPointer(type, stride, pointer);
+    d_1_4_Deprecated->f.FogCoordPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFogCoorddv(const GLdouble *coord)
 {
-    d_1_4_Deprecated->FogCoorddv(coord);
+    d_1_4_Deprecated->f.FogCoorddv(coord);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFogCoordd(GLdouble coord)
 {
-    d_1_4_Deprecated->FogCoordd(coord);
+    d_1_4_Deprecated->f.FogCoordd(coord);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFogCoordfv(const GLfloat *coord)
 {
-    d_1_4_Deprecated->FogCoordfv(coord);
+    d_1_4_Deprecated->f.FogCoordfv(coord);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glFogCoordf(GLfloat coord)
 {
-    d_1_4_Deprecated->FogCoordf(coord);
+    d_1_4_Deprecated->f.FogCoordf(coord);
 }
 
 
@@ -5248,182 +5255,182 @@ inline void QOpenGLFunctions_4_1_Compatibility::glFogCoordf(GLfloat coord)
 // OpenGL 2.0 deprecated functions
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4usv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4usv(index, v);
+    d_2_0_Core->f.VertexAttrib4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4uiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4uiv(index, v);
+    d_2_0_Core->f.VertexAttrib4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4ubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4ubv(index, v);
+    d_2_0_Core->f.VertexAttrib4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4sv(index, v);
+    d_2_0_Core->f.VertexAttrib4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_2_0_Core->VertexAttrib4s(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4s(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4iv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4iv(index, v);
+    d_2_0_Core->f.VertexAttrib4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib4fv(index, v);
+    d_2_0_Core->f.VertexAttrib4fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_2_0_Core->VertexAttrib4f(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4f(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib4dv(index, v);
+    d_2_0_Core->f.VertexAttrib4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_2_0_Core->VertexAttrib4d(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4bv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4bv(index, v);
+    d_2_0_Core->f.VertexAttrib4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4Nusv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4Nusv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nusv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4Nuiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4Nuiv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nuiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4Nubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nubv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-    d_2_0_Core->VertexAttrib4Nub(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4Nub(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4Nsv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4Nsv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nsv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4Niv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4Niv(index, v);
+    d_2_0_Core->f.VertexAttrib4Niv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib4Nbv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nbv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nbv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib3sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib3sv(index, v);
+    d_2_0_Core->f.VertexAttrib3sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-    d_2_0_Core->VertexAttrib3s(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3s(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib3fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib3fv(index, v);
+    d_2_0_Core->f.VertexAttrib3fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_2_0_Core->VertexAttrib3f(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3f(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib3dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib3dv(index, v);
+    d_2_0_Core->f.VertexAttrib3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_2_0_Core->VertexAttrib3d(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib2sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib2sv(index, v);
+    d_2_0_Core->f.VertexAttrib2sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib2s(GLuint index, GLshort x, GLshort y)
 {
-    d_2_0_Core->VertexAttrib2s(index, x, y);
+    d_2_0_Core->f.VertexAttrib2s(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib2fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib2fv(index, v);
+    d_2_0_Core->f.VertexAttrib2fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    d_2_0_Core->VertexAttrib2f(index, x, y);
+    d_2_0_Core->f.VertexAttrib2f(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib2dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib2dv(index, v);
+    d_2_0_Core->f.VertexAttrib2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_2_0_Core->VertexAttrib2d(index, x, y);
+    d_2_0_Core->f.VertexAttrib2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib1sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib1sv(index, v);
+    d_2_0_Core->f.VertexAttrib1sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib1s(GLuint index, GLshort x)
 {
-    d_2_0_Core->VertexAttrib1s(index, x);
+    d_2_0_Core->f.VertexAttrib1s(index, x);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib1fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib1fv(index, v);
+    d_2_0_Core->f.VertexAttrib1fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    d_2_0_Core->VertexAttrib1f(index, x);
+    d_2_0_Core->f.VertexAttrib1f(index, x);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib1dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib1dv(index, v);
+    d_2_0_Core->f.VertexAttrib1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib1d(GLuint index, GLdouble x)
 {
-    d_2_0_Core->VertexAttrib1d(index, x);
+    d_2_0_Core->f.VertexAttrib1d(index, x);
 }
 
 
@@ -5432,102 +5439,102 @@ inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttrib1d(GLuint index, G
 // OpenGL 3.0 deprecated functions
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI4usv(GLuint index, const GLushort *v)
 {
-    d_3_0_Core->VertexAttribI4usv(index, v);
+    d_3_0_Core->f.VertexAttribI4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI4ubv(GLuint index, const GLubyte *v)
 {
-    d_3_0_Core->VertexAttribI4ubv(index, v);
+    d_3_0_Core->f.VertexAttribI4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI4sv(GLuint index, const GLshort *v)
 {
-    d_3_0_Core->VertexAttribI4sv(index, v);
+    d_3_0_Core->f.VertexAttribI4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI4bv(GLuint index, const GLbyte *v)
 {
-    d_3_0_Core->VertexAttribI4bv(index, v);
+    d_3_0_Core->f.VertexAttribI4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI4uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI4uiv(index, v);
+    d_3_0_Core->f.VertexAttribI4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI3uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI3uiv(index, v);
+    d_3_0_Core->f.VertexAttribI3uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI2uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI2uiv(index, v);
+    d_3_0_Core->f.VertexAttribI2uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI1uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI1uiv(index, v);
+    d_3_0_Core->f.VertexAttribI1uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI4iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI4iv(index, v);
+    d_3_0_Core->f.VertexAttribI4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI3iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI3iv(index, v);
+    d_3_0_Core->f.VertexAttribI3iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI2iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI2iv(index, v);
+    d_3_0_Core->f.VertexAttribI2iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI1iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI1iv(index, v);
+    d_3_0_Core->f.VertexAttribI1iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
-    d_3_0_Core->VertexAttribI4ui(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4ui(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI3ui(GLuint index, GLuint x, GLuint y, GLuint z)
 {
-    d_3_0_Core->VertexAttribI3ui(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3ui(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI2ui(GLuint index, GLuint x, GLuint y)
 {
-    d_3_0_Core->VertexAttribI2ui(index, x, y);
+    d_3_0_Core->f.VertexAttribI2ui(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI1ui(GLuint index, GLuint x)
 {
-    d_3_0_Core->VertexAttribI1ui(index, x);
+    d_3_0_Core->f.VertexAttribI1ui(index, x);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
-    d_3_0_Core->VertexAttribI4i(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4i(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI3i(GLuint index, GLint x, GLint y, GLint z)
 {
-    d_3_0_Core->VertexAttribI3i(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3i(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI2i(GLuint index, GLint x, GLint y)
 {
-    d_3_0_Core->VertexAttribI2i(index, x, y);
+    d_3_0_Core->f.VertexAttribI2i(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Compatibility::glVertexAttribI1i(GLuint index, GLint x)
 {
-    d_3_0_Core->VertexAttribI1i(index, x);
+    d_3_0_Core->f.VertexAttribI1i(index, x);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_4_1_core.cpp b/src/gui/opengl/qopenglfunctions_4_1_core.cpp
index 5546fa1868..ff3d191781 100644
--- a/src/gui/opengl/qopenglfunctions_4_1_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_1_core.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -80,62 +86,48 @@ QOpenGLFunctions_4_1_Core::QOpenGLFunctions_4_1_Core()
 
 QOpenGLFunctions_4_1_Core::~QOpenGLFunctions_4_1_Core()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_3_3_Core && !d_3_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Core->context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        delete d_3_3_Core;
-    }
-    if (d_4_0_Core && !d_4_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_0_Core->context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        delete d_4_0_Core;
-    }
-    if (d_4_1_Core && !d_4_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_1_Core->context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        delete d_4_1_Core;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_3_3_Core)
+        d_3_3_Core->refs.deref();
+    Q_ASSERT(d_3_3_Core->refs.load());
+    if (d_4_0_Core)
+        d_4_0_Core->refs.deref();
+    Q_ASSERT(d_4_0_Core->refs.load());
+    if (d_4_1_Core)
+        d_4_1_Core->refs.deref();
+    Q_ASSERT(d_4_1_Core->refs.load());
 }
 
 bool QOpenGLFunctions_4_1_Core::initializeOpenGLFunctions()
@@ -154,114 +146,58 @@ bool QOpenGLFunctions_4_1_Core::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus(), d);
-        }
         d_3_3_Core = static_cast<QOpenGLFunctions_3_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus(), d);
-        }
         d_4_0_Core = static_cast<QOpenGLFunctions_4_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus(), d);
-        }
         d_4_1_Core = static_cast<QOpenGLFunctions_4_1_CoreBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_4_1_core.h b/src/gui/opengl/qopenglfunctions_4_1_core.h
index 9da4e14366..17d922e261 100644
--- a/src/gui/opengl/qopenglfunctions_4_1_core.h
+++ b/src/gui/opengl/qopenglfunctions_4_1_core.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -568,242 +575,242 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_4_1_Core::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Core::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_1_Core::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_4_1_Core::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_4_1_Core::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_4_1_Core::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
@@ -822,57 +829,57 @@ inline void QOpenGLFunctions_4_1_Core::glIndexub(GLubyte c)
 
 inline GLboolean QOpenGLFunctions_4_1_Core::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetPointerv(GLenum pname, GLvoid* *params)
@@ -884,1067 +891,1067 @@ inline void QOpenGLFunctions_4_1_Core::glGetPointerv(GLenum pname, GLvoid* *para
 
 inline void QOpenGLFunctions_4_1_Core::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_4_1_Core::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_4_1_Core::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_4_1_Core::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_4_1_Core::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Core::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_4_1_Core::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Core::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Core::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Core::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Core::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_4_1_Core::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_4_1_Core::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_4_1_Core::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_4_1_Core::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_4_1_Core::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_4_1_Core::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline GLvoid* QOpenGLFunctions_4_1_Core::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_4_1_Core::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Core::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Core::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_1_Core::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_4_1_Core::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Core::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_4_1_Core::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_4_1_Core::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_4_1_Core::glSampleMaski(GLuint index, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(index, mask);
+    d_3_2_Core->f.SampleMaski(index, mask);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetInteger64v(GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetInteger64v(pname, params);
+    d_3_2_Core->f.GetInteger64v(pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_4_1_Core::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Core::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_4_1_Core::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 
 // OpenGL 3.3 core functions
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP4uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribP4ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP4ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribP3uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP3uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribP3ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP3ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribP2uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP2uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP2ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP1uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP1ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
@@ -2167,776 +2174,776 @@ inline void QOpenGLFunctions_4_1_Core::glVertexP2ui(GLenum type, GLuint value)
 
 inline void QOpenGLFunctions_4_1_Core::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
 {
-    d_3_3_Core->GetQueryObjectui64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
 {
-    d_3_3_Core->GetQueryObjecti64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjecti64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glQueryCounter(GLuint id, GLenum target)
 {
-    d_3_3_Core->QueryCounter(id, target);
+    d_3_3_Core->f.QueryCounter(id, target);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
 {
-    d_3_3_Core->GetSamplerParameterIuiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIuiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
 {
-    d_3_3_Core->GetSamplerParameterfv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterfv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameterIiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameteriv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameteriv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
 {
-    d_3_3_Core->SamplerParameterIuiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIuiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameterIiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
 {
-    d_3_3_Core->SamplerParameterfv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterfv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-    d_3_3_Core->SamplerParameterf(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterf(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameteriv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteriv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-    d_3_3_Core->SamplerParameteri(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteri(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBindSampler(GLuint unit, GLuint sampler)
 {
-    d_3_3_Core->BindSampler(unit, sampler);
+    d_3_3_Core->f.BindSampler(unit, sampler);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Core::glIsSampler(GLuint sampler)
 {
-    return d_3_3_Core->IsSampler(sampler);
+    return d_3_3_Core->f.IsSampler(sampler);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDeleteSamplers(GLsizei count, const GLuint *samplers)
 {
-    d_3_3_Core->DeleteSamplers(count, samplers);
+    d_3_3_Core->f.DeleteSamplers(count, samplers);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGenSamplers(GLsizei count, GLuint *samplers)
 {
-    d_3_3_Core->GenSamplers(count, samplers);
+    d_3_3_Core->f.GenSamplers(count, samplers);
 }
 
 inline GLint QOpenGLFunctions_4_1_Core::glGetFragDataIndex(GLuint program, const GLchar *name)
 {
-    return d_3_3_Core->GetFragDataIndex(program, name);
+    return d_3_3_Core->f.GetFragDataIndex(program, name);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
-    d_3_3_Core->BindFragDataLocationIndexed(program, colorNumber, index, name);
+    d_3_3_Core->f.BindFragDataLocationIndexed(program, colorNumber, index, name);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-    d_3_3_Core->VertexAttribDivisor(index, divisor);
+    d_3_3_Core->f.VertexAttribDivisor(index, divisor);
 }
 
 
 // OpenGL 4.0 core functions
 inline void QOpenGLFunctions_4_1_Core::glGetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params)
 {
-    d_4_0_Core->GetQueryIndexediv(target, index, pname, params);
+    d_4_0_Core->f.GetQueryIndexediv(target, index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glEndQueryIndexed(GLenum target, GLuint index)
 {
-    d_4_0_Core->EndQueryIndexed(target, index);
+    d_4_0_Core->f.EndQueryIndexed(target, index);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBeginQueryIndexed(GLenum target, GLuint index, GLuint id)
 {
-    d_4_0_Core->BeginQueryIndexed(target, index, id);
+    d_4_0_Core->f.BeginQueryIndexed(target, index, id);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDrawTransformFeedbackStream(GLenum mode, GLuint id, GLuint stream)
 {
-    d_4_0_Core->DrawTransformFeedbackStream(mode, id, stream);
+    d_4_0_Core->f.DrawTransformFeedbackStream(mode, id, stream);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDrawTransformFeedback(GLenum mode, GLuint id)
 {
-    d_4_0_Core->DrawTransformFeedback(mode, id);
+    d_4_0_Core->f.DrawTransformFeedback(mode, id);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glResumeTransformFeedback()
 {
-    d_4_0_Core->ResumeTransformFeedback();
+    d_4_0_Core->f.ResumeTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_1_Core::glPauseTransformFeedback()
 {
-    d_4_0_Core->PauseTransformFeedback();
+    d_4_0_Core->f.PauseTransformFeedback();
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Core::glIsTransformFeedback(GLuint id)
 {
-    return d_4_0_Core->IsTransformFeedback(id);
+    return d_4_0_Core->f.IsTransformFeedback(id);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGenTransformFeedbacks(GLsizei n, GLuint *ids)
 {
-    d_4_0_Core->GenTransformFeedbacks(n, ids);
+    d_4_0_Core->f.GenTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
 {
-    d_4_0_Core->DeleteTransformFeedbacks(n, ids);
+    d_4_0_Core->f.DeleteTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBindTransformFeedback(GLenum target, GLuint id)
 {
-    d_4_0_Core->BindTransformFeedback(target, id);
+    d_4_0_Core->f.BindTransformFeedback(target, id);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glPatchParameterfv(GLenum pname, const GLfloat *values)
 {
-    d_4_0_Core->PatchParameterfv(pname, values);
+    d_4_0_Core->f.PatchParameterfv(pname, values);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glPatchParameteri(GLenum pname, GLint value)
 {
-    d_4_0_Core->PatchParameteri(pname, value);
+    d_4_0_Core->f.PatchParameteri(pname, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetProgramStageiv(GLuint program, GLenum shadertype, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetProgramStageiv(program, shadertype, pname, values);
+    d_4_0_Core->f.GetProgramStageiv(program, shadertype, pname, values);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetUniformSubroutineuiv(GLenum shadertype, GLint location, GLuint *params)
 {
-    d_4_0_Core->GetUniformSubroutineuiv(shadertype, location, params);
+    d_4_0_Core->f.GetUniformSubroutineuiv(shadertype, location, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformSubroutinesuiv(GLenum shadertype, GLsizei count, const GLuint *indices)
 {
-    d_4_0_Core->UniformSubroutinesuiv(shadertype, count, indices);
+    d_4_0_Core->f.UniformSubroutinesuiv(shadertype, count, indices);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetActiveSubroutineName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetActiveSubroutineUniformName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
+    d_4_0_Core->f.GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
 }
 
 inline GLuint QOpenGLFunctions_4_1_Core::glGetSubroutineIndex(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineIndex(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineIndex(program, shadertype, name);
 }
 
 inline GLint QOpenGLFunctions_4_1_Core::glGetSubroutineUniformLocation(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineUniformLocation(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineUniformLocation(program, shadertype, name);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetUniformdv(GLuint program, GLint location, GLdouble *params)
 {
-    d_4_0_Core->GetUniformdv(program, location, params);
+    d_4_0_Core->f.GetUniformdv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix4x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix4x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix3x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix3x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix2x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix2x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniformMatrix2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform4dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform4dv(location, count, value);
+    d_4_0_Core->f.Uniform4dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform3dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform3dv(location, count, value);
+    d_4_0_Core->f.Uniform3dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform2dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform2dv(location, count, value);
+    d_4_0_Core->f.Uniform2dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform1dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform1dv(location, count, value);
+    d_4_0_Core->f.Uniform1dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform4d(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_0_Core->Uniform4d(location, x, y, z, w);
+    d_4_0_Core->f.Uniform4d(location, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform3d(GLint location, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_0_Core->Uniform3d(location, x, y, z);
+    d_4_0_Core->f.Uniform3d(location, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform2d(GLint location, GLdouble x, GLdouble y)
 {
-    d_4_0_Core->Uniform2d(location, x, y);
+    d_4_0_Core->f.Uniform2d(location, x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUniform1d(GLint location, GLdouble x)
 {
-    d_4_0_Core->Uniform1d(location, x);
+    d_4_0_Core->f.Uniform1d(location, x);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDrawElementsIndirect(GLenum mode, GLenum type, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawElementsIndirect(mode, type, indirect);
+    d_4_0_Core->f.DrawElementsIndirect(mode, type, indirect);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDrawArraysIndirect(GLenum mode, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawArraysIndirect(mode, indirect);
+    d_4_0_Core->f.DrawArraysIndirect(mode, indirect);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
 {
-    d_4_0_Core->BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+    d_4_0_Core->f.BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBlendFunci(GLuint buf, GLenum src, GLenum dst)
 {
-    d_4_0_Core->BlendFunci(buf, src, dst);
+    d_4_0_Core->f.BlendFunci(buf, src, dst);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
 {
-    d_4_0_Core->BlendEquationSeparatei(buf, modeRGB, modeAlpha);
+    d_4_0_Core->f.BlendEquationSeparatei(buf, modeRGB, modeAlpha);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBlendEquationi(GLuint buf, GLenum mode)
 {
-    d_4_0_Core->BlendEquationi(buf, mode);
+    d_4_0_Core->f.BlendEquationi(buf, mode);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glMinSampleShading(GLfloat value)
 {
-    d_4_0_Core->MinSampleShading(value);
+    d_4_0_Core->f.MinSampleShading(value);
 }
 
 
 // OpenGL 4.1 core functions
 inline void QOpenGLFunctions_4_1_Core::glGetDoublei_v(GLenum target, GLuint index, GLdouble *data)
 {
-    d_4_1_Core->GetDoublei_v(target, index, data);
+    d_4_1_Core->f.GetDoublei_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetFloati_v(GLenum target, GLuint index, GLfloat *data)
 {
-    d_4_1_Core->GetFloati_v(target, index, data);
+    d_4_1_Core->f.GetFloati_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDepthRangeIndexed(GLuint index, GLdouble n, GLdouble f)
 {
-    d_4_1_Core->DepthRangeIndexed(index, n, f);
+    d_4_1_Core->f.DepthRangeIndexed(index, n, f);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDepthRangeArrayv(GLuint first, GLsizei count, const GLdouble *v)
 {
-    d_4_1_Core->DepthRangeArrayv(first, count, v);
+    d_4_1_Core->f.DepthRangeArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glScissorIndexedv(GLuint index, const GLint *v)
 {
-    d_4_1_Core->ScissorIndexedv(index, v);
+    d_4_1_Core->f.ScissorIndexedv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glScissorIndexed(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height)
 {
-    d_4_1_Core->ScissorIndexed(index, left, bottom, width, height);
+    d_4_1_Core->f.ScissorIndexed(index, left, bottom, width, height);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glScissorArrayv(GLuint first, GLsizei count, const GLint *v)
 {
-    d_4_1_Core->ScissorArrayv(first, count, v);
+    d_4_1_Core->f.ScissorArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glViewportIndexedfv(GLuint index, const GLfloat *v)
 {
-    d_4_1_Core->ViewportIndexedfv(index, v);
+    d_4_1_Core->f.ViewportIndexedfv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glViewportIndexedf(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h)
 {
-    d_4_1_Core->ViewportIndexedf(index, x, y, w, h);
+    d_4_1_Core->f.ViewportIndexedf(index, x, y, w, h);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glViewportArrayv(GLuint first, GLsizei count, const GLfloat *v)
 {
-    d_4_1_Core->ViewportArrayv(first, count, v);
+    d_4_1_Core->f.ViewportArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetVertexAttribLdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_4_1_Core->GetVertexAttribLdv(index, pname, params);
+    d_4_1_Core->f.GetVertexAttribLdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribLPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_4_1_Core->VertexAttribLPointer(index, size, type, stride, pointer);
+    d_4_1_Core->f.VertexAttribLPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribL4dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL4dv(index, v);
+    d_4_1_Core->f.VertexAttribL4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribL3dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL3dv(index, v);
+    d_4_1_Core->f.VertexAttribL3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribL2dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL2dv(index, v);
+    d_4_1_Core->f.VertexAttribL2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribL1dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL1dv(index, v);
+    d_4_1_Core->f.VertexAttribL1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribL4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_1_Core->VertexAttribL4d(index, x, y, z, w);
+    d_4_1_Core->f.VertexAttribL4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribL3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_1_Core->VertexAttribL3d(index, x, y, z);
+    d_4_1_Core->f.VertexAttribL3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribL2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_4_1_Core->VertexAttribL2d(index, x, y);
+    d_4_1_Core->f.VertexAttribL2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glVertexAttribL1d(GLuint index, GLdouble x)
 {
-    d_4_1_Core->VertexAttribL1d(index, x);
+    d_4_1_Core->f.VertexAttribL1d(index, x);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetProgramPipelineInfoLog(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_4_1_Core->GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
+    d_4_1_Core->f.GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glValidateProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->ValidateProgramPipeline(pipeline);
+    d_4_1_Core->f.ValidateProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix4x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix3x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix4x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix2x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix3x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix2x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix4x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix3x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix4x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix2x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix3x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix2x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniformMatrix2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform4uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform4uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_4_1_Core->ProgramUniform4ui(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4ui(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform4dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform4dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform4d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3)
 {
-    d_4_1_Core->ProgramUniform4d(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4d(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform4fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform4fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_4_1_Core->ProgramUniform4f(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4f(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform4iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform4iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_4_1_Core->ProgramUniform4i(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4i(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform3uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform3uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_4_1_Core->ProgramUniform3ui(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3ui(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform3dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform3dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform3d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2)
 {
-    d_4_1_Core->ProgramUniform3d(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3d(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform3fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform3fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_4_1_Core->ProgramUniform3f(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3f(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform3iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform3iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_4_1_Core->ProgramUniform3i(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3i(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform2uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform2uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
 {
-    d_4_1_Core->ProgramUniform2ui(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2ui(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform2dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform2dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform2d(GLuint program, GLint location, GLdouble v0, GLdouble v1)
 {
-    d_4_1_Core->ProgramUniform2d(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2d(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform2fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform2fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1)
 {
-    d_4_1_Core->ProgramUniform2f(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2f(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform2iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform2iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
 {
-    d_4_1_Core->ProgramUniform2i(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2i(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform1uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform1uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform1ui(GLuint program, GLint location, GLuint v0)
 {
-    d_4_1_Core->ProgramUniform1ui(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1ui(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform1dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform1dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform1d(GLuint program, GLint location, GLdouble v0)
 {
-    d_4_1_Core->ProgramUniform1d(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1d(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform1fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform1fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform1f(GLuint program, GLint location, GLfloat v0)
 {
-    d_4_1_Core->ProgramUniform1f(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1f(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform1iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform1iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramUniform1i(GLuint program, GLint location, GLint v0)
 {
-    d_4_1_Core->ProgramUniform1i(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1i(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
 {
-    d_4_1_Core->GetProgramPipelineiv(pipeline, pname, params);
+    d_4_1_Core->f.GetProgramPipelineiv(pipeline, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_1_Core::glIsProgramPipeline(GLuint pipeline)
 {
-    return d_4_1_Core->IsProgramPipeline(pipeline);
+    return d_4_1_Core->f.IsProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGenProgramPipelines(GLsizei n, GLuint *pipelines)
 {
-    d_4_1_Core->GenProgramPipelines(n, pipelines);
+    d_4_1_Core->f.GenProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
 {
-    d_4_1_Core->DeleteProgramPipelines(n, pipelines);
+    d_4_1_Core->f.DeleteProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glBindProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->BindProgramPipeline(pipeline);
+    d_4_1_Core->f.BindProgramPipeline(pipeline);
 }
 
 inline GLuint QOpenGLFunctions_4_1_Core::glCreateShaderProgramv(GLenum type, GLsizei count, const GLchar* const *strings)
 {
-    return d_4_1_Core->CreateShaderProgramv(type, count, strings);
+    return d_4_1_Core->f.CreateShaderProgramv(type, count, strings);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glActiveShaderProgram(GLuint pipeline, GLuint program)
 {
-    d_4_1_Core->ActiveShaderProgram(pipeline, program);
+    d_4_1_Core->f.ActiveShaderProgram(pipeline, program);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glUseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
 {
-    d_4_1_Core->UseProgramStages(pipeline, stages, program);
+    d_4_1_Core->f.UseProgramStages(pipeline, stages, program);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramParameteri(GLuint program, GLenum pname, GLint value)
 {
-    d_4_1_Core->ProgramParameteri(program, pname, value);
+    d_4_1_Core->f.ProgramParameteri(program, pname, value);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glProgramBinary(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length)
 {
-    d_4_1_Core->ProgramBinary(program, binaryFormat, binary, length);
+    d_4_1_Core->f.ProgramBinary(program, binaryFormat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary)
 {
-    d_4_1_Core->GetProgramBinary(program, bufSize, length, binaryFormat, binary);
+    d_4_1_Core->f.GetProgramBinary(program, bufSize, length, binaryFormat, binary);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glClearDepthf(GLfloat dd)
 {
-    d_4_1_Core->ClearDepthf(dd);
+    d_4_1_Core->f.ClearDepthf(dd);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glDepthRangef(GLfloat n, GLfloat f)
 {
-    d_4_1_Core->DepthRangef(n, f);
+    d_4_1_Core->f.DepthRangef(n, f);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)
 {
-    d_4_1_Core->GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+    d_4_1_Core->f.GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glShaderBinary(GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length)
 {
-    d_4_1_Core->ShaderBinary(count, shaders, binaryformat, binary, length);
+    d_4_1_Core->f.ShaderBinary(count, shaders, binaryformat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_1_Core::glReleaseShaderCompiler()
 {
-    d_4_1_Core->ReleaseShaderCompiler();
+    d_4_1_Core->f.ReleaseShaderCompiler();
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp
index 020a851e52..58527e92b5 100644
--- a/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -88,90 +94,69 @@ QOpenGLFunctions_4_2_Compatibility::QOpenGLFunctions_4_2_Compatibility()
 
 QOpenGLFunctions_4_2_Compatibility::~QOpenGLFunctions_4_2_Compatibility()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_3_3_Core && !d_3_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Core->context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        delete d_3_3_Core;
-    }
-    if (d_4_0_Core && !d_4_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_0_Core->context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        delete d_4_0_Core;
-    }
-    if (d_4_1_Core && !d_4_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_1_Core->context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        delete d_4_1_Core;
-    }
-    if (d_4_2_Core && !d_4_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_2_Core->context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        delete d_4_2_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
-    if (d_1_3_Deprecated && !d_1_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Deprecated->context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        delete d_1_3_Deprecated;
-    }
-    if (d_1_4_Deprecated && !d_1_4_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Deprecated->context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        delete d_1_4_Deprecated;
-    }
-    if (d_3_3_Deprecated && !d_3_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Deprecated->context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus());
-        delete d_3_3_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_3_3_Core)
+        d_3_3_Core->refs.deref();
+    Q_ASSERT(d_3_3_Core->refs.load());
+    if (d_4_0_Core)
+        d_4_0_Core->refs.deref();
+    Q_ASSERT(d_4_0_Core->refs.load());
+    if (d_4_1_Core)
+        d_4_1_Core->refs.deref();
+    Q_ASSERT(d_4_1_Core->refs.load());
+    if (d_4_2_Core)
+        d_4_2_Core->refs.deref();
+    Q_ASSERT(d_4_2_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
+    if (d_1_3_Deprecated)
+        d_1_3_Deprecated->refs.deref();
+    Q_ASSERT(d_1_3_Deprecated->refs.load());
+    if (d_1_4_Deprecated)
+        d_1_4_Deprecated->refs.deref();
+    Q_ASSERT(d_1_4_Deprecated->refs.load());
+    if (d_3_3_Deprecated)
+        d_3_3_Deprecated->refs.deref();
+    Q_ASSERT(d_3_3_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_4_2_Compatibility::initializeOpenGLFunctions()
@@ -190,170 +175,86 @@ bool QOpenGLFunctions_4_2_Compatibility::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus(), d);
-        }
         d_3_3_Core = static_cast<QOpenGLFunctions_3_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus(), d);
-        }
         d_4_0_Core = static_cast<QOpenGLFunctions_4_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus(), d);
-        }
         d_4_1_Core = static_cast<QOpenGLFunctions_4_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus(), d);
-        }
         d_4_2_Core = static_cast<QOpenGLFunctions_4_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_3_Deprecated = static_cast<QOpenGLFunctions_1_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_4_Deprecated = static_cast<QOpenGLFunctions_1_4_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_3_3_Deprecated = static_cast<QOpenGLFunctions_3_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_4_2_compatibility.h b/src/gui/opengl/qopenglfunctions_4_2_compatibility.h
index 44458099d3..cb95c39936 100644
--- a/src/gui/opengl/qopenglfunctions_4_2_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_4_2_compatibility.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -1055,4270 +1062,4270 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_4_2_Compatibility::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_2_Compatibility::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_4_2_Compatibility::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline void QOpenGLFunctions_4_2_Compatibility::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetPointerv(GLenum pname, GLvoid* *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_4_2_Compatibility::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_4_2_Compatibility::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_4_2_Compatibility::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_4_2_Compatibility::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_4_2_Compatibility::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_4_2_Compatibility::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_4_2_Compatibility::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_4_2_Compatibility::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_4_2_Compatibility::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline GLvoid* QOpenGLFunctions_4_2_Compatibility::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_4_2_Compatibility::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_2_Compatibility::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_4_2_Compatibility::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_4_2_Compatibility::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_4_2_Compatibility::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_4_2_Compatibility::glSampleMaski(GLuint index, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(index, mask);
+    d_3_2_Core->f.SampleMaski(index, mask);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetInteger64v(GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetInteger64v(pname, params);
+    d_3_2_Core->f.GetInteger64v(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_4_2_Compatibility::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_4_2_Compatibility::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 
 // OpenGL 3.3 core functions
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP4uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribP4ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP4ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribP3uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP3uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribP3ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP3ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribP2uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP2uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP2ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP1uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP1ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->SecondaryColorP3uiv(type, color);
+    d_3_3_Deprecated->f.SecondaryColorP3uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColorP3ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->SecondaryColorP3ui(type, color);
+    d_3_3_Deprecated->f.SecondaryColorP3ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColorP4uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->ColorP4uiv(type, color);
+    d_3_3_Deprecated->f.ColorP4uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColorP4ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->ColorP4ui(type, color);
+    d_3_3_Deprecated->f.ColorP4ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColorP3uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->ColorP3uiv(type, color);
+    d_3_3_Deprecated->f.ColorP3uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColorP3ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->ColorP3ui(type, color);
+    d_3_3_Deprecated->f.ColorP3ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glNormalP3uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->NormalP3uiv(type, coords);
+    d_3_3_Deprecated->f.NormalP3uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glNormalP3ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->NormalP3ui(type, coords);
+    d_3_3_Deprecated->f.NormalP3ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoordP4uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP4uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP4uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoordP4ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP4ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP4ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoordP3uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP3uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP3uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoordP3ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP3ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP3ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoordP2uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP2uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP2uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoordP2ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP2ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP2ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoordP1uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP1uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP1uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoordP1ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP1ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP1ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoordP4uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP4uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP4uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoordP4ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP4ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP4ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoordP3uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP3uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP3uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoordP3ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP3ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP3ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoordP2uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP2uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP2uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoordP2ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP2ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP2ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoordP1uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP1uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP1uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoordP1ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP1ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP1ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexP4uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP4uiv(type, value);
+    d_3_3_Deprecated->f.VertexP4uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexP4ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP4ui(type, value);
+    d_3_3_Deprecated->f.VertexP4ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexP3uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP3uiv(type, value);
+    d_3_3_Deprecated->f.VertexP3uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexP3ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP3ui(type, value);
+    d_3_3_Deprecated->f.VertexP3ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexP2uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP2uiv(type, value);
+    d_3_3_Deprecated->f.VertexP2uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexP2ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP2ui(type, value);
+    d_3_3_Deprecated->f.VertexP2ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
 {
-    d_3_3_Core->GetQueryObjectui64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
 {
-    d_3_3_Core->GetQueryObjecti64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjecti64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glQueryCounter(GLuint id, GLenum target)
 {
-    d_3_3_Core->QueryCounter(id, target);
+    d_3_3_Core->f.QueryCounter(id, target);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
 {
-    d_3_3_Core->GetSamplerParameterIuiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIuiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
 {
-    d_3_3_Core->GetSamplerParameterfv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterfv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameterIiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameteriv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameteriv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
 {
-    d_3_3_Core->SamplerParameterIuiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIuiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameterIiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
 {
-    d_3_3_Core->SamplerParameterfv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterfv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-    d_3_3_Core->SamplerParameterf(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterf(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameteriv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteriv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-    d_3_3_Core->SamplerParameteri(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteri(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBindSampler(GLuint unit, GLuint sampler)
 {
-    d_3_3_Core->BindSampler(unit, sampler);
+    d_3_3_Core->f.BindSampler(unit, sampler);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsSampler(GLuint sampler)
 {
-    return d_3_3_Core->IsSampler(sampler);
+    return d_3_3_Core->f.IsSampler(sampler);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDeleteSamplers(GLsizei count, const GLuint *samplers)
 {
-    d_3_3_Core->DeleteSamplers(count, samplers);
+    d_3_3_Core->f.DeleteSamplers(count, samplers);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGenSamplers(GLsizei count, GLuint *samplers)
 {
-    d_3_3_Core->GenSamplers(count, samplers);
+    d_3_3_Core->f.GenSamplers(count, samplers);
 }
 
 inline GLint QOpenGLFunctions_4_2_Compatibility::glGetFragDataIndex(GLuint program, const GLchar *name)
 {
-    return d_3_3_Core->GetFragDataIndex(program, name);
+    return d_3_3_Core->f.GetFragDataIndex(program, name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
-    d_3_3_Core->BindFragDataLocationIndexed(program, colorNumber, index, name);
+    d_3_3_Core->f.BindFragDataLocationIndexed(program, colorNumber, index, name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-    d_3_3_Core->VertexAttribDivisor(index, divisor);
+    d_3_3_Core->f.VertexAttribDivisor(index, divisor);
 }
 
 
 // OpenGL 4.0 core functions
 inline void QOpenGLFunctions_4_2_Compatibility::glGetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params)
 {
-    d_4_0_Core->GetQueryIndexediv(target, index, pname, params);
+    d_4_0_Core->f.GetQueryIndexediv(target, index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEndQueryIndexed(GLenum target, GLuint index)
 {
-    d_4_0_Core->EndQueryIndexed(target, index);
+    d_4_0_Core->f.EndQueryIndexed(target, index);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBeginQueryIndexed(GLenum target, GLuint index, GLuint id)
 {
-    d_4_0_Core->BeginQueryIndexed(target, index, id);
+    d_4_0_Core->f.BeginQueryIndexed(target, index, id);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawTransformFeedbackStream(GLenum mode, GLuint id, GLuint stream)
 {
-    d_4_0_Core->DrawTransformFeedbackStream(mode, id, stream);
+    d_4_0_Core->f.DrawTransformFeedbackStream(mode, id, stream);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawTransformFeedback(GLenum mode, GLuint id)
 {
-    d_4_0_Core->DrawTransformFeedback(mode, id);
+    d_4_0_Core->f.DrawTransformFeedback(mode, id);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glResumeTransformFeedback()
 {
-    d_4_0_Core->ResumeTransformFeedback();
+    d_4_0_Core->f.ResumeTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPauseTransformFeedback()
 {
-    d_4_0_Core->PauseTransformFeedback();
+    d_4_0_Core->f.PauseTransformFeedback();
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsTransformFeedback(GLuint id)
 {
-    return d_4_0_Core->IsTransformFeedback(id);
+    return d_4_0_Core->f.IsTransformFeedback(id);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGenTransformFeedbacks(GLsizei n, GLuint *ids)
 {
-    d_4_0_Core->GenTransformFeedbacks(n, ids);
+    d_4_0_Core->f.GenTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
 {
-    d_4_0_Core->DeleteTransformFeedbacks(n, ids);
+    d_4_0_Core->f.DeleteTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBindTransformFeedback(GLenum target, GLuint id)
 {
-    d_4_0_Core->BindTransformFeedback(target, id);
+    d_4_0_Core->f.BindTransformFeedback(target, id);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPatchParameterfv(GLenum pname, const GLfloat *values)
 {
-    d_4_0_Core->PatchParameterfv(pname, values);
+    d_4_0_Core->f.PatchParameterfv(pname, values);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPatchParameteri(GLenum pname, GLint value)
 {
-    d_4_0_Core->PatchParameteri(pname, value);
+    d_4_0_Core->f.PatchParameteri(pname, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetProgramStageiv(GLuint program, GLenum shadertype, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetProgramStageiv(program, shadertype, pname, values);
+    d_4_0_Core->f.GetProgramStageiv(program, shadertype, pname, values);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetUniformSubroutineuiv(GLenum shadertype, GLint location, GLuint *params)
 {
-    d_4_0_Core->GetUniformSubroutineuiv(shadertype, location, params);
+    d_4_0_Core->f.GetUniformSubroutineuiv(shadertype, location, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformSubroutinesuiv(GLenum shadertype, GLsizei count, const GLuint *indices)
 {
-    d_4_0_Core->UniformSubroutinesuiv(shadertype, count, indices);
+    d_4_0_Core->f.UniformSubroutinesuiv(shadertype, count, indices);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetActiveSubroutineName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetActiveSubroutineUniformName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
+    d_4_0_Core->f.GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
 }
 
 inline GLuint QOpenGLFunctions_4_2_Compatibility::glGetSubroutineIndex(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineIndex(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineIndex(program, shadertype, name);
 }
 
 inline GLint QOpenGLFunctions_4_2_Compatibility::glGetSubroutineUniformLocation(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineUniformLocation(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineUniformLocation(program, shadertype, name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetUniformdv(GLuint program, GLint location, GLdouble *params)
 {
-    d_4_0_Core->GetUniformdv(program, location, params);
+    d_4_0_Core->f.GetUniformdv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix4x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix4x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix3x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix3x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix2x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix2x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniformMatrix2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform4dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform4dv(location, count, value);
+    d_4_0_Core->f.Uniform4dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform3dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform3dv(location, count, value);
+    d_4_0_Core->f.Uniform3dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform2dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform2dv(location, count, value);
+    d_4_0_Core->f.Uniform2dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform1dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform1dv(location, count, value);
+    d_4_0_Core->f.Uniform1dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform4d(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_0_Core->Uniform4d(location, x, y, z, w);
+    d_4_0_Core->f.Uniform4d(location, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform3d(GLint location, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_0_Core->Uniform3d(location, x, y, z);
+    d_4_0_Core->f.Uniform3d(location, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform2d(GLint location, GLdouble x, GLdouble y)
 {
-    d_4_0_Core->Uniform2d(location, x, y);
+    d_4_0_Core->f.Uniform2d(location, x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUniform1d(GLint location, GLdouble x)
 {
-    d_4_0_Core->Uniform1d(location, x);
+    d_4_0_Core->f.Uniform1d(location, x);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawElementsIndirect(GLenum mode, GLenum type, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawElementsIndirect(mode, type, indirect);
+    d_4_0_Core->f.DrawElementsIndirect(mode, type, indirect);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawArraysIndirect(GLenum mode, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawArraysIndirect(mode, indirect);
+    d_4_0_Core->f.DrawArraysIndirect(mode, indirect);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
 {
-    d_4_0_Core->BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+    d_4_0_Core->f.BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBlendFunci(GLuint buf, GLenum src, GLenum dst)
 {
-    d_4_0_Core->BlendFunci(buf, src, dst);
+    d_4_0_Core->f.BlendFunci(buf, src, dst);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
 {
-    d_4_0_Core->BlendEquationSeparatei(buf, modeRGB, modeAlpha);
+    d_4_0_Core->f.BlendEquationSeparatei(buf, modeRGB, modeAlpha);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBlendEquationi(GLuint buf, GLenum mode)
 {
-    d_4_0_Core->BlendEquationi(buf, mode);
+    d_4_0_Core->f.BlendEquationi(buf, mode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMinSampleShading(GLfloat value)
 {
-    d_4_0_Core->MinSampleShading(value);
+    d_4_0_Core->f.MinSampleShading(value);
 }
 
 
 // OpenGL 4.1 core functions
 inline void QOpenGLFunctions_4_2_Compatibility::glGetDoublei_v(GLenum target, GLuint index, GLdouble *data)
 {
-    d_4_1_Core->GetDoublei_v(target, index, data);
+    d_4_1_Core->f.GetDoublei_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetFloati_v(GLenum target, GLuint index, GLfloat *data)
 {
-    d_4_1_Core->GetFloati_v(target, index, data);
+    d_4_1_Core->f.GetFloati_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDepthRangeIndexed(GLuint index, GLdouble n, GLdouble f)
 {
-    d_4_1_Core->DepthRangeIndexed(index, n, f);
+    d_4_1_Core->f.DepthRangeIndexed(index, n, f);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDepthRangeArrayv(GLuint first, GLsizei count, const GLdouble *v)
 {
-    d_4_1_Core->DepthRangeArrayv(first, count, v);
+    d_4_1_Core->f.DepthRangeArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glScissorIndexedv(GLuint index, const GLint *v)
 {
-    d_4_1_Core->ScissorIndexedv(index, v);
+    d_4_1_Core->f.ScissorIndexedv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glScissorIndexed(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height)
 {
-    d_4_1_Core->ScissorIndexed(index, left, bottom, width, height);
+    d_4_1_Core->f.ScissorIndexed(index, left, bottom, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glScissorArrayv(GLuint first, GLsizei count, const GLint *v)
 {
-    d_4_1_Core->ScissorArrayv(first, count, v);
+    d_4_1_Core->f.ScissorArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glViewportIndexedfv(GLuint index, const GLfloat *v)
 {
-    d_4_1_Core->ViewportIndexedfv(index, v);
+    d_4_1_Core->f.ViewportIndexedfv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glViewportIndexedf(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h)
 {
-    d_4_1_Core->ViewportIndexedf(index, x, y, w, h);
+    d_4_1_Core->f.ViewportIndexedf(index, x, y, w, h);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glViewportArrayv(GLuint first, GLsizei count, const GLfloat *v)
 {
-    d_4_1_Core->ViewportArrayv(first, count, v);
+    d_4_1_Core->f.ViewportArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetVertexAttribLdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_4_1_Core->GetVertexAttribLdv(index, pname, params);
+    d_4_1_Core->f.GetVertexAttribLdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribLPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_4_1_Core->VertexAttribLPointer(index, size, type, stride, pointer);
+    d_4_1_Core->f.VertexAttribLPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribL4dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL4dv(index, v);
+    d_4_1_Core->f.VertexAttribL4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribL3dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL3dv(index, v);
+    d_4_1_Core->f.VertexAttribL3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribL2dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL2dv(index, v);
+    d_4_1_Core->f.VertexAttribL2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribL1dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL1dv(index, v);
+    d_4_1_Core->f.VertexAttribL1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribL4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_1_Core->VertexAttribL4d(index, x, y, z, w);
+    d_4_1_Core->f.VertexAttribL4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribL3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_1_Core->VertexAttribL3d(index, x, y, z);
+    d_4_1_Core->f.VertexAttribL3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribL2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_4_1_Core->VertexAttribL2d(index, x, y);
+    d_4_1_Core->f.VertexAttribL2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribL1d(GLuint index, GLdouble x)
 {
-    d_4_1_Core->VertexAttribL1d(index, x);
+    d_4_1_Core->f.VertexAttribL1d(index, x);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetProgramPipelineInfoLog(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_4_1_Core->GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
+    d_4_1_Core->f.GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glValidateProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->ValidateProgramPipeline(pipeline);
+    d_4_1_Core->f.ValidateProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix4x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix3x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix4x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix2x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix3x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix2x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix4x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix3x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix4x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix2x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix3x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix2x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniformMatrix2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform4uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform4uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_4_1_Core->ProgramUniform4ui(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4ui(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform4dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform4dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform4d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3)
 {
-    d_4_1_Core->ProgramUniform4d(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4d(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform4fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform4fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_4_1_Core->ProgramUniform4f(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4f(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform4iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform4iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_4_1_Core->ProgramUniform4i(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4i(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform3uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform3uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_4_1_Core->ProgramUniform3ui(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3ui(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform3dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform3dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform3d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2)
 {
-    d_4_1_Core->ProgramUniform3d(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3d(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform3fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform3fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_4_1_Core->ProgramUniform3f(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3f(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform3iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform3iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_4_1_Core->ProgramUniform3i(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3i(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform2uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform2uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
 {
-    d_4_1_Core->ProgramUniform2ui(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2ui(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform2dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform2dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform2d(GLuint program, GLint location, GLdouble v0, GLdouble v1)
 {
-    d_4_1_Core->ProgramUniform2d(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2d(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform2fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform2fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1)
 {
-    d_4_1_Core->ProgramUniform2f(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2f(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform2iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform2iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
 {
-    d_4_1_Core->ProgramUniform2i(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2i(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform1uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform1uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform1ui(GLuint program, GLint location, GLuint v0)
 {
-    d_4_1_Core->ProgramUniform1ui(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1ui(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform1dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform1dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform1d(GLuint program, GLint location, GLdouble v0)
 {
-    d_4_1_Core->ProgramUniform1d(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1d(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform1fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform1fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform1f(GLuint program, GLint location, GLfloat v0)
 {
-    d_4_1_Core->ProgramUniform1f(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1f(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform1iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform1iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramUniform1i(GLuint program, GLint location, GLint v0)
 {
-    d_4_1_Core->ProgramUniform1i(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1i(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
 {
-    d_4_1_Core->GetProgramPipelineiv(pipeline, pname, params);
+    d_4_1_Core->f.GetProgramPipelineiv(pipeline, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsProgramPipeline(GLuint pipeline)
 {
-    return d_4_1_Core->IsProgramPipeline(pipeline);
+    return d_4_1_Core->f.IsProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGenProgramPipelines(GLsizei n, GLuint *pipelines)
 {
-    d_4_1_Core->GenProgramPipelines(n, pipelines);
+    d_4_1_Core->f.GenProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
 {
-    d_4_1_Core->DeleteProgramPipelines(n, pipelines);
+    d_4_1_Core->f.DeleteProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBindProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->BindProgramPipeline(pipeline);
+    d_4_1_Core->f.BindProgramPipeline(pipeline);
 }
 
 inline GLuint QOpenGLFunctions_4_2_Compatibility::glCreateShaderProgramv(GLenum type, GLsizei count, const GLchar* const *strings)
 {
-    return d_4_1_Core->CreateShaderProgramv(type, count, strings);
+    return d_4_1_Core->f.CreateShaderProgramv(type, count, strings);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glActiveShaderProgram(GLuint pipeline, GLuint program)
 {
-    d_4_1_Core->ActiveShaderProgram(pipeline, program);
+    d_4_1_Core->f.ActiveShaderProgram(pipeline, program);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glUseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
 {
-    d_4_1_Core->UseProgramStages(pipeline, stages, program);
+    d_4_1_Core->f.UseProgramStages(pipeline, stages, program);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramParameteri(GLuint program, GLenum pname, GLint value)
 {
-    d_4_1_Core->ProgramParameteri(program, pname, value);
+    d_4_1_Core->f.ProgramParameteri(program, pname, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glProgramBinary(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length)
 {
-    d_4_1_Core->ProgramBinary(program, binaryFormat, binary, length);
+    d_4_1_Core->f.ProgramBinary(program, binaryFormat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary)
 {
-    d_4_1_Core->GetProgramBinary(program, bufSize, length, binaryFormat, binary);
+    d_4_1_Core->f.GetProgramBinary(program, bufSize, length, binaryFormat, binary);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glClearDepthf(GLfloat dd)
 {
-    d_4_1_Core->ClearDepthf(dd);
+    d_4_1_Core->f.ClearDepthf(dd);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDepthRangef(GLfloat n, GLfloat f)
 {
-    d_4_1_Core->DepthRangef(n, f);
+    d_4_1_Core->f.DepthRangef(n, f);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)
 {
-    d_4_1_Core->GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+    d_4_1_Core->f.GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glShaderBinary(GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length)
 {
-    d_4_1_Core->ShaderBinary(count, shaders, binaryformat, binary, length);
+    d_4_1_Core->f.ShaderBinary(count, shaders, binaryformat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glReleaseShaderCompiler()
 {
-    d_4_1_Core->ReleaseShaderCompiler();
+    d_4_1_Core->f.ReleaseShaderCompiler();
 }
 
 
 // OpenGL 4.2 core functions
 inline void QOpenGLFunctions_4_2_Compatibility::glTexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_2_Core->TexStorage3D(target, levels, internalformat, width, height, depth);
+    d_4_2_Core->f.TexStorage3D(target, levels, internalformat, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_4_2_Core->TexStorage2D(target, levels, internalformat, width, height);
+    d_4_2_Core->f.TexStorage2D(target, levels, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)
 {
-    d_4_2_Core->TexStorage1D(target, levels, internalformat, width);
+    d_4_2_Core->f.TexStorage1D(target, levels, internalformat, width);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMemoryBarrier(GLbitfield barriers)
 {
-    d_4_2_Core->MemoryBarrier(barriers);
+    d_4_2_Core->f.MemoryBarrier(barriers);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBindImageTexture(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format)
 {
-    d_4_2_Core->BindImageTexture(unit, texture, level, layered, layer, access, format);
+    d_4_2_Core->f.BindImageTexture(unit, texture, level, layered, layer, access, format);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetActiveAtomicCounterBufferiv(GLuint program, GLuint bufferIndex, GLenum pname, GLint *params)
 {
-    d_4_2_Core->GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
+    d_4_2_Core->f.GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params)
 {
-    d_4_2_Core->GetInternalformativ(target, internalformat, pname, bufSize, params);
+    d_4_2_Core->f.GetInternalformativ(target, internalformat, pname, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawTransformFeedbackStreamInstanced(GLenum mode, GLuint id, GLuint stream, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawTransformFeedbackInstanced(GLenum mode, GLuint id, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackInstanced(mode, id, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackInstanced(mode, id, instancecount);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawElementsInstancedBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawArraysInstancedBaseInstance(GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
+    d_4_2_Core->f.DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_4_2_Compatibility::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_4_2_Compatibility::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_4_2_Compatibility::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_4_2_Compatibility::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Compatibility::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_4_2_Compatibility::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_4_2_Compatibility::glMultTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixd(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixf(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLoadTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixd(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glLoadTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixf(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord4sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_3_Deprecated->MultiTexCoord4s(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4s(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord4iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_3_Deprecated->MultiTexCoord4i(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4i(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord4fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_3_Deprecated->MultiTexCoord4f(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4f(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_3_Deprecated->MultiTexCoord4d(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4d(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord3sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-    d_1_3_Deprecated->MultiTexCoord3s(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3s(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord3iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
-    d_1_3_Deprecated->MultiTexCoord3i(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3i(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord3fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_3_Deprecated->MultiTexCoord3f(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3f(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_3_Deprecated->MultiTexCoord3d(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3d(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord2sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
-    d_1_3_Deprecated->MultiTexCoord2s(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2s(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord2iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
-    d_1_3_Deprecated->MultiTexCoord2i(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2i(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord2fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t)
 {
-    d_1_3_Deprecated->MultiTexCoord2f(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2f(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
-    d_1_3_Deprecated->MultiTexCoord2d(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2d(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord1sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord1s(GLenum target, GLshort s)
 {
-    d_1_3_Deprecated->MultiTexCoord1s(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1s(target, s);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord1iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord1i(GLenum target, GLint s)
 {
-    d_1_3_Deprecated->MultiTexCoord1i(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1i(target, s);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord1fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord1f(GLenum target, GLfloat s)
 {
-    d_1_3_Deprecated->MultiTexCoord1f(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1f(target, s);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glMultiTexCoord1d(GLenum target, GLdouble s)
 {
-    d_1_3_Deprecated->MultiTexCoord1d(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1d(target, s);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glClientActiveTexture(GLenum texture)
 {
-    d_1_3_Deprecated->ClientActiveTexture(texture);
+    d_1_3_Deprecated->f.ClientActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 deprecated functions
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos3sv(v);
+    d_1_4_Deprecated->f.WindowPos3sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_4_Deprecated->WindowPos3s(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos3iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos3iv(v);
+    d_1_4_Deprecated->f.WindowPos3iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_4_Deprecated->WindowPos3i(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos3fv(v);
+    d_1_4_Deprecated->f.WindowPos3fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_4_Deprecated->WindowPos3f(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos3dv(v);
+    d_1_4_Deprecated->f.WindowPos3dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_4_Deprecated->WindowPos3d(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos2sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos2sv(v);
+    d_1_4_Deprecated->f.WindowPos2sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos2s(GLshort x, GLshort y)
 {
-    d_1_4_Deprecated->WindowPos2s(x, y);
+    d_1_4_Deprecated->f.WindowPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos2iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos2iv(v);
+    d_1_4_Deprecated->f.WindowPos2iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos2i(GLint x, GLint y)
 {
-    d_1_4_Deprecated->WindowPos2i(x, y);
+    d_1_4_Deprecated->f.WindowPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos2fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos2fv(v);
+    d_1_4_Deprecated->f.WindowPos2fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos2f(GLfloat x, GLfloat y)
 {
-    d_1_4_Deprecated->WindowPos2f(x, y);
+    d_1_4_Deprecated->f.WindowPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos2dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos2dv(v);
+    d_1_4_Deprecated->f.WindowPos2dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glWindowPos2d(GLdouble x, GLdouble y)
 {
-    d_1_4_Deprecated->WindowPos2d(x, y);
+    d_1_4_Deprecated->f.WindowPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->SecondaryColorPointer(size, type, stride, pointer);
+    d_1_4_Deprecated->f.SecondaryColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3usv(const GLushort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3usv(v);
+    d_1_4_Deprecated->f.SecondaryColor3usv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3us(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3uiv(const GLuint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3uiv(v);
+    d_1_4_Deprecated->f.SecondaryColor3uiv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ui(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3ubv(const GLubyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3ubv(v);
+    d_1_4_Deprecated->f.SecondaryColor3ubv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ub(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3sv(v);
+    d_1_4_Deprecated->f.SecondaryColor3sv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3s(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3iv(const GLint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3iv(v);
+    d_1_4_Deprecated->f.SecondaryColor3iv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3i(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->SecondaryColor3fv(v);
+    d_1_4_Deprecated->f.SecondaryColor3fv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_4_Deprecated->SecondaryColor3f(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->SecondaryColor3dv(v);
+    d_1_4_Deprecated->f.SecondaryColor3dv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_4_Deprecated->SecondaryColor3d(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3bv(const GLbyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3bv(v);
+    d_1_4_Deprecated->f.SecondaryColor3bv(v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glSecondaryColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3b(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFogCoordPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->FogCoordPointer(type, stride, pointer);
+    d_1_4_Deprecated->f.FogCoordPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFogCoorddv(const GLdouble *coord)
 {
-    d_1_4_Deprecated->FogCoorddv(coord);
+    d_1_4_Deprecated->f.FogCoorddv(coord);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFogCoordd(GLdouble coord)
 {
-    d_1_4_Deprecated->FogCoordd(coord);
+    d_1_4_Deprecated->f.FogCoordd(coord);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFogCoordfv(const GLfloat *coord)
 {
-    d_1_4_Deprecated->FogCoordfv(coord);
+    d_1_4_Deprecated->f.FogCoordfv(coord);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glFogCoordf(GLfloat coord)
 {
-    d_1_4_Deprecated->FogCoordf(coord);
+    d_1_4_Deprecated->f.FogCoordf(coord);
 }
 
 
@@ -5327,182 +5334,182 @@ inline void QOpenGLFunctions_4_2_Compatibility::glFogCoordf(GLfloat coord)
 // OpenGL 2.0 deprecated functions
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4usv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4usv(index, v);
+    d_2_0_Core->f.VertexAttrib4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4uiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4uiv(index, v);
+    d_2_0_Core->f.VertexAttrib4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4ubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4ubv(index, v);
+    d_2_0_Core->f.VertexAttrib4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4sv(index, v);
+    d_2_0_Core->f.VertexAttrib4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_2_0_Core->VertexAttrib4s(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4s(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4iv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4iv(index, v);
+    d_2_0_Core->f.VertexAttrib4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib4fv(index, v);
+    d_2_0_Core->f.VertexAttrib4fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_2_0_Core->VertexAttrib4f(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4f(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib4dv(index, v);
+    d_2_0_Core->f.VertexAttrib4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_2_0_Core->VertexAttrib4d(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4bv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4bv(index, v);
+    d_2_0_Core->f.VertexAttrib4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4Nusv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4Nusv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nusv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4Nuiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4Nuiv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nuiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4Nubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nubv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-    d_2_0_Core->VertexAttrib4Nub(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4Nub(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4Nsv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4Nsv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nsv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4Niv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4Niv(index, v);
+    d_2_0_Core->f.VertexAttrib4Niv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib4Nbv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nbv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nbv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib3sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib3sv(index, v);
+    d_2_0_Core->f.VertexAttrib3sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-    d_2_0_Core->VertexAttrib3s(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3s(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib3fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib3fv(index, v);
+    d_2_0_Core->f.VertexAttrib3fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_2_0_Core->VertexAttrib3f(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3f(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib3dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib3dv(index, v);
+    d_2_0_Core->f.VertexAttrib3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_2_0_Core->VertexAttrib3d(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib2sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib2sv(index, v);
+    d_2_0_Core->f.VertexAttrib2sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib2s(GLuint index, GLshort x, GLshort y)
 {
-    d_2_0_Core->VertexAttrib2s(index, x, y);
+    d_2_0_Core->f.VertexAttrib2s(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib2fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib2fv(index, v);
+    d_2_0_Core->f.VertexAttrib2fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    d_2_0_Core->VertexAttrib2f(index, x, y);
+    d_2_0_Core->f.VertexAttrib2f(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib2dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib2dv(index, v);
+    d_2_0_Core->f.VertexAttrib2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_2_0_Core->VertexAttrib2d(index, x, y);
+    d_2_0_Core->f.VertexAttrib2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib1sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib1sv(index, v);
+    d_2_0_Core->f.VertexAttrib1sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib1s(GLuint index, GLshort x)
 {
-    d_2_0_Core->VertexAttrib1s(index, x);
+    d_2_0_Core->f.VertexAttrib1s(index, x);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib1fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib1fv(index, v);
+    d_2_0_Core->f.VertexAttrib1fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    d_2_0_Core->VertexAttrib1f(index, x);
+    d_2_0_Core->f.VertexAttrib1f(index, x);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib1dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib1dv(index, v);
+    d_2_0_Core->f.VertexAttrib1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib1d(GLuint index, GLdouble x)
 {
-    d_2_0_Core->VertexAttrib1d(index, x);
+    d_2_0_Core->f.VertexAttrib1d(index, x);
 }
 
 
@@ -5511,102 +5518,102 @@ inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttrib1d(GLuint index, G
 // OpenGL 3.0 deprecated functions
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI4usv(GLuint index, const GLushort *v)
 {
-    d_3_0_Core->VertexAttribI4usv(index, v);
+    d_3_0_Core->f.VertexAttribI4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI4ubv(GLuint index, const GLubyte *v)
 {
-    d_3_0_Core->VertexAttribI4ubv(index, v);
+    d_3_0_Core->f.VertexAttribI4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI4sv(GLuint index, const GLshort *v)
 {
-    d_3_0_Core->VertexAttribI4sv(index, v);
+    d_3_0_Core->f.VertexAttribI4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI4bv(GLuint index, const GLbyte *v)
 {
-    d_3_0_Core->VertexAttribI4bv(index, v);
+    d_3_0_Core->f.VertexAttribI4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI4uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI4uiv(index, v);
+    d_3_0_Core->f.VertexAttribI4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI3uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI3uiv(index, v);
+    d_3_0_Core->f.VertexAttribI3uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI2uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI2uiv(index, v);
+    d_3_0_Core->f.VertexAttribI2uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI1uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI1uiv(index, v);
+    d_3_0_Core->f.VertexAttribI1uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI4iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI4iv(index, v);
+    d_3_0_Core->f.VertexAttribI4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI3iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI3iv(index, v);
+    d_3_0_Core->f.VertexAttribI3iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI2iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI2iv(index, v);
+    d_3_0_Core->f.VertexAttribI2iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI1iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI1iv(index, v);
+    d_3_0_Core->f.VertexAttribI1iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
-    d_3_0_Core->VertexAttribI4ui(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4ui(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI3ui(GLuint index, GLuint x, GLuint y, GLuint z)
 {
-    d_3_0_Core->VertexAttribI3ui(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3ui(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI2ui(GLuint index, GLuint x, GLuint y)
 {
-    d_3_0_Core->VertexAttribI2ui(index, x, y);
+    d_3_0_Core->f.VertexAttribI2ui(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI1ui(GLuint index, GLuint x)
 {
-    d_3_0_Core->VertexAttribI1ui(index, x);
+    d_3_0_Core->f.VertexAttribI1ui(index, x);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
-    d_3_0_Core->VertexAttribI4i(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4i(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI3i(GLuint index, GLint x, GLint y, GLint z)
 {
-    d_3_0_Core->VertexAttribI3i(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3i(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI2i(GLuint index, GLint x, GLint y)
 {
-    d_3_0_Core->VertexAttribI2i(index, x, y);
+    d_3_0_Core->f.VertexAttribI2i(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Compatibility::glVertexAttribI1i(GLuint index, GLint x)
 {
-    d_3_0_Core->VertexAttribI1i(index, x);
+    d_3_0_Core->f.VertexAttribI1i(index, x);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_4_2_core.cpp b/src/gui/opengl/qopenglfunctions_4_2_core.cpp
index 4f322ffb07..b929abcf6a 100644
--- a/src/gui/opengl/qopenglfunctions_4_2_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_2_core.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -81,66 +87,51 @@ QOpenGLFunctions_4_2_Core::QOpenGLFunctions_4_2_Core()
 
 QOpenGLFunctions_4_2_Core::~QOpenGLFunctions_4_2_Core()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_3_3_Core && !d_3_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Core->context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        delete d_3_3_Core;
-    }
-    if (d_4_0_Core && !d_4_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_0_Core->context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        delete d_4_0_Core;
-    }
-    if (d_4_1_Core && !d_4_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_1_Core->context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        delete d_4_1_Core;
-    }
-    if (d_4_2_Core && !d_4_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_2_Core->context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        delete d_4_2_Core;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_3_3_Core)
+        d_3_3_Core->refs.deref();
+    Q_ASSERT(d_3_3_Core->refs.load());
+    if (d_4_0_Core)
+        d_4_0_Core->refs.deref();
+    Q_ASSERT(d_4_0_Core->refs.load());
+    if (d_4_1_Core)
+        d_4_1_Core->refs.deref();
+    Q_ASSERT(d_4_1_Core->refs.load());
+    if (d_4_2_Core)
+        d_4_2_Core->refs.deref();
+    Q_ASSERT(d_4_2_Core->refs.load());
 }
 
 bool QOpenGLFunctions_4_2_Core::initializeOpenGLFunctions()
@@ -159,122 +150,62 @@ bool QOpenGLFunctions_4_2_Core::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus(), d);
-        }
         d_3_3_Core = static_cast<QOpenGLFunctions_3_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus(), d);
-        }
         d_4_0_Core = static_cast<QOpenGLFunctions_4_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus(), d);
-        }
         d_4_1_Core = static_cast<QOpenGLFunctions_4_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus(), d);
-        }
         d_4_2_Core = static_cast<QOpenGLFunctions_4_2_CoreBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_4_2_core.h b/src/gui/opengl/qopenglfunctions_4_2_core.h
index 3d43ebc222..14b748b3f5 100644
--- a/src/gui/opengl/qopenglfunctions_4_2_core.h
+++ b/src/gui/opengl/qopenglfunctions_4_2_core.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -583,242 +590,242 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_4_2_Core::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Core::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_2_Core::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_4_2_Core::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_4_2_Core::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_4_2_Core::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
@@ -837,57 +844,57 @@ inline void QOpenGLFunctions_4_2_Core::glIndexub(GLubyte c)
 
 inline GLboolean QOpenGLFunctions_4_2_Core::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetPointerv(GLenum pname, GLvoid* *params)
@@ -899,1067 +906,1067 @@ inline void QOpenGLFunctions_4_2_Core::glGetPointerv(GLenum pname, GLvoid* *para
 
 inline void QOpenGLFunctions_4_2_Core::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_4_2_Core::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_4_2_Core::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_4_2_Core::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_4_2_Core::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Core::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_4_2_Core::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Core::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Core::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Core::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Core::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_4_2_Core::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_4_2_Core::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_4_2_Core::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_4_2_Core::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_4_2_Core::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_4_2_Core::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline GLvoid* QOpenGLFunctions_4_2_Core::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_4_2_Core::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Core::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Core::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_2_Core::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_4_2_Core::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Core::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_4_2_Core::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_4_2_Core::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_4_2_Core::glSampleMaski(GLuint index, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(index, mask);
+    d_3_2_Core->f.SampleMaski(index, mask);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetInteger64v(GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetInteger64v(pname, params);
+    d_3_2_Core->f.GetInteger64v(pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_4_2_Core::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Core::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_4_2_Core::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 
 // OpenGL 3.3 core functions
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP4uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribP4ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP4ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribP3uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP3uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribP3ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP3ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribP2uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP2uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP2ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP1uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP1ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
@@ -2182,838 +2189,838 @@ inline void QOpenGLFunctions_4_2_Core::glVertexP2ui(GLenum type, GLuint value)
 
 inline void QOpenGLFunctions_4_2_Core::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
 {
-    d_3_3_Core->GetQueryObjectui64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
 {
-    d_3_3_Core->GetQueryObjecti64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjecti64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glQueryCounter(GLuint id, GLenum target)
 {
-    d_3_3_Core->QueryCounter(id, target);
+    d_3_3_Core->f.QueryCounter(id, target);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
 {
-    d_3_3_Core->GetSamplerParameterIuiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIuiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
 {
-    d_3_3_Core->GetSamplerParameterfv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterfv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameterIiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameteriv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameteriv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
 {
-    d_3_3_Core->SamplerParameterIuiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIuiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameterIiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
 {
-    d_3_3_Core->SamplerParameterfv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterfv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-    d_3_3_Core->SamplerParameterf(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterf(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameteriv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteriv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-    d_3_3_Core->SamplerParameteri(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteri(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBindSampler(GLuint unit, GLuint sampler)
 {
-    d_3_3_Core->BindSampler(unit, sampler);
+    d_3_3_Core->f.BindSampler(unit, sampler);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Core::glIsSampler(GLuint sampler)
 {
-    return d_3_3_Core->IsSampler(sampler);
+    return d_3_3_Core->f.IsSampler(sampler);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDeleteSamplers(GLsizei count, const GLuint *samplers)
 {
-    d_3_3_Core->DeleteSamplers(count, samplers);
+    d_3_3_Core->f.DeleteSamplers(count, samplers);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGenSamplers(GLsizei count, GLuint *samplers)
 {
-    d_3_3_Core->GenSamplers(count, samplers);
+    d_3_3_Core->f.GenSamplers(count, samplers);
 }
 
 inline GLint QOpenGLFunctions_4_2_Core::glGetFragDataIndex(GLuint program, const GLchar *name)
 {
-    return d_3_3_Core->GetFragDataIndex(program, name);
+    return d_3_3_Core->f.GetFragDataIndex(program, name);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
-    d_3_3_Core->BindFragDataLocationIndexed(program, colorNumber, index, name);
+    d_3_3_Core->f.BindFragDataLocationIndexed(program, colorNumber, index, name);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-    d_3_3_Core->VertexAttribDivisor(index, divisor);
+    d_3_3_Core->f.VertexAttribDivisor(index, divisor);
 }
 
 
 // OpenGL 4.0 core functions
 inline void QOpenGLFunctions_4_2_Core::glGetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params)
 {
-    d_4_0_Core->GetQueryIndexediv(target, index, pname, params);
+    d_4_0_Core->f.GetQueryIndexediv(target, index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glEndQueryIndexed(GLenum target, GLuint index)
 {
-    d_4_0_Core->EndQueryIndexed(target, index);
+    d_4_0_Core->f.EndQueryIndexed(target, index);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBeginQueryIndexed(GLenum target, GLuint index, GLuint id)
 {
-    d_4_0_Core->BeginQueryIndexed(target, index, id);
+    d_4_0_Core->f.BeginQueryIndexed(target, index, id);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawTransformFeedbackStream(GLenum mode, GLuint id, GLuint stream)
 {
-    d_4_0_Core->DrawTransformFeedbackStream(mode, id, stream);
+    d_4_0_Core->f.DrawTransformFeedbackStream(mode, id, stream);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawTransformFeedback(GLenum mode, GLuint id)
 {
-    d_4_0_Core->DrawTransformFeedback(mode, id);
+    d_4_0_Core->f.DrawTransformFeedback(mode, id);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glResumeTransformFeedback()
 {
-    d_4_0_Core->ResumeTransformFeedback();
+    d_4_0_Core->f.ResumeTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_2_Core::glPauseTransformFeedback()
 {
-    d_4_0_Core->PauseTransformFeedback();
+    d_4_0_Core->f.PauseTransformFeedback();
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Core::glIsTransformFeedback(GLuint id)
 {
-    return d_4_0_Core->IsTransformFeedback(id);
+    return d_4_0_Core->f.IsTransformFeedback(id);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGenTransformFeedbacks(GLsizei n, GLuint *ids)
 {
-    d_4_0_Core->GenTransformFeedbacks(n, ids);
+    d_4_0_Core->f.GenTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
 {
-    d_4_0_Core->DeleteTransformFeedbacks(n, ids);
+    d_4_0_Core->f.DeleteTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBindTransformFeedback(GLenum target, GLuint id)
 {
-    d_4_0_Core->BindTransformFeedback(target, id);
+    d_4_0_Core->f.BindTransformFeedback(target, id);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glPatchParameterfv(GLenum pname, const GLfloat *values)
 {
-    d_4_0_Core->PatchParameterfv(pname, values);
+    d_4_0_Core->f.PatchParameterfv(pname, values);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glPatchParameteri(GLenum pname, GLint value)
 {
-    d_4_0_Core->PatchParameteri(pname, value);
+    d_4_0_Core->f.PatchParameteri(pname, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetProgramStageiv(GLuint program, GLenum shadertype, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetProgramStageiv(program, shadertype, pname, values);
+    d_4_0_Core->f.GetProgramStageiv(program, shadertype, pname, values);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetUniformSubroutineuiv(GLenum shadertype, GLint location, GLuint *params)
 {
-    d_4_0_Core->GetUniformSubroutineuiv(shadertype, location, params);
+    d_4_0_Core->f.GetUniformSubroutineuiv(shadertype, location, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformSubroutinesuiv(GLenum shadertype, GLsizei count, const GLuint *indices)
 {
-    d_4_0_Core->UniformSubroutinesuiv(shadertype, count, indices);
+    d_4_0_Core->f.UniformSubroutinesuiv(shadertype, count, indices);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetActiveSubroutineName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetActiveSubroutineUniformName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
+    d_4_0_Core->f.GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
 }
 
 inline GLuint QOpenGLFunctions_4_2_Core::glGetSubroutineIndex(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineIndex(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineIndex(program, shadertype, name);
 }
 
 inline GLint QOpenGLFunctions_4_2_Core::glGetSubroutineUniformLocation(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineUniformLocation(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineUniformLocation(program, shadertype, name);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetUniformdv(GLuint program, GLint location, GLdouble *params)
 {
-    d_4_0_Core->GetUniformdv(program, location, params);
+    d_4_0_Core->f.GetUniformdv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix4x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix4x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix3x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix3x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix2x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix2x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniformMatrix2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform4dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform4dv(location, count, value);
+    d_4_0_Core->f.Uniform4dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform3dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform3dv(location, count, value);
+    d_4_0_Core->f.Uniform3dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform2dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform2dv(location, count, value);
+    d_4_0_Core->f.Uniform2dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform1dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform1dv(location, count, value);
+    d_4_0_Core->f.Uniform1dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform4d(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_0_Core->Uniform4d(location, x, y, z, w);
+    d_4_0_Core->f.Uniform4d(location, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform3d(GLint location, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_0_Core->Uniform3d(location, x, y, z);
+    d_4_0_Core->f.Uniform3d(location, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform2d(GLint location, GLdouble x, GLdouble y)
 {
-    d_4_0_Core->Uniform2d(location, x, y);
+    d_4_0_Core->f.Uniform2d(location, x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUniform1d(GLint location, GLdouble x)
 {
-    d_4_0_Core->Uniform1d(location, x);
+    d_4_0_Core->f.Uniform1d(location, x);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawElementsIndirect(GLenum mode, GLenum type, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawElementsIndirect(mode, type, indirect);
+    d_4_0_Core->f.DrawElementsIndirect(mode, type, indirect);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawArraysIndirect(GLenum mode, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawArraysIndirect(mode, indirect);
+    d_4_0_Core->f.DrawArraysIndirect(mode, indirect);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
 {
-    d_4_0_Core->BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+    d_4_0_Core->f.BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBlendFunci(GLuint buf, GLenum src, GLenum dst)
 {
-    d_4_0_Core->BlendFunci(buf, src, dst);
+    d_4_0_Core->f.BlendFunci(buf, src, dst);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
 {
-    d_4_0_Core->BlendEquationSeparatei(buf, modeRGB, modeAlpha);
+    d_4_0_Core->f.BlendEquationSeparatei(buf, modeRGB, modeAlpha);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBlendEquationi(GLuint buf, GLenum mode)
 {
-    d_4_0_Core->BlendEquationi(buf, mode);
+    d_4_0_Core->f.BlendEquationi(buf, mode);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glMinSampleShading(GLfloat value)
 {
-    d_4_0_Core->MinSampleShading(value);
+    d_4_0_Core->f.MinSampleShading(value);
 }
 
 
 // OpenGL 4.1 core functions
 inline void QOpenGLFunctions_4_2_Core::glGetDoublei_v(GLenum target, GLuint index, GLdouble *data)
 {
-    d_4_1_Core->GetDoublei_v(target, index, data);
+    d_4_1_Core->f.GetDoublei_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetFloati_v(GLenum target, GLuint index, GLfloat *data)
 {
-    d_4_1_Core->GetFloati_v(target, index, data);
+    d_4_1_Core->f.GetFloati_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDepthRangeIndexed(GLuint index, GLdouble n, GLdouble f)
 {
-    d_4_1_Core->DepthRangeIndexed(index, n, f);
+    d_4_1_Core->f.DepthRangeIndexed(index, n, f);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDepthRangeArrayv(GLuint first, GLsizei count, const GLdouble *v)
 {
-    d_4_1_Core->DepthRangeArrayv(first, count, v);
+    d_4_1_Core->f.DepthRangeArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glScissorIndexedv(GLuint index, const GLint *v)
 {
-    d_4_1_Core->ScissorIndexedv(index, v);
+    d_4_1_Core->f.ScissorIndexedv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glScissorIndexed(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height)
 {
-    d_4_1_Core->ScissorIndexed(index, left, bottom, width, height);
+    d_4_1_Core->f.ScissorIndexed(index, left, bottom, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glScissorArrayv(GLuint first, GLsizei count, const GLint *v)
 {
-    d_4_1_Core->ScissorArrayv(first, count, v);
+    d_4_1_Core->f.ScissorArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glViewportIndexedfv(GLuint index, const GLfloat *v)
 {
-    d_4_1_Core->ViewportIndexedfv(index, v);
+    d_4_1_Core->f.ViewportIndexedfv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glViewportIndexedf(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h)
 {
-    d_4_1_Core->ViewportIndexedf(index, x, y, w, h);
+    d_4_1_Core->f.ViewportIndexedf(index, x, y, w, h);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glViewportArrayv(GLuint first, GLsizei count, const GLfloat *v)
 {
-    d_4_1_Core->ViewportArrayv(first, count, v);
+    d_4_1_Core->f.ViewportArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetVertexAttribLdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_4_1_Core->GetVertexAttribLdv(index, pname, params);
+    d_4_1_Core->f.GetVertexAttribLdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribLPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_4_1_Core->VertexAttribLPointer(index, size, type, stride, pointer);
+    d_4_1_Core->f.VertexAttribLPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribL4dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL4dv(index, v);
+    d_4_1_Core->f.VertexAttribL4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribL3dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL3dv(index, v);
+    d_4_1_Core->f.VertexAttribL3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribL2dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL2dv(index, v);
+    d_4_1_Core->f.VertexAttribL2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribL1dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL1dv(index, v);
+    d_4_1_Core->f.VertexAttribL1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribL4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_1_Core->VertexAttribL4d(index, x, y, z, w);
+    d_4_1_Core->f.VertexAttribL4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribL3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_1_Core->VertexAttribL3d(index, x, y, z);
+    d_4_1_Core->f.VertexAttribL3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribL2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_4_1_Core->VertexAttribL2d(index, x, y);
+    d_4_1_Core->f.VertexAttribL2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glVertexAttribL1d(GLuint index, GLdouble x)
 {
-    d_4_1_Core->VertexAttribL1d(index, x);
+    d_4_1_Core->f.VertexAttribL1d(index, x);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetProgramPipelineInfoLog(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_4_1_Core->GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
+    d_4_1_Core->f.GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glValidateProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->ValidateProgramPipeline(pipeline);
+    d_4_1_Core->f.ValidateProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix4x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix3x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix4x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix2x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix3x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix2x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix4x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix3x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix4x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix2x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix3x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix2x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniformMatrix2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform4uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform4uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_4_1_Core->ProgramUniform4ui(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4ui(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform4dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform4dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform4d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3)
 {
-    d_4_1_Core->ProgramUniform4d(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4d(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform4fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform4fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_4_1_Core->ProgramUniform4f(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4f(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform4iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform4iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_4_1_Core->ProgramUniform4i(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4i(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform3uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform3uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_4_1_Core->ProgramUniform3ui(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3ui(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform3dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform3dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform3d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2)
 {
-    d_4_1_Core->ProgramUniform3d(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3d(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform3fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform3fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_4_1_Core->ProgramUniform3f(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3f(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform3iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform3iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_4_1_Core->ProgramUniform3i(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3i(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform2uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform2uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
 {
-    d_4_1_Core->ProgramUniform2ui(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2ui(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform2dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform2dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform2d(GLuint program, GLint location, GLdouble v0, GLdouble v1)
 {
-    d_4_1_Core->ProgramUniform2d(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2d(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform2fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform2fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1)
 {
-    d_4_1_Core->ProgramUniform2f(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2f(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform2iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform2iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
 {
-    d_4_1_Core->ProgramUniform2i(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2i(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform1uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform1uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform1ui(GLuint program, GLint location, GLuint v0)
 {
-    d_4_1_Core->ProgramUniform1ui(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1ui(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform1dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform1dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform1d(GLuint program, GLint location, GLdouble v0)
 {
-    d_4_1_Core->ProgramUniform1d(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1d(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform1fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform1fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform1f(GLuint program, GLint location, GLfloat v0)
 {
-    d_4_1_Core->ProgramUniform1f(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1f(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform1iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform1iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramUniform1i(GLuint program, GLint location, GLint v0)
 {
-    d_4_1_Core->ProgramUniform1i(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1i(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
 {
-    d_4_1_Core->GetProgramPipelineiv(pipeline, pname, params);
+    d_4_1_Core->f.GetProgramPipelineiv(pipeline, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_2_Core::glIsProgramPipeline(GLuint pipeline)
 {
-    return d_4_1_Core->IsProgramPipeline(pipeline);
+    return d_4_1_Core->f.IsProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGenProgramPipelines(GLsizei n, GLuint *pipelines)
 {
-    d_4_1_Core->GenProgramPipelines(n, pipelines);
+    d_4_1_Core->f.GenProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
 {
-    d_4_1_Core->DeleteProgramPipelines(n, pipelines);
+    d_4_1_Core->f.DeleteProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBindProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->BindProgramPipeline(pipeline);
+    d_4_1_Core->f.BindProgramPipeline(pipeline);
 }
 
 inline GLuint QOpenGLFunctions_4_2_Core::glCreateShaderProgramv(GLenum type, GLsizei count, const GLchar* const *strings)
 {
-    return d_4_1_Core->CreateShaderProgramv(type, count, strings);
+    return d_4_1_Core->f.CreateShaderProgramv(type, count, strings);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glActiveShaderProgram(GLuint pipeline, GLuint program)
 {
-    d_4_1_Core->ActiveShaderProgram(pipeline, program);
+    d_4_1_Core->f.ActiveShaderProgram(pipeline, program);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glUseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
 {
-    d_4_1_Core->UseProgramStages(pipeline, stages, program);
+    d_4_1_Core->f.UseProgramStages(pipeline, stages, program);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramParameteri(GLuint program, GLenum pname, GLint value)
 {
-    d_4_1_Core->ProgramParameteri(program, pname, value);
+    d_4_1_Core->f.ProgramParameteri(program, pname, value);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glProgramBinary(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length)
 {
-    d_4_1_Core->ProgramBinary(program, binaryFormat, binary, length);
+    d_4_1_Core->f.ProgramBinary(program, binaryFormat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary)
 {
-    d_4_1_Core->GetProgramBinary(program, bufSize, length, binaryFormat, binary);
+    d_4_1_Core->f.GetProgramBinary(program, bufSize, length, binaryFormat, binary);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glClearDepthf(GLfloat dd)
 {
-    d_4_1_Core->ClearDepthf(dd);
+    d_4_1_Core->f.ClearDepthf(dd);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDepthRangef(GLfloat n, GLfloat f)
 {
-    d_4_1_Core->DepthRangef(n, f);
+    d_4_1_Core->f.DepthRangef(n, f);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)
 {
-    d_4_1_Core->GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+    d_4_1_Core->f.GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glShaderBinary(GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length)
 {
-    d_4_1_Core->ShaderBinary(count, shaders, binaryformat, binary, length);
+    d_4_1_Core->f.ShaderBinary(count, shaders, binaryformat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glReleaseShaderCompiler()
 {
-    d_4_1_Core->ReleaseShaderCompiler();
+    d_4_1_Core->f.ReleaseShaderCompiler();
 }
 
 
 // OpenGL 4.2 core functions
 inline void QOpenGLFunctions_4_2_Core::glTexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_2_Core->TexStorage3D(target, levels, internalformat, width, height, depth);
+    d_4_2_Core->f.TexStorage3D(target, levels, internalformat, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_4_2_Core->TexStorage2D(target, levels, internalformat, width, height);
+    d_4_2_Core->f.TexStorage2D(target, levels, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glTexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)
 {
-    d_4_2_Core->TexStorage1D(target, levels, internalformat, width);
+    d_4_2_Core->f.TexStorage1D(target, levels, internalformat, width);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glMemoryBarrier(GLbitfield barriers)
 {
-    d_4_2_Core->MemoryBarrier(barriers);
+    d_4_2_Core->f.MemoryBarrier(barriers);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glBindImageTexture(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format)
 {
-    d_4_2_Core->BindImageTexture(unit, texture, level, layered, layer, access, format);
+    d_4_2_Core->f.BindImageTexture(unit, texture, level, layered, layer, access, format);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetActiveAtomicCounterBufferiv(GLuint program, GLuint bufferIndex, GLenum pname, GLint *params)
 {
-    d_4_2_Core->GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
+    d_4_2_Core->f.GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glGetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params)
 {
-    d_4_2_Core->GetInternalformativ(target, internalformat, pname, bufSize, params);
+    d_4_2_Core->f.GetInternalformativ(target, internalformat, pname, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawTransformFeedbackStreamInstanced(GLenum mode, GLuint id, GLuint stream, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawTransformFeedbackInstanced(GLenum mode, GLuint id, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackInstanced(mode, id, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackInstanced(mode, id, instancecount);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawElementsInstancedBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_2_Core::glDrawArraysInstancedBaseInstance(GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
+    d_4_2_Core->f.DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp
index 58cc9c0b1c..a9f15083ad 100644
--- a/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -89,94 +95,72 @@ QOpenGLFunctions_4_3_Compatibility::QOpenGLFunctions_4_3_Compatibility()
 
 QOpenGLFunctions_4_3_Compatibility::~QOpenGLFunctions_4_3_Compatibility()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_3_3_Core && !d_3_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Core->context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        delete d_3_3_Core;
-    }
-    if (d_4_0_Core && !d_4_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_0_Core->context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        delete d_4_0_Core;
-    }
-    if (d_4_1_Core && !d_4_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_1_Core->context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        delete d_4_1_Core;
-    }
-    if (d_4_2_Core && !d_4_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_2_Core->context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        delete d_4_2_Core;
-    }
-    if (d_4_3_Core && !d_4_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_3_Core->context, QOpenGLFunctions_4_3_CoreBackend::versionStatus());
-        delete d_4_3_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
-    if (d_1_3_Deprecated && !d_1_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Deprecated->context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        delete d_1_3_Deprecated;
-    }
-    if (d_1_4_Deprecated && !d_1_4_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Deprecated->context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        delete d_1_4_Deprecated;
-    }
-    if (d_3_3_Deprecated && !d_3_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Deprecated->context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus());
-        delete d_3_3_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_3_3_Core)
+        d_3_3_Core->refs.deref();
+    Q_ASSERT(d_3_3_Core->refs.load());
+    if (d_4_0_Core)
+        d_4_0_Core->refs.deref();
+    Q_ASSERT(d_4_0_Core->refs.load());
+    if (d_4_1_Core)
+        d_4_1_Core->refs.deref();
+    Q_ASSERT(d_4_1_Core->refs.load());
+    if (d_4_2_Core)
+        d_4_2_Core->refs.deref();
+    Q_ASSERT(d_4_2_Core->refs.load());
+    if (d_4_3_Core)
+        d_4_3_Core->refs.deref();
+    Q_ASSERT(d_4_3_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
+    if (d_1_3_Deprecated)
+        d_1_3_Deprecated->refs.deref();
+    Q_ASSERT(d_1_3_Deprecated->refs.load());
+    if (d_1_4_Deprecated)
+        d_1_4_Deprecated->refs.deref();
+    Q_ASSERT(d_1_4_Deprecated->refs.load());
+    if (d_3_3_Deprecated)
+        d_3_3_Deprecated->refs.deref();
+    Q_ASSERT(d_3_3_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_4_3_Compatibility::initializeOpenGLFunctions()
@@ -195,178 +179,90 @@ bool QOpenGLFunctions_4_3_Compatibility::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus(), d);
-        }
         d_3_3_Core = static_cast<QOpenGLFunctions_3_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus(), d);
-        }
         d_4_0_Core = static_cast<QOpenGLFunctions_4_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus(), d);
-        }
         d_4_1_Core = static_cast<QOpenGLFunctions_4_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus(), d);
-        }
         d_4_2_Core = static_cast<QOpenGLFunctions_4_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_3_CoreBackend::versionStatus(), d);
-        }
         d_4_3_Core = static_cast<QOpenGLFunctions_4_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_3_Deprecated = static_cast<QOpenGLFunctions_1_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_4_Deprecated = static_cast<QOpenGLFunctions_1_4_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_3_3_Deprecated = static_cast<QOpenGLFunctions_3_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_4_3_compatibility.h b/src/gui/opengl/qopenglfunctions_4_3_compatibility.h
index 6f353c2cc9..33d3065500 100644
--- a/src/gui/opengl/qopenglfunctions_4_3_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_4_3_compatibility.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -1093,4437 +1100,4437 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_3_Compatibility::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_4_3_Compatibility::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetPointerv(GLenum pname, GLvoid* *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_4_3_Compatibility::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_4_3_Compatibility::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_4_3_Compatibility::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_4_3_Compatibility::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_4_3_Compatibility::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline GLvoid* QOpenGLFunctions_4_3_Compatibility::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_4_3_Compatibility::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_3_Compatibility::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_4_3_Compatibility::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_4_3_Compatibility::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glSampleMaski(GLuint index, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(index, mask);
+    d_3_2_Core->f.SampleMaski(index, mask);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetInteger64v(GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetInteger64v(pname, params);
+    d_3_2_Core->f.GetInteger64v(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_4_3_Compatibility::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_4_3_Compatibility::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 
 // OpenGL 3.3 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP4uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribP4ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP4ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribP3uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP3uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribP3ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP3ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribP2uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP2uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP2ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP1uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP1ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->SecondaryColorP3uiv(type, color);
+    d_3_3_Deprecated->f.SecondaryColorP3uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColorP3ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->SecondaryColorP3ui(type, color);
+    d_3_3_Deprecated->f.SecondaryColorP3ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColorP4uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->ColorP4uiv(type, color);
+    d_3_3_Deprecated->f.ColorP4uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColorP4ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->ColorP4ui(type, color);
+    d_3_3_Deprecated->f.ColorP4ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColorP3uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->ColorP3uiv(type, color);
+    d_3_3_Deprecated->f.ColorP3uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColorP3ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->ColorP3ui(type, color);
+    d_3_3_Deprecated->f.ColorP3ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glNormalP3uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->NormalP3uiv(type, coords);
+    d_3_3_Deprecated->f.NormalP3uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glNormalP3ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->NormalP3ui(type, coords);
+    d_3_3_Deprecated->f.NormalP3ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoordP4uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP4uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP4uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoordP4ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP4ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP4ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoordP3uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP3uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP3uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoordP3ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP3ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP3ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoordP2uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP2uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP2uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoordP2ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP2ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP2ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoordP1uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP1uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP1uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoordP1ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP1ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP1ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoordP4uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP4uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP4uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoordP4ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP4ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP4ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoordP3uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP3uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP3uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoordP3ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP3ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP3ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoordP2uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP2uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP2uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoordP2ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP2ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP2ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoordP1uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP1uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP1uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoordP1ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP1ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP1ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexP4uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP4uiv(type, value);
+    d_3_3_Deprecated->f.VertexP4uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexP4ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP4ui(type, value);
+    d_3_3_Deprecated->f.VertexP4ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexP3uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP3uiv(type, value);
+    d_3_3_Deprecated->f.VertexP3uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexP3ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP3ui(type, value);
+    d_3_3_Deprecated->f.VertexP3ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexP2uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP2uiv(type, value);
+    d_3_3_Deprecated->f.VertexP2uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexP2ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP2ui(type, value);
+    d_3_3_Deprecated->f.VertexP2ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
 {
-    d_3_3_Core->GetQueryObjectui64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
 {
-    d_3_3_Core->GetQueryObjecti64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjecti64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glQueryCounter(GLuint id, GLenum target)
 {
-    d_3_3_Core->QueryCounter(id, target);
+    d_3_3_Core->f.QueryCounter(id, target);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
 {
-    d_3_3_Core->GetSamplerParameterIuiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIuiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
 {
-    d_3_3_Core->GetSamplerParameterfv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterfv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameterIiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameteriv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameteriv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
 {
-    d_3_3_Core->SamplerParameterIuiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIuiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameterIiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
 {
-    d_3_3_Core->SamplerParameterfv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterfv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-    d_3_3_Core->SamplerParameterf(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterf(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameteriv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteriv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-    d_3_3_Core->SamplerParameteri(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteri(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindSampler(GLuint unit, GLuint sampler)
 {
-    d_3_3_Core->BindSampler(unit, sampler);
+    d_3_3_Core->f.BindSampler(unit, sampler);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsSampler(GLuint sampler)
 {
-    return d_3_3_Core->IsSampler(sampler);
+    return d_3_3_Core->f.IsSampler(sampler);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDeleteSamplers(GLsizei count, const GLuint *samplers)
 {
-    d_3_3_Core->DeleteSamplers(count, samplers);
+    d_3_3_Core->f.DeleteSamplers(count, samplers);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGenSamplers(GLsizei count, GLuint *samplers)
 {
-    d_3_3_Core->GenSamplers(count, samplers);
+    d_3_3_Core->f.GenSamplers(count, samplers);
 }
 
 inline GLint QOpenGLFunctions_4_3_Compatibility::glGetFragDataIndex(GLuint program, const GLchar *name)
 {
-    return d_3_3_Core->GetFragDataIndex(program, name);
+    return d_3_3_Core->f.GetFragDataIndex(program, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
-    d_3_3_Core->BindFragDataLocationIndexed(program, colorNumber, index, name);
+    d_3_3_Core->f.BindFragDataLocationIndexed(program, colorNumber, index, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-    d_3_3_Core->VertexAttribDivisor(index, divisor);
+    d_3_3_Core->f.VertexAttribDivisor(index, divisor);
 }
 
 
 // OpenGL 4.0 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glGetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params)
 {
-    d_4_0_Core->GetQueryIndexediv(target, index, pname, params);
+    d_4_0_Core->f.GetQueryIndexediv(target, index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEndQueryIndexed(GLenum target, GLuint index)
 {
-    d_4_0_Core->EndQueryIndexed(target, index);
+    d_4_0_Core->f.EndQueryIndexed(target, index);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBeginQueryIndexed(GLenum target, GLuint index, GLuint id)
 {
-    d_4_0_Core->BeginQueryIndexed(target, index, id);
+    d_4_0_Core->f.BeginQueryIndexed(target, index, id);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawTransformFeedbackStream(GLenum mode, GLuint id, GLuint stream)
 {
-    d_4_0_Core->DrawTransformFeedbackStream(mode, id, stream);
+    d_4_0_Core->f.DrawTransformFeedbackStream(mode, id, stream);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawTransformFeedback(GLenum mode, GLuint id)
 {
-    d_4_0_Core->DrawTransformFeedback(mode, id);
+    d_4_0_Core->f.DrawTransformFeedback(mode, id);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glResumeTransformFeedback()
 {
-    d_4_0_Core->ResumeTransformFeedback();
+    d_4_0_Core->f.ResumeTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPauseTransformFeedback()
 {
-    d_4_0_Core->PauseTransformFeedback();
+    d_4_0_Core->f.PauseTransformFeedback();
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsTransformFeedback(GLuint id)
 {
-    return d_4_0_Core->IsTransformFeedback(id);
+    return d_4_0_Core->f.IsTransformFeedback(id);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGenTransformFeedbacks(GLsizei n, GLuint *ids)
 {
-    d_4_0_Core->GenTransformFeedbacks(n, ids);
+    d_4_0_Core->f.GenTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
 {
-    d_4_0_Core->DeleteTransformFeedbacks(n, ids);
+    d_4_0_Core->f.DeleteTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindTransformFeedback(GLenum target, GLuint id)
 {
-    d_4_0_Core->BindTransformFeedback(target, id);
+    d_4_0_Core->f.BindTransformFeedback(target, id);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPatchParameterfv(GLenum pname, const GLfloat *values)
 {
-    d_4_0_Core->PatchParameterfv(pname, values);
+    d_4_0_Core->f.PatchParameterfv(pname, values);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPatchParameteri(GLenum pname, GLint value)
 {
-    d_4_0_Core->PatchParameteri(pname, value);
+    d_4_0_Core->f.PatchParameteri(pname, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetProgramStageiv(GLuint program, GLenum shadertype, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetProgramStageiv(program, shadertype, pname, values);
+    d_4_0_Core->f.GetProgramStageiv(program, shadertype, pname, values);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetUniformSubroutineuiv(GLenum shadertype, GLint location, GLuint *params)
 {
-    d_4_0_Core->GetUniformSubroutineuiv(shadertype, location, params);
+    d_4_0_Core->f.GetUniformSubroutineuiv(shadertype, location, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformSubroutinesuiv(GLenum shadertype, GLsizei count, const GLuint *indices)
 {
-    d_4_0_Core->UniformSubroutinesuiv(shadertype, count, indices);
+    d_4_0_Core->f.UniformSubroutinesuiv(shadertype, count, indices);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetActiveSubroutineName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetActiveSubroutineUniformName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
+    d_4_0_Core->f.GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
 }
 
 inline GLuint QOpenGLFunctions_4_3_Compatibility::glGetSubroutineIndex(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineIndex(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineIndex(program, shadertype, name);
 }
 
 inline GLint QOpenGLFunctions_4_3_Compatibility::glGetSubroutineUniformLocation(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineUniformLocation(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineUniformLocation(program, shadertype, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetUniformdv(GLuint program, GLint location, GLdouble *params)
 {
-    d_4_0_Core->GetUniformdv(program, location, params);
+    d_4_0_Core->f.GetUniformdv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix4x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix4x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix3x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix3x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix2x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix2x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniformMatrix2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform4dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform4dv(location, count, value);
+    d_4_0_Core->f.Uniform4dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform3dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform3dv(location, count, value);
+    d_4_0_Core->f.Uniform3dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform2dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform2dv(location, count, value);
+    d_4_0_Core->f.Uniform2dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform1dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform1dv(location, count, value);
+    d_4_0_Core->f.Uniform1dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform4d(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_0_Core->Uniform4d(location, x, y, z, w);
+    d_4_0_Core->f.Uniform4d(location, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform3d(GLint location, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_0_Core->Uniform3d(location, x, y, z);
+    d_4_0_Core->f.Uniform3d(location, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform2d(GLint location, GLdouble x, GLdouble y)
 {
-    d_4_0_Core->Uniform2d(location, x, y);
+    d_4_0_Core->f.Uniform2d(location, x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUniform1d(GLint location, GLdouble x)
 {
-    d_4_0_Core->Uniform1d(location, x);
+    d_4_0_Core->f.Uniform1d(location, x);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawElementsIndirect(GLenum mode, GLenum type, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawElementsIndirect(mode, type, indirect);
+    d_4_0_Core->f.DrawElementsIndirect(mode, type, indirect);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawArraysIndirect(GLenum mode, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawArraysIndirect(mode, indirect);
+    d_4_0_Core->f.DrawArraysIndirect(mode, indirect);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
 {
-    d_4_0_Core->BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+    d_4_0_Core->f.BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBlendFunci(GLuint buf, GLenum src, GLenum dst)
 {
-    d_4_0_Core->BlendFunci(buf, src, dst);
+    d_4_0_Core->f.BlendFunci(buf, src, dst);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
 {
-    d_4_0_Core->BlendEquationSeparatei(buf, modeRGB, modeAlpha);
+    d_4_0_Core->f.BlendEquationSeparatei(buf, modeRGB, modeAlpha);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBlendEquationi(GLuint buf, GLenum mode)
 {
-    d_4_0_Core->BlendEquationi(buf, mode);
+    d_4_0_Core->f.BlendEquationi(buf, mode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMinSampleShading(GLfloat value)
 {
-    d_4_0_Core->MinSampleShading(value);
+    d_4_0_Core->f.MinSampleShading(value);
 }
 
 
 // OpenGL 4.1 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glGetDoublei_v(GLenum target, GLuint index, GLdouble *data)
 {
-    d_4_1_Core->GetDoublei_v(target, index, data);
+    d_4_1_Core->f.GetDoublei_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetFloati_v(GLenum target, GLuint index, GLfloat *data)
 {
-    d_4_1_Core->GetFloati_v(target, index, data);
+    d_4_1_Core->f.GetFloati_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDepthRangeIndexed(GLuint index, GLdouble n, GLdouble f)
 {
-    d_4_1_Core->DepthRangeIndexed(index, n, f);
+    d_4_1_Core->f.DepthRangeIndexed(index, n, f);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDepthRangeArrayv(GLuint first, GLsizei count, const GLdouble *v)
 {
-    d_4_1_Core->DepthRangeArrayv(first, count, v);
+    d_4_1_Core->f.DepthRangeArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glScissorIndexedv(GLuint index, const GLint *v)
 {
-    d_4_1_Core->ScissorIndexedv(index, v);
+    d_4_1_Core->f.ScissorIndexedv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glScissorIndexed(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height)
 {
-    d_4_1_Core->ScissorIndexed(index, left, bottom, width, height);
+    d_4_1_Core->f.ScissorIndexed(index, left, bottom, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glScissorArrayv(GLuint first, GLsizei count, const GLint *v)
 {
-    d_4_1_Core->ScissorArrayv(first, count, v);
+    d_4_1_Core->f.ScissorArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glViewportIndexedfv(GLuint index, const GLfloat *v)
 {
-    d_4_1_Core->ViewportIndexedfv(index, v);
+    d_4_1_Core->f.ViewportIndexedfv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glViewportIndexedf(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h)
 {
-    d_4_1_Core->ViewportIndexedf(index, x, y, w, h);
+    d_4_1_Core->f.ViewportIndexedf(index, x, y, w, h);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glViewportArrayv(GLuint first, GLsizei count, const GLfloat *v)
 {
-    d_4_1_Core->ViewportArrayv(first, count, v);
+    d_4_1_Core->f.ViewportArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetVertexAttribLdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_4_1_Core->GetVertexAttribLdv(index, pname, params);
+    d_4_1_Core->f.GetVertexAttribLdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribLPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_4_1_Core->VertexAttribLPointer(index, size, type, stride, pointer);
+    d_4_1_Core->f.VertexAttribLPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribL4dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL4dv(index, v);
+    d_4_1_Core->f.VertexAttribL4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribL3dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL3dv(index, v);
+    d_4_1_Core->f.VertexAttribL3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribL2dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL2dv(index, v);
+    d_4_1_Core->f.VertexAttribL2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribL1dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL1dv(index, v);
+    d_4_1_Core->f.VertexAttribL1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribL4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_1_Core->VertexAttribL4d(index, x, y, z, w);
+    d_4_1_Core->f.VertexAttribL4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribL3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_1_Core->VertexAttribL3d(index, x, y, z);
+    d_4_1_Core->f.VertexAttribL3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribL2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_4_1_Core->VertexAttribL2d(index, x, y);
+    d_4_1_Core->f.VertexAttribL2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribL1d(GLuint index, GLdouble x)
 {
-    d_4_1_Core->VertexAttribL1d(index, x);
+    d_4_1_Core->f.VertexAttribL1d(index, x);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetProgramPipelineInfoLog(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_4_1_Core->GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
+    d_4_1_Core->f.GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glValidateProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->ValidateProgramPipeline(pipeline);
+    d_4_1_Core->f.ValidateProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix4x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix3x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix4x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix2x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix3x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix2x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix4x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix3x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix4x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix2x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix3x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix2x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniformMatrix2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform4uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform4uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_4_1_Core->ProgramUniform4ui(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4ui(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform4dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform4dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform4d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3)
 {
-    d_4_1_Core->ProgramUniform4d(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4d(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform4fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform4fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_4_1_Core->ProgramUniform4f(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4f(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform4iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform4iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_4_1_Core->ProgramUniform4i(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4i(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform3uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform3uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_4_1_Core->ProgramUniform3ui(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3ui(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform3dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform3dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform3d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2)
 {
-    d_4_1_Core->ProgramUniform3d(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3d(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform3fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform3fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_4_1_Core->ProgramUniform3f(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3f(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform3iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform3iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_4_1_Core->ProgramUniform3i(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3i(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform2uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform2uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
 {
-    d_4_1_Core->ProgramUniform2ui(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2ui(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform2dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform2dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform2d(GLuint program, GLint location, GLdouble v0, GLdouble v1)
 {
-    d_4_1_Core->ProgramUniform2d(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2d(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform2fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform2fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1)
 {
-    d_4_1_Core->ProgramUniform2f(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2f(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform2iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform2iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
 {
-    d_4_1_Core->ProgramUniform2i(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2i(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform1uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform1uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform1ui(GLuint program, GLint location, GLuint v0)
 {
-    d_4_1_Core->ProgramUniform1ui(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1ui(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform1dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform1dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform1d(GLuint program, GLint location, GLdouble v0)
 {
-    d_4_1_Core->ProgramUniform1d(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1d(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform1fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform1fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform1f(GLuint program, GLint location, GLfloat v0)
 {
-    d_4_1_Core->ProgramUniform1f(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1f(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform1iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform1iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramUniform1i(GLuint program, GLint location, GLint v0)
 {
-    d_4_1_Core->ProgramUniform1i(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1i(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
 {
-    d_4_1_Core->GetProgramPipelineiv(pipeline, pname, params);
+    d_4_1_Core->f.GetProgramPipelineiv(pipeline, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsProgramPipeline(GLuint pipeline)
 {
-    return d_4_1_Core->IsProgramPipeline(pipeline);
+    return d_4_1_Core->f.IsProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGenProgramPipelines(GLsizei n, GLuint *pipelines)
 {
-    d_4_1_Core->GenProgramPipelines(n, pipelines);
+    d_4_1_Core->f.GenProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
 {
-    d_4_1_Core->DeleteProgramPipelines(n, pipelines);
+    d_4_1_Core->f.DeleteProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->BindProgramPipeline(pipeline);
+    d_4_1_Core->f.BindProgramPipeline(pipeline);
 }
 
 inline GLuint QOpenGLFunctions_4_3_Compatibility::glCreateShaderProgramv(GLenum type, GLsizei count, const GLchar* const *strings)
 {
-    return d_4_1_Core->CreateShaderProgramv(type, count, strings);
+    return d_4_1_Core->f.CreateShaderProgramv(type, count, strings);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glActiveShaderProgram(GLuint pipeline, GLuint program)
 {
-    d_4_1_Core->ActiveShaderProgram(pipeline, program);
+    d_4_1_Core->f.ActiveShaderProgram(pipeline, program);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glUseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
 {
-    d_4_1_Core->UseProgramStages(pipeline, stages, program);
+    d_4_1_Core->f.UseProgramStages(pipeline, stages, program);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramParameteri(GLuint program, GLenum pname, GLint value)
 {
-    d_4_1_Core->ProgramParameteri(program, pname, value);
+    d_4_1_Core->f.ProgramParameteri(program, pname, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glProgramBinary(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length)
 {
-    d_4_1_Core->ProgramBinary(program, binaryFormat, binary, length);
+    d_4_1_Core->f.ProgramBinary(program, binaryFormat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary)
 {
-    d_4_1_Core->GetProgramBinary(program, bufSize, length, binaryFormat, binary);
+    d_4_1_Core->f.GetProgramBinary(program, bufSize, length, binaryFormat, binary);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClearDepthf(GLfloat dd)
 {
-    d_4_1_Core->ClearDepthf(dd);
+    d_4_1_Core->f.ClearDepthf(dd);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDepthRangef(GLfloat n, GLfloat f)
 {
-    d_4_1_Core->DepthRangef(n, f);
+    d_4_1_Core->f.DepthRangef(n, f);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)
 {
-    d_4_1_Core->GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+    d_4_1_Core->f.GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glShaderBinary(GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length)
 {
-    d_4_1_Core->ShaderBinary(count, shaders, binaryformat, binary, length);
+    d_4_1_Core->f.ShaderBinary(count, shaders, binaryformat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glReleaseShaderCompiler()
 {
-    d_4_1_Core->ReleaseShaderCompiler();
+    d_4_1_Core->f.ReleaseShaderCompiler();
 }
 
 
 // OpenGL 4.2 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glTexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_2_Core->TexStorage3D(target, levels, internalformat, width, height, depth);
+    d_4_2_Core->f.TexStorage3D(target, levels, internalformat, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_4_2_Core->TexStorage2D(target, levels, internalformat, width, height);
+    d_4_2_Core->f.TexStorage2D(target, levels, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)
 {
-    d_4_2_Core->TexStorage1D(target, levels, internalformat, width);
+    d_4_2_Core->f.TexStorage1D(target, levels, internalformat, width);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMemoryBarrier(GLbitfield barriers)
 {
-    d_4_2_Core->MemoryBarrier(barriers);
+    d_4_2_Core->f.MemoryBarrier(barriers);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindImageTexture(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format)
 {
-    d_4_2_Core->BindImageTexture(unit, texture, level, layered, layer, access, format);
+    d_4_2_Core->f.BindImageTexture(unit, texture, level, layered, layer, access, format);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetActiveAtomicCounterBufferiv(GLuint program, GLuint bufferIndex, GLenum pname, GLint *params)
 {
-    d_4_2_Core->GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
+    d_4_2_Core->f.GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params)
 {
-    d_4_2_Core->GetInternalformativ(target, internalformat, pname, bufSize, params);
+    d_4_2_Core->f.GetInternalformativ(target, internalformat, pname, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawTransformFeedbackStreamInstanced(GLenum mode, GLuint id, GLuint stream, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawTransformFeedbackInstanced(GLenum mode, GLuint id, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackInstanced(mode, id, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackInstanced(mode, id, instancecount);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawElementsInstancedBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawArraysInstancedBaseInstance(GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
+    d_4_2_Core->f.DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
 }
 
 
 // OpenGL 4.3 core functions
 inline void QOpenGLFunctions_4_3_Compatibility::glTexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_4_3_Core->TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_4_3_Core->f.TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexStorage2DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_4_3_Core->TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_4_3_Core->f.TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexBufferRange(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_4_3_Core->TexBufferRange(target, internalformat, buffer, offset, size);
+    d_4_3_Core->f.TexBufferRange(target, internalformat, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glShaderStorageBlockBinding(GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding)
 {
-    d_4_3_Core->ShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
+    d_4_3_Core->f.ShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
 }
 
 inline GLint QOpenGLFunctions_4_3_Compatibility::glGetProgramResourceLocationIndex(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceLocationIndex(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceLocationIndex(program, programInterface, name);
 }
 
 inline GLint QOpenGLFunctions_4_3_Compatibility::glGetProgramResourceLocation(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceLocation(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceLocation(program, programInterface, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetProgramResourceiv(GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params)
 {
-    d_4_3_Core->GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
+    d_4_3_Core->f.GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetProgramResourceName(GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name)
 {
-    d_4_3_Core->GetProgramResourceName(program, programInterface, index, bufSize, length, name);
+    d_4_3_Core->f.GetProgramResourceName(program, programInterface, index, bufSize, length, name);
 }
 
 inline GLuint QOpenGLFunctions_4_3_Compatibility::glGetProgramResourceIndex(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceIndex(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceIndex(program, programInterface, name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetProgramInterfaceiv(GLuint program, GLenum programInterface, GLenum pname, GLint *params)
 {
-    d_4_3_Core->GetProgramInterfaceiv(program, programInterface, pname, params);
+    d_4_3_Core->f.GetProgramInterfaceiv(program, programInterface, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride)
 {
-    d_4_3_Core->MultiDrawElementsIndirect(mode, type, indirect, drawcount, stride);
+    d_4_3_Core->f.MultiDrawElementsIndirect(mode, type, indirect, drawcount, stride);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiDrawArraysIndirect(GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride)
 {
-    d_4_3_Core->MultiDrawArraysIndirect(mode, indirect, drawcount, stride);
+    d_4_3_Core->f.MultiDrawArraysIndirect(mode, indirect, drawcount, stride);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_4_3_Core->InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
+    d_4_3_Core->f.InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glInvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments)
 {
-    d_4_3_Core->InvalidateFramebuffer(target, numAttachments, attachments);
+    d_4_3_Core->f.InvalidateFramebuffer(target, numAttachments, attachments);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glInvalidateBufferData(GLuint buffer)
 {
-    d_4_3_Core->InvalidateBufferData(buffer);
+    d_4_3_Core->f.InvalidateBufferData(buffer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glInvalidateBufferSubData(GLuint buffer, GLintptr offset, GLsizeiptr length)
 {
-    d_4_3_Core->InvalidateBufferSubData(buffer, offset, length);
+    d_4_3_Core->f.InvalidateBufferSubData(buffer, offset, length);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glInvalidateTexImage(GLuint texture, GLint level)
 {
-    d_4_3_Core->InvalidateTexImage(texture, level);
+    d_4_3_Core->f.InvalidateTexImage(texture, level);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glInvalidateTexSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_3_Core->InvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
+    d_4_3_Core->f.InvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetInternalformati64v(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params)
 {
-    d_4_3_Core->GetInternalformati64v(target, internalformat, pname, bufSize, params);
+    d_4_3_Core->f.GetInternalformati64v(target, internalformat, pname, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_4_3_Core->GetFramebufferParameteriv(target, pname, params);
+    d_4_3_Core->f.GetFramebufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFramebufferParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_4_3_Core->FramebufferParameteri(target, pname, param);
+    d_4_3_Core->f.FramebufferParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexBindingDivisor(GLuint bindingindex, GLuint divisor)
 {
-    d_4_3_Core->VertexBindingDivisor(bindingindex, divisor);
+    d_4_3_Core->f.VertexBindingDivisor(bindingindex, divisor);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribBinding(GLuint attribindex, GLuint bindingindex)
 {
-    d_4_3_Core->VertexAttribBinding(attribindex, bindingindex);
+    d_4_3_Core->f.VertexAttribBinding(attribindex, bindingindex);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribLFormat(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribLFormat(attribindex, size, type, relativeoffset);
+    d_4_3_Core->f.VertexAttribLFormat(attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribIFormat(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribIFormat(attribindex, size, type, relativeoffset);
+    d_4_3_Core->f.VertexAttribIFormat(attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribFormat(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
+    d_4_3_Core->f.VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBindVertexBuffer(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride)
 {
-    d_4_3_Core->BindVertexBuffer(bindingindex, buffer, offset, stride);
+    d_4_3_Core->f.BindVertexBuffer(bindingindex, buffer, offset, stride);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTextureView(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers)
 {
-    d_4_3_Core->TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers);
+    d_4_3_Core->f.TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth)
 {
-    d_4_3_Core->CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth);
+    d_4_3_Core->f.CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDispatchComputeIndirect(GLintptr indirect)
 {
-    d_4_3_Core->DispatchComputeIndirect(indirect);
+    d_4_3_Core->f.DispatchComputeIndirect(indirect);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z)
 {
-    d_4_3_Core->DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
+    d_4_3_Core->f.DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClearBufferSubData(GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data)
 {
-    d_4_3_Core->ClearBufferSubData(target, internalformat, offset, size, format, type, data);
+    d_4_3_Core->f.ClearBufferSubData(target, internalformat, offset, size, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClearBufferData(GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data)
 {
-    d_4_3_Core->ClearBufferData(target, internalformat, format, type, data);
+    d_4_3_Core->f.ClearBufferData(target, internalformat, format, type, data);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_4_3_Compatibility::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPixelMapusv(GLenum map, GLint mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPixelMapuiv(GLenum map, GLint mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_4_3_Compatibility::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_4_3_Compatibility::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCallLists(GLsizei n, GLenum type, const GLvoid *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_4_3_Compatibility::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Compatibility::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glNormalPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glInterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glIndexPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glEdgeFlagPointer(GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_4_3_Compatibility::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glGetColorTable(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_4_3_Compatibility::glMultTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixd(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixf(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLoadTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixd(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glLoadTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixf(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord4sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_3_Deprecated->MultiTexCoord4s(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4s(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord4iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_3_Deprecated->MultiTexCoord4i(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4i(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord4fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_3_Deprecated->MultiTexCoord4f(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4f(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_3_Deprecated->MultiTexCoord4d(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4d(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord3sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-    d_1_3_Deprecated->MultiTexCoord3s(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3s(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord3iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
-    d_1_3_Deprecated->MultiTexCoord3i(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3i(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord3fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_3_Deprecated->MultiTexCoord3f(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3f(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_3_Deprecated->MultiTexCoord3d(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3d(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord2sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
-    d_1_3_Deprecated->MultiTexCoord2s(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2s(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord2iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
-    d_1_3_Deprecated->MultiTexCoord2i(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2i(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord2fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t)
 {
-    d_1_3_Deprecated->MultiTexCoord2f(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2f(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
-    d_1_3_Deprecated->MultiTexCoord2d(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2d(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord1sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord1s(GLenum target, GLshort s)
 {
-    d_1_3_Deprecated->MultiTexCoord1s(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1s(target, s);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord1iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord1i(GLenum target, GLint s)
 {
-    d_1_3_Deprecated->MultiTexCoord1i(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1i(target, s);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord1fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord1f(GLenum target, GLfloat s)
 {
-    d_1_3_Deprecated->MultiTexCoord1f(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1f(target, s);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glMultiTexCoord1d(GLenum target, GLdouble s)
 {
-    d_1_3_Deprecated->MultiTexCoord1d(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1d(target, s);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glClientActiveTexture(GLenum texture)
 {
-    d_1_3_Deprecated->ClientActiveTexture(texture);
+    d_1_3_Deprecated->f.ClientActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 deprecated functions
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos3sv(v);
+    d_1_4_Deprecated->f.WindowPos3sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_4_Deprecated->WindowPos3s(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos3iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos3iv(v);
+    d_1_4_Deprecated->f.WindowPos3iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_4_Deprecated->WindowPos3i(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos3fv(v);
+    d_1_4_Deprecated->f.WindowPos3fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_4_Deprecated->WindowPos3f(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos3dv(v);
+    d_1_4_Deprecated->f.WindowPos3dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_4_Deprecated->WindowPos3d(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos2sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos2sv(v);
+    d_1_4_Deprecated->f.WindowPos2sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos2s(GLshort x, GLshort y)
 {
-    d_1_4_Deprecated->WindowPos2s(x, y);
+    d_1_4_Deprecated->f.WindowPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos2iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos2iv(v);
+    d_1_4_Deprecated->f.WindowPos2iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos2i(GLint x, GLint y)
 {
-    d_1_4_Deprecated->WindowPos2i(x, y);
+    d_1_4_Deprecated->f.WindowPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos2fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos2fv(v);
+    d_1_4_Deprecated->f.WindowPos2fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos2f(GLfloat x, GLfloat y)
 {
-    d_1_4_Deprecated->WindowPos2f(x, y);
+    d_1_4_Deprecated->f.WindowPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos2dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos2dv(v);
+    d_1_4_Deprecated->f.WindowPos2dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glWindowPos2d(GLdouble x, GLdouble y)
 {
-    d_1_4_Deprecated->WindowPos2d(x, y);
+    d_1_4_Deprecated->f.WindowPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->SecondaryColorPointer(size, type, stride, pointer);
+    d_1_4_Deprecated->f.SecondaryColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3usv(const GLushort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3usv(v);
+    d_1_4_Deprecated->f.SecondaryColor3usv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3us(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3uiv(const GLuint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3uiv(v);
+    d_1_4_Deprecated->f.SecondaryColor3uiv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ui(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3ubv(const GLubyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3ubv(v);
+    d_1_4_Deprecated->f.SecondaryColor3ubv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ub(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3sv(v);
+    d_1_4_Deprecated->f.SecondaryColor3sv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3s(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3iv(const GLint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3iv(v);
+    d_1_4_Deprecated->f.SecondaryColor3iv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3i(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->SecondaryColor3fv(v);
+    d_1_4_Deprecated->f.SecondaryColor3fv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_4_Deprecated->SecondaryColor3f(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->SecondaryColor3dv(v);
+    d_1_4_Deprecated->f.SecondaryColor3dv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_4_Deprecated->SecondaryColor3d(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3bv(const GLbyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3bv(v);
+    d_1_4_Deprecated->f.SecondaryColor3bv(v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glSecondaryColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3b(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFogCoordPointer(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_1_4_Deprecated->FogCoordPointer(type, stride, pointer);
+    d_1_4_Deprecated->f.FogCoordPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFogCoorddv(const GLdouble *coord)
 {
-    d_1_4_Deprecated->FogCoorddv(coord);
+    d_1_4_Deprecated->f.FogCoorddv(coord);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFogCoordd(GLdouble coord)
 {
-    d_1_4_Deprecated->FogCoordd(coord);
+    d_1_4_Deprecated->f.FogCoordd(coord);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFogCoordfv(const GLfloat *coord)
 {
-    d_1_4_Deprecated->FogCoordfv(coord);
+    d_1_4_Deprecated->f.FogCoordfv(coord);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glFogCoordf(GLfloat coord)
 {
-    d_1_4_Deprecated->FogCoordf(coord);
+    d_1_4_Deprecated->f.FogCoordf(coord);
 }
 
 
@@ -5532,182 +5539,182 @@ inline void QOpenGLFunctions_4_3_Compatibility::glFogCoordf(GLfloat coord)
 // OpenGL 2.0 deprecated functions
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4usv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4usv(index, v);
+    d_2_0_Core->f.VertexAttrib4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4uiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4uiv(index, v);
+    d_2_0_Core->f.VertexAttrib4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4ubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4ubv(index, v);
+    d_2_0_Core->f.VertexAttrib4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4sv(index, v);
+    d_2_0_Core->f.VertexAttrib4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_2_0_Core->VertexAttrib4s(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4s(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4iv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4iv(index, v);
+    d_2_0_Core->f.VertexAttrib4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib4fv(index, v);
+    d_2_0_Core->f.VertexAttrib4fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_2_0_Core->VertexAttrib4f(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4f(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib4dv(index, v);
+    d_2_0_Core->f.VertexAttrib4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_2_0_Core->VertexAttrib4d(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4bv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4bv(index, v);
+    d_2_0_Core->f.VertexAttrib4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4Nusv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4Nusv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nusv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4Nuiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4Nuiv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nuiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4Nubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nubv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-    d_2_0_Core->VertexAttrib4Nub(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4Nub(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4Nsv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4Nsv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nsv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4Niv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4Niv(index, v);
+    d_2_0_Core->f.VertexAttrib4Niv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib4Nbv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nbv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nbv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib3sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib3sv(index, v);
+    d_2_0_Core->f.VertexAttrib3sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-    d_2_0_Core->VertexAttrib3s(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3s(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib3fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib3fv(index, v);
+    d_2_0_Core->f.VertexAttrib3fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_2_0_Core->VertexAttrib3f(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3f(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib3dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib3dv(index, v);
+    d_2_0_Core->f.VertexAttrib3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_2_0_Core->VertexAttrib3d(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib2sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib2sv(index, v);
+    d_2_0_Core->f.VertexAttrib2sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib2s(GLuint index, GLshort x, GLshort y)
 {
-    d_2_0_Core->VertexAttrib2s(index, x, y);
+    d_2_0_Core->f.VertexAttrib2s(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib2fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib2fv(index, v);
+    d_2_0_Core->f.VertexAttrib2fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    d_2_0_Core->VertexAttrib2f(index, x, y);
+    d_2_0_Core->f.VertexAttrib2f(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib2dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib2dv(index, v);
+    d_2_0_Core->f.VertexAttrib2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_2_0_Core->VertexAttrib2d(index, x, y);
+    d_2_0_Core->f.VertexAttrib2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib1sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib1sv(index, v);
+    d_2_0_Core->f.VertexAttrib1sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib1s(GLuint index, GLshort x)
 {
-    d_2_0_Core->VertexAttrib1s(index, x);
+    d_2_0_Core->f.VertexAttrib1s(index, x);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib1fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib1fv(index, v);
+    d_2_0_Core->f.VertexAttrib1fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    d_2_0_Core->VertexAttrib1f(index, x);
+    d_2_0_Core->f.VertexAttrib1f(index, x);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib1dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib1dv(index, v);
+    d_2_0_Core->f.VertexAttrib1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib1d(GLuint index, GLdouble x)
 {
-    d_2_0_Core->VertexAttrib1d(index, x);
+    d_2_0_Core->f.VertexAttrib1d(index, x);
 }
 
 
@@ -5716,102 +5723,102 @@ inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttrib1d(GLuint index, G
 // OpenGL 3.0 deprecated functions
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI4usv(GLuint index, const GLushort *v)
 {
-    d_3_0_Core->VertexAttribI4usv(index, v);
+    d_3_0_Core->f.VertexAttribI4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI4ubv(GLuint index, const GLubyte *v)
 {
-    d_3_0_Core->VertexAttribI4ubv(index, v);
+    d_3_0_Core->f.VertexAttribI4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI4sv(GLuint index, const GLshort *v)
 {
-    d_3_0_Core->VertexAttribI4sv(index, v);
+    d_3_0_Core->f.VertexAttribI4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI4bv(GLuint index, const GLbyte *v)
 {
-    d_3_0_Core->VertexAttribI4bv(index, v);
+    d_3_0_Core->f.VertexAttribI4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI4uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI4uiv(index, v);
+    d_3_0_Core->f.VertexAttribI4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI3uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI3uiv(index, v);
+    d_3_0_Core->f.VertexAttribI3uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI2uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI2uiv(index, v);
+    d_3_0_Core->f.VertexAttribI2uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI1uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI1uiv(index, v);
+    d_3_0_Core->f.VertexAttribI1uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI4iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI4iv(index, v);
+    d_3_0_Core->f.VertexAttribI4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI3iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI3iv(index, v);
+    d_3_0_Core->f.VertexAttribI3iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI2iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI2iv(index, v);
+    d_3_0_Core->f.VertexAttribI2iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI1iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI1iv(index, v);
+    d_3_0_Core->f.VertexAttribI1iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
-    d_3_0_Core->VertexAttribI4ui(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4ui(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI3ui(GLuint index, GLuint x, GLuint y, GLuint z)
 {
-    d_3_0_Core->VertexAttribI3ui(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3ui(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI2ui(GLuint index, GLuint x, GLuint y)
 {
-    d_3_0_Core->VertexAttribI2ui(index, x, y);
+    d_3_0_Core->f.VertexAttribI2ui(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI1ui(GLuint index, GLuint x)
 {
-    d_3_0_Core->VertexAttribI1ui(index, x);
+    d_3_0_Core->f.VertexAttribI1ui(index, x);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
-    d_3_0_Core->VertexAttribI4i(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4i(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI3i(GLuint index, GLint x, GLint y, GLint z)
 {
-    d_3_0_Core->VertexAttribI3i(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3i(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI2i(GLuint index, GLint x, GLint y)
 {
-    d_3_0_Core->VertexAttribI2i(index, x, y);
+    d_3_0_Core->f.VertexAttribI2i(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Compatibility::glVertexAttribI1i(GLuint index, GLint x)
 {
-    d_3_0_Core->VertexAttribI1i(index, x);
+    d_3_0_Core->f.VertexAttribI1i(index, x);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_4_3_core.cpp b/src/gui/opengl/qopenglfunctions_4_3_core.cpp
index 15bb6841dc..d3f988ba0d 100644
--- a/src/gui/opengl/qopenglfunctions_4_3_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_3_core.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -82,70 +88,54 @@ QOpenGLFunctions_4_3_Core::QOpenGLFunctions_4_3_Core()
 
 QOpenGLFunctions_4_3_Core::~QOpenGLFunctions_4_3_Core()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_3_3_Core && !d_3_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Core->context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        delete d_3_3_Core;
-    }
-    if (d_4_0_Core && !d_4_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_0_Core->context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        delete d_4_0_Core;
-    }
-    if (d_4_1_Core && !d_4_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_1_Core->context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        delete d_4_1_Core;
-    }
-    if (d_4_2_Core && !d_4_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_2_Core->context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        delete d_4_2_Core;
-    }
-    if (d_4_3_Core && !d_4_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_3_Core->context, QOpenGLFunctions_4_3_CoreBackend::versionStatus());
-        delete d_4_3_Core;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_3_3_Core)
+        d_3_3_Core->refs.deref();
+    Q_ASSERT(d_3_3_Core->refs.load());
+    if (d_4_0_Core)
+        d_4_0_Core->refs.deref();
+    Q_ASSERT(d_4_0_Core->refs.load());
+    if (d_4_1_Core)
+        d_4_1_Core->refs.deref();
+    Q_ASSERT(d_4_1_Core->refs.load());
+    if (d_4_2_Core)
+        d_4_2_Core->refs.deref();
+    Q_ASSERT(d_4_2_Core->refs.load());
+    if (d_4_3_Core)
+        d_4_3_Core->refs.deref();
+    Q_ASSERT(d_4_3_Core->refs.load());
 }
 
 bool QOpenGLFunctions_4_3_Core::initializeOpenGLFunctions()
@@ -164,130 +154,66 @@ bool QOpenGLFunctions_4_3_Core::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus(), d);
-        }
         d_3_3_Core = static_cast<QOpenGLFunctions_3_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus(), d);
-        }
         d_4_0_Core = static_cast<QOpenGLFunctions_4_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus(), d);
-        }
         d_4_1_Core = static_cast<QOpenGLFunctions_4_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus(), d);
-        }
         d_4_2_Core = static_cast<QOpenGLFunctions_4_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_3_CoreBackend::versionStatus(), d);
-        }
         d_4_3_Core = static_cast<QOpenGLFunctions_4_3_CoreBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_4_3_core.h b/src/gui/opengl/qopenglfunctions_4_3_core.h
index 3d1da0be2d..7e18292bb0 100644
--- a/src/gui/opengl/qopenglfunctions_4_3_core.h
+++ b/src/gui/opengl/qopenglfunctions_4_3_core.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -619,242 +626,242 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_4_3_Core::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Core::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_3_Core::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetIntegerv(GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetIntegerv(pname, params);
+    d_1_0_Core->f.GetIntegerv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetFloatv(GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetFloatv(pname, params);
+    d_1_0_Core->f.GetFloatv(pname, params);
 }
 
 inline GLenum QOpenGLFunctions_4_3_Core::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetDoublev(GLenum pname, GLdouble *params)
 {
-    d_1_0_Core->GetDoublev(pname, params);
+    d_1_0_Core->f.GetDoublev(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetBooleanv(GLenum pname, GLboolean *params)
 {
-    d_1_0_Core->GetBooleanv(pname, params);
+    d_1_0_Core->f.GetBooleanv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glReadBuffer(GLenum mode)
 {
-    d_1_0_Core->ReadBuffer(mode);
+    d_1_0_Core->f.ReadBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_4_3_Core::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_4_3_Core::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawBuffer(GLenum mode)
 {
-    d_1_0_Core->DrawBuffer(mode);
+    d_1_0_Core->f.DrawBuffer(mode);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
@@ -873,57 +880,57 @@ inline void QOpenGLFunctions_4_3_Core::glIndexub(GLubyte c)
 
 inline GLboolean QOpenGLFunctions_4_3_Core::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetPointerv(GLenum pname, GLvoid* *params)
@@ -935,1067 +942,1067 @@ inline void QOpenGLFunctions_4_3_Core::glGetPointerv(GLenum pname, GLvoid* *para
 
 inline void QOpenGLFunctions_4_3_Core::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_4_3_Core::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_4_3_Core::glGetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_4_3_Core::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_4_3_Core::glGetBufferPointerv(GLenum target, GLenum pname, GLvoid* *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Core::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline GLvoid* QOpenGLFunctions_4_3_Core::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBufferData(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Core::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Core::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glShaderSource(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Core::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Core::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid* *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_4_3_Core::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_4_3_Core::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, obj);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, obj);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_4_3_Core::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_4_3_Core::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_4_3_Core::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_4_3_Core::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline GLvoid* QOpenGLFunctions_4_3_Core::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_4_3_Core::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Core::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Core::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_3_Core::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_4_3_Core::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Core::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_4_3_Core::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_4_3_Core::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_4_3_Core::glSampleMaski(GLuint index, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(index, mask);
+    d_3_2_Core->f.SampleMaski(index, mask);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexImage3DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexImage2DMultisample(GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetInteger64v(GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetInteger64v(pname, params);
+    d_3_2_Core->f.GetInteger64v(pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_4_3_Core::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Core::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_4_3_Core::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 
 // OpenGL 3.3 core functions
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP4uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribP4ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP4ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribP3uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP3uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribP3ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP3ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribP2uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP2uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP2ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP1uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP1ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
@@ -2218,1005 +2225,1005 @@ inline void QOpenGLFunctions_4_3_Core::glVertexP2ui(GLenum type, GLuint value)
 
 inline void QOpenGLFunctions_4_3_Core::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
 {
-    d_3_3_Core->GetQueryObjectui64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
 {
-    d_3_3_Core->GetQueryObjecti64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjecti64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glQueryCounter(GLuint id, GLenum target)
 {
-    d_3_3_Core->QueryCounter(id, target);
+    d_3_3_Core->f.QueryCounter(id, target);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
 {
-    d_3_3_Core->GetSamplerParameterIuiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIuiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
 {
-    d_3_3_Core->GetSamplerParameterfv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterfv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameterIiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameteriv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameteriv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
 {
-    d_3_3_Core->SamplerParameterIuiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIuiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameterIiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
 {
-    d_3_3_Core->SamplerParameterfv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterfv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-    d_3_3_Core->SamplerParameterf(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterf(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameteriv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteriv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-    d_3_3_Core->SamplerParameteri(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteri(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindSampler(GLuint unit, GLuint sampler)
 {
-    d_3_3_Core->BindSampler(unit, sampler);
+    d_3_3_Core->f.BindSampler(unit, sampler);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Core::glIsSampler(GLuint sampler)
 {
-    return d_3_3_Core->IsSampler(sampler);
+    return d_3_3_Core->f.IsSampler(sampler);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDeleteSamplers(GLsizei count, const GLuint *samplers)
 {
-    d_3_3_Core->DeleteSamplers(count, samplers);
+    d_3_3_Core->f.DeleteSamplers(count, samplers);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGenSamplers(GLsizei count, GLuint *samplers)
 {
-    d_3_3_Core->GenSamplers(count, samplers);
+    d_3_3_Core->f.GenSamplers(count, samplers);
 }
 
 inline GLint QOpenGLFunctions_4_3_Core::glGetFragDataIndex(GLuint program, const GLchar *name)
 {
-    return d_3_3_Core->GetFragDataIndex(program, name);
+    return d_3_3_Core->f.GetFragDataIndex(program, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
-    d_3_3_Core->BindFragDataLocationIndexed(program, colorNumber, index, name);
+    d_3_3_Core->f.BindFragDataLocationIndexed(program, colorNumber, index, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-    d_3_3_Core->VertexAttribDivisor(index, divisor);
+    d_3_3_Core->f.VertexAttribDivisor(index, divisor);
 }
 
 
 // OpenGL 4.0 core functions
 inline void QOpenGLFunctions_4_3_Core::glGetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params)
 {
-    d_4_0_Core->GetQueryIndexediv(target, index, pname, params);
+    d_4_0_Core->f.GetQueryIndexediv(target, index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glEndQueryIndexed(GLenum target, GLuint index)
 {
-    d_4_0_Core->EndQueryIndexed(target, index);
+    d_4_0_Core->f.EndQueryIndexed(target, index);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBeginQueryIndexed(GLenum target, GLuint index, GLuint id)
 {
-    d_4_0_Core->BeginQueryIndexed(target, index, id);
+    d_4_0_Core->f.BeginQueryIndexed(target, index, id);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawTransformFeedbackStream(GLenum mode, GLuint id, GLuint stream)
 {
-    d_4_0_Core->DrawTransformFeedbackStream(mode, id, stream);
+    d_4_0_Core->f.DrawTransformFeedbackStream(mode, id, stream);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawTransformFeedback(GLenum mode, GLuint id)
 {
-    d_4_0_Core->DrawTransformFeedback(mode, id);
+    d_4_0_Core->f.DrawTransformFeedback(mode, id);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glResumeTransformFeedback()
 {
-    d_4_0_Core->ResumeTransformFeedback();
+    d_4_0_Core->f.ResumeTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_3_Core::glPauseTransformFeedback()
 {
-    d_4_0_Core->PauseTransformFeedback();
+    d_4_0_Core->f.PauseTransformFeedback();
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Core::glIsTransformFeedback(GLuint id)
 {
-    return d_4_0_Core->IsTransformFeedback(id);
+    return d_4_0_Core->f.IsTransformFeedback(id);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGenTransformFeedbacks(GLsizei n, GLuint *ids)
 {
-    d_4_0_Core->GenTransformFeedbacks(n, ids);
+    d_4_0_Core->f.GenTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
 {
-    d_4_0_Core->DeleteTransformFeedbacks(n, ids);
+    d_4_0_Core->f.DeleteTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindTransformFeedback(GLenum target, GLuint id)
 {
-    d_4_0_Core->BindTransformFeedback(target, id);
+    d_4_0_Core->f.BindTransformFeedback(target, id);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glPatchParameterfv(GLenum pname, const GLfloat *values)
 {
-    d_4_0_Core->PatchParameterfv(pname, values);
+    d_4_0_Core->f.PatchParameterfv(pname, values);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glPatchParameteri(GLenum pname, GLint value)
 {
-    d_4_0_Core->PatchParameteri(pname, value);
+    d_4_0_Core->f.PatchParameteri(pname, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetProgramStageiv(GLuint program, GLenum shadertype, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetProgramStageiv(program, shadertype, pname, values);
+    d_4_0_Core->f.GetProgramStageiv(program, shadertype, pname, values);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetUniformSubroutineuiv(GLenum shadertype, GLint location, GLuint *params)
 {
-    d_4_0_Core->GetUniformSubroutineuiv(shadertype, location, params);
+    d_4_0_Core->f.GetUniformSubroutineuiv(shadertype, location, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformSubroutinesuiv(GLenum shadertype, GLsizei count, const GLuint *indices)
 {
-    d_4_0_Core->UniformSubroutinesuiv(shadertype, count, indices);
+    d_4_0_Core->f.UniformSubroutinesuiv(shadertype, count, indices);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetActiveSubroutineName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetActiveSubroutineUniformName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
+    d_4_0_Core->f.GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
 }
 
 inline GLuint QOpenGLFunctions_4_3_Core::glGetSubroutineIndex(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineIndex(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineIndex(program, shadertype, name);
 }
 
 inline GLint QOpenGLFunctions_4_3_Core::glGetSubroutineUniformLocation(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineUniformLocation(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineUniformLocation(program, shadertype, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetUniformdv(GLuint program, GLint location, GLdouble *params)
 {
-    d_4_0_Core->GetUniformdv(program, location, params);
+    d_4_0_Core->f.GetUniformdv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix4x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix4x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix3x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix3x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix2x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix2x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniformMatrix2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform4dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform4dv(location, count, value);
+    d_4_0_Core->f.Uniform4dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform3dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform3dv(location, count, value);
+    d_4_0_Core->f.Uniform3dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform2dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform2dv(location, count, value);
+    d_4_0_Core->f.Uniform2dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform1dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform1dv(location, count, value);
+    d_4_0_Core->f.Uniform1dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform4d(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_0_Core->Uniform4d(location, x, y, z, w);
+    d_4_0_Core->f.Uniform4d(location, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform3d(GLint location, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_0_Core->Uniform3d(location, x, y, z);
+    d_4_0_Core->f.Uniform3d(location, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform2d(GLint location, GLdouble x, GLdouble y)
 {
-    d_4_0_Core->Uniform2d(location, x, y);
+    d_4_0_Core->f.Uniform2d(location, x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUniform1d(GLint location, GLdouble x)
 {
-    d_4_0_Core->Uniform1d(location, x);
+    d_4_0_Core->f.Uniform1d(location, x);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawElementsIndirect(GLenum mode, GLenum type, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawElementsIndirect(mode, type, indirect);
+    d_4_0_Core->f.DrawElementsIndirect(mode, type, indirect);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawArraysIndirect(GLenum mode, const GLvoid *indirect)
 {
-    d_4_0_Core->DrawArraysIndirect(mode, indirect);
+    d_4_0_Core->f.DrawArraysIndirect(mode, indirect);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
 {
-    d_4_0_Core->BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+    d_4_0_Core->f.BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBlendFunci(GLuint buf, GLenum src, GLenum dst)
 {
-    d_4_0_Core->BlendFunci(buf, src, dst);
+    d_4_0_Core->f.BlendFunci(buf, src, dst);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
 {
-    d_4_0_Core->BlendEquationSeparatei(buf, modeRGB, modeAlpha);
+    d_4_0_Core->f.BlendEquationSeparatei(buf, modeRGB, modeAlpha);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBlendEquationi(GLuint buf, GLenum mode)
 {
-    d_4_0_Core->BlendEquationi(buf, mode);
+    d_4_0_Core->f.BlendEquationi(buf, mode);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glMinSampleShading(GLfloat value)
 {
-    d_4_0_Core->MinSampleShading(value);
+    d_4_0_Core->f.MinSampleShading(value);
 }
 
 
 // OpenGL 4.1 core functions
 inline void QOpenGLFunctions_4_3_Core::glGetDoublei_v(GLenum target, GLuint index, GLdouble *data)
 {
-    d_4_1_Core->GetDoublei_v(target, index, data);
+    d_4_1_Core->f.GetDoublei_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetFloati_v(GLenum target, GLuint index, GLfloat *data)
 {
-    d_4_1_Core->GetFloati_v(target, index, data);
+    d_4_1_Core->f.GetFloati_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDepthRangeIndexed(GLuint index, GLdouble n, GLdouble f)
 {
-    d_4_1_Core->DepthRangeIndexed(index, n, f);
+    d_4_1_Core->f.DepthRangeIndexed(index, n, f);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDepthRangeArrayv(GLuint first, GLsizei count, const GLdouble *v)
 {
-    d_4_1_Core->DepthRangeArrayv(first, count, v);
+    d_4_1_Core->f.DepthRangeArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glScissorIndexedv(GLuint index, const GLint *v)
 {
-    d_4_1_Core->ScissorIndexedv(index, v);
+    d_4_1_Core->f.ScissorIndexedv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glScissorIndexed(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height)
 {
-    d_4_1_Core->ScissorIndexed(index, left, bottom, width, height);
+    d_4_1_Core->f.ScissorIndexed(index, left, bottom, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glScissorArrayv(GLuint first, GLsizei count, const GLint *v)
 {
-    d_4_1_Core->ScissorArrayv(first, count, v);
+    d_4_1_Core->f.ScissorArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glViewportIndexedfv(GLuint index, const GLfloat *v)
 {
-    d_4_1_Core->ViewportIndexedfv(index, v);
+    d_4_1_Core->f.ViewportIndexedfv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glViewportIndexedf(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h)
 {
-    d_4_1_Core->ViewportIndexedf(index, x, y, w, h);
+    d_4_1_Core->f.ViewportIndexedf(index, x, y, w, h);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glViewportArrayv(GLuint first, GLsizei count, const GLfloat *v)
 {
-    d_4_1_Core->ViewportArrayv(first, count, v);
+    d_4_1_Core->f.ViewportArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetVertexAttribLdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_4_1_Core->GetVertexAttribLdv(index, pname, params);
+    d_4_1_Core->f.GetVertexAttribLdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribLPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
-    d_4_1_Core->VertexAttribLPointer(index, size, type, stride, pointer);
+    d_4_1_Core->f.VertexAttribLPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribL4dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL4dv(index, v);
+    d_4_1_Core->f.VertexAttribL4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribL3dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL3dv(index, v);
+    d_4_1_Core->f.VertexAttribL3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribL2dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL2dv(index, v);
+    d_4_1_Core->f.VertexAttribL2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribL1dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL1dv(index, v);
+    d_4_1_Core->f.VertexAttribL1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribL4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_1_Core->VertexAttribL4d(index, x, y, z, w);
+    d_4_1_Core->f.VertexAttribL4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribL3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_1_Core->VertexAttribL3d(index, x, y, z);
+    d_4_1_Core->f.VertexAttribL3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribL2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_4_1_Core->VertexAttribL2d(index, x, y);
+    d_4_1_Core->f.VertexAttribL2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribL1d(GLuint index, GLdouble x)
 {
-    d_4_1_Core->VertexAttribL1d(index, x);
+    d_4_1_Core->f.VertexAttribL1d(index, x);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetProgramPipelineInfoLog(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_4_1_Core->GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
+    d_4_1_Core->f.GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glValidateProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->ValidateProgramPipeline(pipeline);
+    d_4_1_Core->f.ValidateProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix4x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix3x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix4x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix2x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix3x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix2x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix4x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix3x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix4x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix2x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix3x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix2x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniformMatrix2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform4uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform4uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_4_1_Core->ProgramUniform4ui(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4ui(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform4dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform4dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform4d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3)
 {
-    d_4_1_Core->ProgramUniform4d(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4d(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform4fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform4fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_4_1_Core->ProgramUniform4f(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4f(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform4iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform4iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_4_1_Core->ProgramUniform4i(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4i(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform3uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform3uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_4_1_Core->ProgramUniform3ui(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3ui(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform3dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform3dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform3d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2)
 {
-    d_4_1_Core->ProgramUniform3d(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3d(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform3fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform3fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_4_1_Core->ProgramUniform3f(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3f(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform3iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform3iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_4_1_Core->ProgramUniform3i(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3i(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform2uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform2uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
 {
-    d_4_1_Core->ProgramUniform2ui(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2ui(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform2dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform2dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform2d(GLuint program, GLint location, GLdouble v0, GLdouble v1)
 {
-    d_4_1_Core->ProgramUniform2d(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2d(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform2fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform2fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1)
 {
-    d_4_1_Core->ProgramUniform2f(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2f(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform2iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform2iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
 {
-    d_4_1_Core->ProgramUniform2i(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2i(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform1uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform1uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform1ui(GLuint program, GLint location, GLuint v0)
 {
-    d_4_1_Core->ProgramUniform1ui(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1ui(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform1dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform1dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform1d(GLuint program, GLint location, GLdouble v0)
 {
-    d_4_1_Core->ProgramUniform1d(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1d(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform1fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform1fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform1f(GLuint program, GLint location, GLfloat v0)
 {
-    d_4_1_Core->ProgramUniform1f(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1f(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform1iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform1iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramUniform1i(GLuint program, GLint location, GLint v0)
 {
-    d_4_1_Core->ProgramUniform1i(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1i(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
 {
-    d_4_1_Core->GetProgramPipelineiv(pipeline, pname, params);
+    d_4_1_Core->f.GetProgramPipelineiv(pipeline, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_3_Core::glIsProgramPipeline(GLuint pipeline)
 {
-    return d_4_1_Core->IsProgramPipeline(pipeline);
+    return d_4_1_Core->f.IsProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGenProgramPipelines(GLsizei n, GLuint *pipelines)
 {
-    d_4_1_Core->GenProgramPipelines(n, pipelines);
+    d_4_1_Core->f.GenProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
 {
-    d_4_1_Core->DeleteProgramPipelines(n, pipelines);
+    d_4_1_Core->f.DeleteProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->BindProgramPipeline(pipeline);
+    d_4_1_Core->f.BindProgramPipeline(pipeline);
 }
 
 inline GLuint QOpenGLFunctions_4_3_Core::glCreateShaderProgramv(GLenum type, GLsizei count, const GLchar* const *strings)
 {
-    return d_4_1_Core->CreateShaderProgramv(type, count, strings);
+    return d_4_1_Core->f.CreateShaderProgramv(type, count, strings);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glActiveShaderProgram(GLuint pipeline, GLuint program)
 {
-    d_4_1_Core->ActiveShaderProgram(pipeline, program);
+    d_4_1_Core->f.ActiveShaderProgram(pipeline, program);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glUseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
 {
-    d_4_1_Core->UseProgramStages(pipeline, stages, program);
+    d_4_1_Core->f.UseProgramStages(pipeline, stages, program);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramParameteri(GLuint program, GLenum pname, GLint value)
 {
-    d_4_1_Core->ProgramParameteri(program, pname, value);
+    d_4_1_Core->f.ProgramParameteri(program, pname, value);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glProgramBinary(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length)
 {
-    d_4_1_Core->ProgramBinary(program, binaryFormat, binary, length);
+    d_4_1_Core->f.ProgramBinary(program, binaryFormat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary)
 {
-    d_4_1_Core->GetProgramBinary(program, bufSize, length, binaryFormat, binary);
+    d_4_1_Core->f.GetProgramBinary(program, bufSize, length, binaryFormat, binary);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glClearDepthf(GLfloat dd)
 {
-    d_4_1_Core->ClearDepthf(dd);
+    d_4_1_Core->f.ClearDepthf(dd);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDepthRangef(GLfloat n, GLfloat f)
 {
-    d_4_1_Core->DepthRangef(n, f);
+    d_4_1_Core->f.DepthRangef(n, f);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)
 {
-    d_4_1_Core->GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+    d_4_1_Core->f.GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glShaderBinary(GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length)
 {
-    d_4_1_Core->ShaderBinary(count, shaders, binaryformat, binary, length);
+    d_4_1_Core->f.ShaderBinary(count, shaders, binaryformat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glReleaseShaderCompiler()
 {
-    d_4_1_Core->ReleaseShaderCompiler();
+    d_4_1_Core->f.ReleaseShaderCompiler();
 }
 
 
 // OpenGL 4.2 core functions
 inline void QOpenGLFunctions_4_3_Core::glTexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_2_Core->TexStorage3D(target, levels, internalformat, width, height, depth);
+    d_4_2_Core->f.TexStorage3D(target, levels, internalformat, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_4_2_Core->TexStorage2D(target, levels, internalformat, width, height);
+    d_4_2_Core->f.TexStorage2D(target, levels, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)
 {
-    d_4_2_Core->TexStorage1D(target, levels, internalformat, width);
+    d_4_2_Core->f.TexStorage1D(target, levels, internalformat, width);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glMemoryBarrier(GLbitfield barriers)
 {
-    d_4_2_Core->MemoryBarrier(barriers);
+    d_4_2_Core->f.MemoryBarrier(barriers);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindImageTexture(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format)
 {
-    d_4_2_Core->BindImageTexture(unit, texture, level, layered, layer, access, format);
+    d_4_2_Core->f.BindImageTexture(unit, texture, level, layered, layer, access, format);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetActiveAtomicCounterBufferiv(GLuint program, GLuint bufferIndex, GLenum pname, GLint *params)
 {
-    d_4_2_Core->GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
+    d_4_2_Core->f.GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params)
 {
-    d_4_2_Core->GetInternalformativ(target, internalformat, pname, bufSize, params);
+    d_4_2_Core->f.GetInternalformativ(target, internalformat, pname, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawTransformFeedbackStreamInstanced(GLenum mode, GLuint id, GLuint stream, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawTransformFeedbackInstanced(GLenum mode, GLuint id, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackInstanced(mode, id, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackInstanced(mode, id, instancecount);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawElementsInstancedBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDrawArraysInstancedBaseInstance(GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
+    d_4_2_Core->f.DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
 }
 
 
 // OpenGL 4.3 core functions
 inline void QOpenGLFunctions_4_3_Core::glTexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_4_3_Core->TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_4_3_Core->f.TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexStorage2DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_4_3_Core->TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_4_3_Core->f.TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTexBufferRange(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_4_3_Core->TexBufferRange(target, internalformat, buffer, offset, size);
+    d_4_3_Core->f.TexBufferRange(target, internalformat, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glShaderStorageBlockBinding(GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding)
 {
-    d_4_3_Core->ShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
+    d_4_3_Core->f.ShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
 }
 
 inline GLint QOpenGLFunctions_4_3_Core::glGetProgramResourceLocationIndex(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceLocationIndex(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceLocationIndex(program, programInterface, name);
 }
 
 inline GLint QOpenGLFunctions_4_3_Core::glGetProgramResourceLocation(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceLocation(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceLocation(program, programInterface, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetProgramResourceiv(GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params)
 {
-    d_4_3_Core->GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
+    d_4_3_Core->f.GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetProgramResourceName(GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name)
 {
-    d_4_3_Core->GetProgramResourceName(program, programInterface, index, bufSize, length, name);
+    d_4_3_Core->f.GetProgramResourceName(program, programInterface, index, bufSize, length, name);
 }
 
 inline GLuint QOpenGLFunctions_4_3_Core::glGetProgramResourceIndex(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceIndex(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceIndex(program, programInterface, name);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetProgramInterfaceiv(GLuint program, GLenum programInterface, GLenum pname, GLint *params)
 {
-    d_4_3_Core->GetProgramInterfaceiv(program, programInterface, pname, params);
+    d_4_3_Core->f.GetProgramInterfaceiv(program, programInterface, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glMultiDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride)
 {
-    d_4_3_Core->MultiDrawElementsIndirect(mode, type, indirect, drawcount, stride);
+    d_4_3_Core->f.MultiDrawElementsIndirect(mode, type, indirect, drawcount, stride);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glMultiDrawArraysIndirect(GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride)
 {
-    d_4_3_Core->MultiDrawArraysIndirect(mode, indirect, drawcount, stride);
+    d_4_3_Core->f.MultiDrawArraysIndirect(mode, indirect, drawcount, stride);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_4_3_Core->InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
+    d_4_3_Core->f.InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glInvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments)
 {
-    d_4_3_Core->InvalidateFramebuffer(target, numAttachments, attachments);
+    d_4_3_Core->f.InvalidateFramebuffer(target, numAttachments, attachments);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glInvalidateBufferData(GLuint buffer)
 {
-    d_4_3_Core->InvalidateBufferData(buffer);
+    d_4_3_Core->f.InvalidateBufferData(buffer);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glInvalidateBufferSubData(GLuint buffer, GLintptr offset, GLsizeiptr length)
 {
-    d_4_3_Core->InvalidateBufferSubData(buffer, offset, length);
+    d_4_3_Core->f.InvalidateBufferSubData(buffer, offset, length);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glInvalidateTexImage(GLuint texture, GLint level)
 {
-    d_4_3_Core->InvalidateTexImage(texture, level);
+    d_4_3_Core->f.InvalidateTexImage(texture, level);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glInvalidateTexSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_3_Core->InvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
+    d_4_3_Core->f.InvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetInternalformati64v(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params)
 {
-    d_4_3_Core->GetInternalformati64v(target, internalformat, pname, bufSize, params);
+    d_4_3_Core->f.GetInternalformati64v(target, internalformat, pname, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glGetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_4_3_Core->GetFramebufferParameteriv(target, pname, params);
+    d_4_3_Core->f.GetFramebufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glFramebufferParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_4_3_Core->FramebufferParameteri(target, pname, param);
+    d_4_3_Core->f.FramebufferParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexBindingDivisor(GLuint bindingindex, GLuint divisor)
 {
-    d_4_3_Core->VertexBindingDivisor(bindingindex, divisor);
+    d_4_3_Core->f.VertexBindingDivisor(bindingindex, divisor);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribBinding(GLuint attribindex, GLuint bindingindex)
 {
-    d_4_3_Core->VertexAttribBinding(attribindex, bindingindex);
+    d_4_3_Core->f.VertexAttribBinding(attribindex, bindingindex);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribLFormat(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribLFormat(attribindex, size, type, relativeoffset);
+    d_4_3_Core->f.VertexAttribLFormat(attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribIFormat(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribIFormat(attribindex, size, type, relativeoffset);
+    d_4_3_Core->f.VertexAttribIFormat(attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glVertexAttribFormat(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
+    d_4_3_Core->f.VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glBindVertexBuffer(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride)
 {
-    d_4_3_Core->BindVertexBuffer(bindingindex, buffer, offset, stride);
+    d_4_3_Core->f.BindVertexBuffer(bindingindex, buffer, offset, stride);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glTextureView(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers)
 {
-    d_4_3_Core->TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers);
+    d_4_3_Core->f.TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glCopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth)
 {
-    d_4_3_Core->CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth);
+    d_4_3_Core->f.CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDispatchComputeIndirect(GLintptr indirect)
 {
-    d_4_3_Core->DispatchComputeIndirect(indirect);
+    d_4_3_Core->f.DispatchComputeIndirect(indirect);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glDispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z)
 {
-    d_4_3_Core->DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
+    d_4_3_Core->f.DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glClearBufferSubData(GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data)
 {
-    d_4_3_Core->ClearBufferSubData(target, internalformat, offset, size, format, type, data);
+    d_4_3_Core->f.ClearBufferSubData(target, internalformat, offset, size, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_3_Core::glClearBufferData(GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data)
 {
-    d_4_3_Core->ClearBufferData(target, internalformat, format, type, data);
+    d_4_3_Core->f.ClearBufferData(target, internalformat, format, type, data);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_4_4_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_4_compatibility.cpp
index d56a0d8de1..8cbb94c1a1 100644
--- a/src/gui/opengl/qopenglfunctions_4_4_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_4_compatibility.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -89,98 +95,75 @@ QOpenGLFunctions_4_4_Compatibility::QOpenGLFunctions_4_4_Compatibility()
 
 QOpenGLFunctions_4_4_Compatibility::~QOpenGLFunctions_4_4_Compatibility()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_3_3_Core && !d_3_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Core->context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        delete d_3_3_Core;
-    }
-    if (d_4_0_Core && !d_4_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_0_Core->context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        delete d_4_0_Core;
-    }
-    if (d_4_1_Core && !d_4_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_1_Core->context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        delete d_4_1_Core;
-    }
-    if (d_4_2_Core && !d_4_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_2_Core->context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        delete d_4_2_Core;
-    }
-    if (d_4_3_Core && !d_4_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_3_Core->context, QOpenGLFunctions_4_3_CoreBackend::versionStatus());
-        delete d_4_3_Core;
-    }
-    if (d_4_4_Core && !d_4_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_4_Core->context, QOpenGLFunctions_4_4_CoreBackend::versionStatus());
-        delete d_4_4_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
-    if (d_1_3_Deprecated && !d_1_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Deprecated->context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        delete d_1_3_Deprecated;
-    }
-    if (d_1_4_Deprecated && !d_1_4_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Deprecated->context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        delete d_1_4_Deprecated;
-    }
-    if (d_3_3_Deprecated && !d_3_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Deprecated->context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus());
-        delete d_3_3_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_3_3_Core)
+        d_3_3_Core->refs.deref();
+    Q_ASSERT(d_3_3_Core->refs.load());
+    if (d_4_0_Core)
+        d_4_0_Core->refs.deref();
+    Q_ASSERT(d_4_0_Core->refs.load());
+    if (d_4_1_Core)
+        d_4_1_Core->refs.deref();
+    Q_ASSERT(d_4_1_Core->refs.load());
+    if (d_4_2_Core)
+        d_4_2_Core->refs.deref();
+    Q_ASSERT(d_4_2_Core->refs.load());
+    if (d_4_3_Core)
+        d_4_3_Core->refs.deref();
+    Q_ASSERT(d_4_3_Core->refs.load());
+    if (d_4_4_Core)
+        d_4_4_Core->refs.deref();
+    Q_ASSERT(d_4_4_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
+    if (d_1_3_Deprecated)
+        d_1_3_Deprecated->refs.deref();
+    Q_ASSERT(d_1_3_Deprecated->refs.load());
+    if (d_1_4_Deprecated)
+        d_1_4_Deprecated->refs.deref();
+    Q_ASSERT(d_1_4_Deprecated->refs.load());
+    if (d_3_3_Deprecated)
+        d_3_3_Deprecated->refs.deref();
+    Q_ASSERT(d_3_3_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_4_4_Compatibility::initializeOpenGLFunctions()
@@ -199,186 +182,94 @@ bool QOpenGLFunctions_4_4_Compatibility::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus(), d);
-        }
         d_3_3_Core = static_cast<QOpenGLFunctions_3_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus(), d);
-        }
         d_4_0_Core = static_cast<QOpenGLFunctions_4_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus(), d);
-        }
         d_4_1_Core = static_cast<QOpenGLFunctions_4_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus(), d);
-        }
         d_4_2_Core = static_cast<QOpenGLFunctions_4_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_3_CoreBackend::versionStatus(), d);
-        }
         d_4_3_Core = static_cast<QOpenGLFunctions_4_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_4_CoreBackend::versionStatus(), d);
-        }
         d_4_4_Core = static_cast<QOpenGLFunctions_4_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_3_Deprecated = static_cast<QOpenGLFunctions_1_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_4_Deprecated = static_cast<QOpenGLFunctions_1_4_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_3_3_Deprecated = static_cast<QOpenGLFunctions_3_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_4_4_compatibility.h b/src/gui/opengl/qopenglfunctions_4_4_compatibility.h
index 3e5204eaa2..d369ff27ff 100644
--- a/src/gui/opengl/qopenglfunctions_4_4_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_4_4_compatibility.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtWidgets module of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -1116,4664 +1123,4664 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, void *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_4_Compatibility::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetIntegerv(GLenum pname, GLint *data)
 {
-    d_1_0_Core->GetIntegerv(pname, data);
+    d_1_0_Core->f.GetIntegerv(pname, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetFloatv(GLenum pname, GLfloat *data)
 {
-    d_1_0_Core->GetFloatv(pname, data);
+    d_1_0_Core->f.GetFloatv(pname, data);
 }
 
 inline GLenum QOpenGLFunctions_4_4_Compatibility::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetDoublev(GLenum pname, GLdouble *data)
 {
-    d_1_0_Core->GetDoublev(pname, data);
+    d_1_0_Core->f.GetDoublev(pname, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetBooleanv(GLenum pname, GLboolean *data)
 {
-    d_1_0_Core->GetBooleanv(pname, data);
+    d_1_0_Core->f.GetBooleanv(pname, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glReadBuffer(GLenum src)
 {
-    d_1_0_Core->ReadBuffer(src);
+    d_1_0_Core->f.ReadBuffer(src);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawBuffer(GLenum buf)
 {
-    d_1_0_Core->DrawBuffer(buf);
+    d_1_0_Core->f.DrawBuffer(buf);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawElements(GLenum mode, GLsizei count, GLenum type, const void *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glGetCompressedTexImage(GLenum target, GLint level, void *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glGetBufferPointerv(GLenum target, GLenum pname, void * *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline void * QOpenGLFunctions_4_4_Compatibility::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, void *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4usv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4usv(index, v);
+    d_2_0_Core->f.VertexAttrib4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4uiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4uiv(index, v);
+    d_2_0_Core->f.VertexAttrib4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4ubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4ubv(index, v);
+    d_2_0_Core->f.VertexAttrib4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4sv(index, v);
+    d_2_0_Core->f.VertexAttrib4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_2_0_Core->VertexAttrib4s(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4s(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4iv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4iv(index, v);
+    d_2_0_Core->f.VertexAttrib4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib4fv(index, v);
+    d_2_0_Core->f.VertexAttrib4fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_2_0_Core->VertexAttrib4f(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4f(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib4dv(index, v);
+    d_2_0_Core->f.VertexAttrib4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_2_0_Core->VertexAttrib4d(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4bv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4bv(index, v);
+    d_2_0_Core->f.VertexAttrib4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4Nusv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4Nusv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nusv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4Nuiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4Nuiv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nuiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4Nubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nubv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-    d_2_0_Core->VertexAttrib4Nub(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4Nub(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4Nsv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4Nsv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nsv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4Niv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4Niv(index, v);
+    d_2_0_Core->f.VertexAttrib4Niv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib4Nbv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nbv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nbv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib3sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib3sv(index, v);
+    d_2_0_Core->f.VertexAttrib3sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-    d_2_0_Core->VertexAttrib3s(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3s(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib3fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib3fv(index, v);
+    d_2_0_Core->f.VertexAttrib3fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_2_0_Core->VertexAttrib3f(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3f(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib3dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib3dv(index, v);
+    d_2_0_Core->f.VertexAttrib3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_2_0_Core->VertexAttrib3d(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib2sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib2sv(index, v);
+    d_2_0_Core->f.VertexAttrib2sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib2s(GLuint index, GLshort x, GLshort y)
 {
-    d_2_0_Core->VertexAttrib2s(index, x, y);
+    d_2_0_Core->f.VertexAttrib2s(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib2fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib2fv(index, v);
+    d_2_0_Core->f.VertexAttrib2fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    d_2_0_Core->VertexAttrib2f(index, x, y);
+    d_2_0_Core->f.VertexAttrib2f(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib2dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib2dv(index, v);
+    d_2_0_Core->f.VertexAttrib2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_2_0_Core->VertexAttrib2d(index, x, y);
+    d_2_0_Core->f.VertexAttrib2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib1sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib1sv(index, v);
+    d_2_0_Core->f.VertexAttrib1sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib1s(GLuint index, GLshort x)
 {
-    d_2_0_Core->VertexAttrib1s(index, x);
+    d_2_0_Core->f.VertexAttrib1s(index, x);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib1fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib1fv(index, v);
+    d_2_0_Core->f.VertexAttrib1fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    d_2_0_Core->VertexAttrib1f(index, x);
+    d_2_0_Core->f.VertexAttrib1f(index, x);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib1dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib1dv(index, v);
+    d_2_0_Core->f.VertexAttrib1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttrib1d(GLuint index, GLdouble x)
 {
-    d_2_0_Core->VertexAttrib1d(index, x);
+    d_2_0_Core->f.VertexAttrib1d(index, x);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glShaderSource(GLuint shader, GLsizei count, const GLchar *const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetVertexAttribPointerv(GLuint index, GLenum pname, void * *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_4_4_Compatibility::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_4_4_Compatibility::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, shaders);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, shaders);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Compatibility::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Compatibility::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline void * QOpenGLFunctions_4_4_Compatibility::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_4_4_Compatibility::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_4_Compatibility::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_4_4_Compatibility::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI4usv(GLuint index, const GLushort *v)
 {
-    d_3_0_Core->VertexAttribI4usv(index, v);
+    d_3_0_Core->f.VertexAttribI4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI4ubv(GLuint index, const GLubyte *v)
 {
-    d_3_0_Core->VertexAttribI4ubv(index, v);
+    d_3_0_Core->f.VertexAttribI4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI4sv(GLuint index, const GLshort *v)
 {
-    d_3_0_Core->VertexAttribI4sv(index, v);
+    d_3_0_Core->f.VertexAttribI4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI4bv(GLuint index, const GLbyte *v)
 {
-    d_3_0_Core->VertexAttribI4bv(index, v);
+    d_3_0_Core->f.VertexAttribI4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI4uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI4uiv(index, v);
+    d_3_0_Core->f.VertexAttribI4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI3uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI3uiv(index, v);
+    d_3_0_Core->f.VertexAttribI3uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI2uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI2uiv(index, v);
+    d_3_0_Core->f.VertexAttribI2uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI1uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI1uiv(index, v);
+    d_3_0_Core->f.VertexAttribI1uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI4iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI4iv(index, v);
+    d_3_0_Core->f.VertexAttribI4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI3iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI3iv(index, v);
+    d_3_0_Core->f.VertexAttribI3iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI2iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI2iv(index, v);
+    d_3_0_Core->f.VertexAttribI2iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI1iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI1iv(index, v);
+    d_3_0_Core->f.VertexAttribI1iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
-    d_3_0_Core->VertexAttribI4ui(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4ui(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI3ui(GLuint index, GLuint x, GLuint y, GLuint z)
 {
-    d_3_0_Core->VertexAttribI3ui(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3ui(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI2ui(GLuint index, GLuint x, GLuint y)
 {
-    d_3_0_Core->VertexAttribI2ui(index, x, y);
+    d_3_0_Core->f.VertexAttribI2ui(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI1ui(GLuint index, GLuint x)
 {
-    d_3_0_Core->VertexAttribI1ui(index, x);
+    d_3_0_Core->f.VertexAttribI1ui(index, x);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
-    d_3_0_Core->VertexAttribI4i(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4i(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI3i(GLuint index, GLint x, GLint y, GLint z)
 {
-    d_3_0_Core->VertexAttribI3i(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3i(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI2i(GLuint index, GLint x, GLint y)
 {
-    d_3_0_Core->VertexAttribI2i(index, x, y);
+    d_3_0_Core->f.VertexAttribI2i(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribI1i(GLuint index, GLint x)
 {
-    d_3_0_Core->VertexAttribI1i(index, x);
+    d_3_0_Core->f.VertexAttribI1i(index, x);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar *const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Compatibility::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glSampleMaski(GLuint maskNumber, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(maskNumber, mask);
+    d_3_2_Core->f.SampleMaski(maskNumber, mask);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexImage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexImage2DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetInteger64v(GLenum pname, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64v(pname, data);
+    d_3_2_Core->f.GetInteger64v(pname, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_4_4_Compatibility::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_4_4_Compatibility::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 
 // OpenGL 3.3 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP4uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribP4ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP4ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribP3uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP3uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribP3ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP3ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribP2uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP2uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP2ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP1uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP1ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-    d_3_3_Core->VertexAttribDivisor(index, divisor);
+    d_3_3_Core->f.VertexAttribDivisor(index, divisor);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
 {
-    d_3_3_Core->GetQueryObjectui64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
 {
-    d_3_3_Core->GetQueryObjecti64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjecti64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glQueryCounter(GLuint id, GLenum target)
 {
-    d_3_3_Core->QueryCounter(id, target);
+    d_3_3_Core->f.QueryCounter(id, target);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
 {
-    d_3_3_Core->GetSamplerParameterIuiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIuiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
 {
-    d_3_3_Core->GetSamplerParameterfv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterfv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameterIiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameteriv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameteriv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
 {
-    d_3_3_Core->SamplerParameterIuiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIuiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameterIiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
 {
-    d_3_3_Core->SamplerParameterfv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterfv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-    d_3_3_Core->SamplerParameterf(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterf(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameteriv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteriv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-    d_3_3_Core->SamplerParameteri(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteri(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindSampler(GLuint unit, GLuint sampler)
 {
-    d_3_3_Core->BindSampler(unit, sampler);
+    d_3_3_Core->f.BindSampler(unit, sampler);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsSampler(GLuint sampler)
 {
-    return d_3_3_Core->IsSampler(sampler);
+    return d_3_3_Core->f.IsSampler(sampler);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDeleteSamplers(GLsizei count, const GLuint *samplers)
 {
-    d_3_3_Core->DeleteSamplers(count, samplers);
+    d_3_3_Core->f.DeleteSamplers(count, samplers);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGenSamplers(GLsizei count, GLuint *samplers)
 {
-    d_3_3_Core->GenSamplers(count, samplers);
+    d_3_3_Core->f.GenSamplers(count, samplers);
 }
 
 inline GLint QOpenGLFunctions_4_4_Compatibility::glGetFragDataIndex(GLuint program, const GLchar *name)
 {
-    return d_3_3_Core->GetFragDataIndex(program, name);
+    return d_3_3_Core->f.GetFragDataIndex(program, name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
-    d_3_3_Core->BindFragDataLocationIndexed(program, colorNumber, index, name);
+    d_3_3_Core->f.BindFragDataLocationIndexed(program, colorNumber, index, name);
 }
 
 
 // OpenGL 4.0 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glGetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params)
 {
-    d_4_0_Core->GetQueryIndexediv(target, index, pname, params);
+    d_4_0_Core->f.GetQueryIndexediv(target, index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEndQueryIndexed(GLenum target, GLuint index)
 {
-    d_4_0_Core->EndQueryIndexed(target, index);
+    d_4_0_Core->f.EndQueryIndexed(target, index);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBeginQueryIndexed(GLenum target, GLuint index, GLuint id)
 {
-    d_4_0_Core->BeginQueryIndexed(target, index, id);
+    d_4_0_Core->f.BeginQueryIndexed(target, index, id);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawTransformFeedbackStream(GLenum mode, GLuint id, GLuint stream)
 {
-    d_4_0_Core->DrawTransformFeedbackStream(mode, id, stream);
+    d_4_0_Core->f.DrawTransformFeedbackStream(mode, id, stream);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawTransformFeedback(GLenum mode, GLuint id)
 {
-    d_4_0_Core->DrawTransformFeedback(mode, id);
+    d_4_0_Core->f.DrawTransformFeedback(mode, id);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glResumeTransformFeedback()
 {
-    d_4_0_Core->ResumeTransformFeedback();
+    d_4_0_Core->f.ResumeTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPauseTransformFeedback()
 {
-    d_4_0_Core->PauseTransformFeedback();
+    d_4_0_Core->f.PauseTransformFeedback();
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsTransformFeedback(GLuint id)
 {
-    return d_4_0_Core->IsTransformFeedback(id);
+    return d_4_0_Core->f.IsTransformFeedback(id);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGenTransformFeedbacks(GLsizei n, GLuint *ids)
 {
-    d_4_0_Core->GenTransformFeedbacks(n, ids);
+    d_4_0_Core->f.GenTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
 {
-    d_4_0_Core->DeleteTransformFeedbacks(n, ids);
+    d_4_0_Core->f.DeleteTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindTransformFeedback(GLenum target, GLuint id)
 {
-    d_4_0_Core->BindTransformFeedback(target, id);
+    d_4_0_Core->f.BindTransformFeedback(target, id);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPatchParameterfv(GLenum pname, const GLfloat *values)
 {
-    d_4_0_Core->PatchParameterfv(pname, values);
+    d_4_0_Core->f.PatchParameterfv(pname, values);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPatchParameteri(GLenum pname, GLint value)
 {
-    d_4_0_Core->PatchParameteri(pname, value);
+    d_4_0_Core->f.PatchParameteri(pname, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetProgramStageiv(GLuint program, GLenum shadertype, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetProgramStageiv(program, shadertype, pname, values);
+    d_4_0_Core->f.GetProgramStageiv(program, shadertype, pname, values);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetUniformSubroutineuiv(GLenum shadertype, GLint location, GLuint *params)
 {
-    d_4_0_Core->GetUniformSubroutineuiv(shadertype, location, params);
+    d_4_0_Core->f.GetUniformSubroutineuiv(shadertype, location, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformSubroutinesuiv(GLenum shadertype, GLsizei count, const GLuint *indices)
 {
-    d_4_0_Core->UniformSubroutinesuiv(shadertype, count, indices);
+    d_4_0_Core->f.UniformSubroutinesuiv(shadertype, count, indices);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetActiveSubroutineName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetActiveSubroutineUniformName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
+    d_4_0_Core->f.GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Compatibility::glGetSubroutineIndex(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineIndex(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineIndex(program, shadertype, name);
 }
 
 inline GLint QOpenGLFunctions_4_4_Compatibility::glGetSubroutineUniformLocation(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineUniformLocation(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineUniformLocation(program, shadertype, name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetUniformdv(GLuint program, GLint location, GLdouble *params)
 {
-    d_4_0_Core->GetUniformdv(program, location, params);
+    d_4_0_Core->f.GetUniformdv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix4x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix4x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix3x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix3x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix2x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix2x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniformMatrix2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform4dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform4dv(location, count, value);
+    d_4_0_Core->f.Uniform4dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform3dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform3dv(location, count, value);
+    d_4_0_Core->f.Uniform3dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform2dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform2dv(location, count, value);
+    d_4_0_Core->f.Uniform2dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform1dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform1dv(location, count, value);
+    d_4_0_Core->f.Uniform1dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform4d(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_0_Core->Uniform4d(location, x, y, z, w);
+    d_4_0_Core->f.Uniform4d(location, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform3d(GLint location, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_0_Core->Uniform3d(location, x, y, z);
+    d_4_0_Core->f.Uniform3d(location, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform2d(GLint location, GLdouble x, GLdouble y)
 {
-    d_4_0_Core->Uniform2d(location, x, y);
+    d_4_0_Core->f.Uniform2d(location, x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUniform1d(GLint location, GLdouble x)
 {
-    d_4_0_Core->Uniform1d(location, x);
+    d_4_0_Core->f.Uniform1d(location, x);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect)
 {
-    d_4_0_Core->DrawElementsIndirect(mode, type, indirect);
+    d_4_0_Core->f.DrawElementsIndirect(mode, type, indirect);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawArraysIndirect(GLenum mode, const void *indirect)
 {
-    d_4_0_Core->DrawArraysIndirect(mode, indirect);
+    d_4_0_Core->f.DrawArraysIndirect(mode, indirect);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
 {
-    d_4_0_Core->BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+    d_4_0_Core->f.BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBlendFunci(GLuint buf, GLenum src, GLenum dst)
 {
-    d_4_0_Core->BlendFunci(buf, src, dst);
+    d_4_0_Core->f.BlendFunci(buf, src, dst);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
 {
-    d_4_0_Core->BlendEquationSeparatei(buf, modeRGB, modeAlpha);
+    d_4_0_Core->f.BlendEquationSeparatei(buf, modeRGB, modeAlpha);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBlendEquationi(GLuint buf, GLenum mode)
 {
-    d_4_0_Core->BlendEquationi(buf, mode);
+    d_4_0_Core->f.BlendEquationi(buf, mode);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMinSampleShading(GLfloat value)
 {
-    d_4_0_Core->MinSampleShading(value);
+    d_4_0_Core->f.MinSampleShading(value);
 }
 
 
 // OpenGL 4.1 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glGetDoublei_v(GLenum target, GLuint index, GLdouble *data)
 {
-    d_4_1_Core->GetDoublei_v(target, index, data);
+    d_4_1_Core->f.GetDoublei_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetFloati_v(GLenum target, GLuint index, GLfloat *data)
 {
-    d_4_1_Core->GetFloati_v(target, index, data);
+    d_4_1_Core->f.GetFloati_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDepthRangeIndexed(GLuint index, GLdouble n, GLdouble f)
 {
-    d_4_1_Core->DepthRangeIndexed(index, n, f);
+    d_4_1_Core->f.DepthRangeIndexed(index, n, f);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDepthRangeArrayv(GLuint first, GLsizei count, const GLdouble *v)
 {
-    d_4_1_Core->DepthRangeArrayv(first, count, v);
+    d_4_1_Core->f.DepthRangeArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glScissorIndexedv(GLuint index, const GLint *v)
 {
-    d_4_1_Core->ScissorIndexedv(index, v);
+    d_4_1_Core->f.ScissorIndexedv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glScissorIndexed(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height)
 {
-    d_4_1_Core->ScissorIndexed(index, left, bottom, width, height);
+    d_4_1_Core->f.ScissorIndexed(index, left, bottom, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glScissorArrayv(GLuint first, GLsizei count, const GLint *v)
 {
-    d_4_1_Core->ScissorArrayv(first, count, v);
+    d_4_1_Core->f.ScissorArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glViewportIndexedfv(GLuint index, const GLfloat *v)
 {
-    d_4_1_Core->ViewportIndexedfv(index, v);
+    d_4_1_Core->f.ViewportIndexedfv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glViewportIndexedf(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h)
 {
-    d_4_1_Core->ViewportIndexedf(index, x, y, w, h);
+    d_4_1_Core->f.ViewportIndexedf(index, x, y, w, h);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glViewportArrayv(GLuint first, GLsizei count, const GLfloat *v)
 {
-    d_4_1_Core->ViewportArrayv(first, count, v);
+    d_4_1_Core->f.ViewportArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetVertexAttribLdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_4_1_Core->GetVertexAttribLdv(index, pname, params);
+    d_4_1_Core->f.GetVertexAttribLdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribLPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_4_1_Core->VertexAttribLPointer(index, size, type, stride, pointer);
+    d_4_1_Core->f.VertexAttribLPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribL4dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL4dv(index, v);
+    d_4_1_Core->f.VertexAttribL4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribL3dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL3dv(index, v);
+    d_4_1_Core->f.VertexAttribL3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribL2dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL2dv(index, v);
+    d_4_1_Core->f.VertexAttribL2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribL1dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL1dv(index, v);
+    d_4_1_Core->f.VertexAttribL1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribL4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_1_Core->VertexAttribL4d(index, x, y, z, w);
+    d_4_1_Core->f.VertexAttribL4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribL3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_1_Core->VertexAttribL3d(index, x, y, z);
+    d_4_1_Core->f.VertexAttribL3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribL2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_4_1_Core->VertexAttribL2d(index, x, y);
+    d_4_1_Core->f.VertexAttribL2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribL1d(GLuint index, GLdouble x)
 {
-    d_4_1_Core->VertexAttribL1d(index, x);
+    d_4_1_Core->f.VertexAttribL1d(index, x);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetProgramPipelineInfoLog(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_4_1_Core->GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
+    d_4_1_Core->f.GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glValidateProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->ValidateProgramPipeline(pipeline);
+    d_4_1_Core->f.ValidateProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix4x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix3x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix4x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix2x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix3x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix2x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix4x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix3x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix4x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix2x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix3x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix2x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniformMatrix2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform4uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform4uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_4_1_Core->ProgramUniform4ui(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4ui(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform4dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform4dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform4d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3)
 {
-    d_4_1_Core->ProgramUniform4d(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4d(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform4fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform4fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_4_1_Core->ProgramUniform4f(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4f(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform4iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform4iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_4_1_Core->ProgramUniform4i(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4i(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform3uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform3uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_4_1_Core->ProgramUniform3ui(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3ui(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform3dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform3dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform3d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2)
 {
-    d_4_1_Core->ProgramUniform3d(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3d(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform3fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform3fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_4_1_Core->ProgramUniform3f(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3f(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform3iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform3iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_4_1_Core->ProgramUniform3i(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3i(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform2uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform2uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
 {
-    d_4_1_Core->ProgramUniform2ui(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2ui(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform2dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform2dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform2d(GLuint program, GLint location, GLdouble v0, GLdouble v1)
 {
-    d_4_1_Core->ProgramUniform2d(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2d(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform2fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform2fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1)
 {
-    d_4_1_Core->ProgramUniform2f(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2f(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform2iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform2iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
 {
-    d_4_1_Core->ProgramUniform2i(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2i(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform1uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform1uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform1ui(GLuint program, GLint location, GLuint v0)
 {
-    d_4_1_Core->ProgramUniform1ui(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1ui(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform1dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform1dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform1d(GLuint program, GLint location, GLdouble v0)
 {
-    d_4_1_Core->ProgramUniform1d(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1d(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform1fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform1fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform1f(GLuint program, GLint location, GLfloat v0)
 {
-    d_4_1_Core->ProgramUniform1f(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1f(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform1iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform1iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramUniform1i(GLuint program, GLint location, GLint v0)
 {
-    d_4_1_Core->ProgramUniform1i(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1i(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
 {
-    d_4_1_Core->GetProgramPipelineiv(pipeline, pname, params);
+    d_4_1_Core->f.GetProgramPipelineiv(pipeline, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsProgramPipeline(GLuint pipeline)
 {
-    return d_4_1_Core->IsProgramPipeline(pipeline);
+    return d_4_1_Core->f.IsProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGenProgramPipelines(GLsizei n, GLuint *pipelines)
 {
-    d_4_1_Core->GenProgramPipelines(n, pipelines);
+    d_4_1_Core->f.GenProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
 {
-    d_4_1_Core->DeleteProgramPipelines(n, pipelines);
+    d_4_1_Core->f.DeleteProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->BindProgramPipeline(pipeline);
+    d_4_1_Core->f.BindProgramPipeline(pipeline);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Compatibility::glCreateShaderProgramv(GLenum type, GLsizei count, const GLchar *const *strings)
 {
-    return d_4_1_Core->CreateShaderProgramv(type, count, strings);
+    return d_4_1_Core->f.CreateShaderProgramv(type, count, strings);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glActiveShaderProgram(GLuint pipeline, GLuint program)
 {
-    d_4_1_Core->ActiveShaderProgram(pipeline, program);
+    d_4_1_Core->f.ActiveShaderProgram(pipeline, program);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glUseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
 {
-    d_4_1_Core->UseProgramStages(pipeline, stages, program);
+    d_4_1_Core->f.UseProgramStages(pipeline, stages, program);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramParameteri(GLuint program, GLenum pname, GLint value)
 {
-    d_4_1_Core->ProgramParameteri(program, pname, value);
+    d_4_1_Core->f.ProgramParameteri(program, pname, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glProgramBinary(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length)
 {
-    d_4_1_Core->ProgramBinary(program, binaryFormat, binary, length);
+    d_4_1_Core->f.ProgramBinary(program, binaryFormat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary)
 {
-    d_4_1_Core->GetProgramBinary(program, bufSize, length, binaryFormat, binary);
+    d_4_1_Core->f.GetProgramBinary(program, bufSize, length, binaryFormat, binary);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClearDepthf(GLfloat dd)
 {
-    d_4_1_Core->ClearDepthf(dd);
+    d_4_1_Core->f.ClearDepthf(dd);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDepthRangef(GLfloat n, GLfloat f)
 {
-    d_4_1_Core->DepthRangef(n, f);
+    d_4_1_Core->f.DepthRangef(n, f);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)
 {
-    d_4_1_Core->GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+    d_4_1_Core->f.GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glShaderBinary(GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length)
 {
-    d_4_1_Core->ShaderBinary(count, shaders, binaryformat, binary, length);
+    d_4_1_Core->f.ShaderBinary(count, shaders, binaryformat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glReleaseShaderCompiler()
 {
-    d_4_1_Core->ReleaseShaderCompiler();
+    d_4_1_Core->f.ReleaseShaderCompiler();
 }
 
 
 // OpenGL 4.2 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawTransformFeedbackStreamInstanced(GLenum mode, GLuint id, GLuint stream, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawTransformFeedbackInstanced(GLenum mode, GLuint id, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackInstanced(mode, id, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackInstanced(mode, id, instancecount);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_2_Core->TexStorage3D(target, levels, internalformat, width, height, depth);
+    d_4_2_Core->f.TexStorage3D(target, levels, internalformat, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_4_2_Core->TexStorage2D(target, levels, internalformat, width, height);
+    d_4_2_Core->f.TexStorage2D(target, levels, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)
 {
-    d_4_2_Core->TexStorage1D(target, levels, internalformat, width);
+    d_4_2_Core->f.TexStorage1D(target, levels, internalformat, width);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMemoryBarrier(GLbitfield barriers)
 {
-    d_4_2_Core->MemoryBarrier(barriers);
+    d_4_2_Core->f.MemoryBarrier(barriers);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindImageTexture(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format)
 {
-    d_4_2_Core->BindImageTexture(unit, texture, level, layered, layer, access, format);
+    d_4_2_Core->f.BindImageTexture(unit, texture, level, layered, layer, access, format);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetActiveAtomicCounterBufferiv(GLuint program, GLuint bufferIndex, GLenum pname, GLint *params)
 {
-    d_4_2_Core->GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
+    d_4_2_Core->f.GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params)
 {
-    d_4_2_Core->GetInternalformativ(target, internalformat, pname, bufSize, params);
+    d_4_2_Core->f.GetInternalformativ(target, internalformat, pname, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawElementsInstancedBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawArraysInstancedBaseInstance(GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
+    d_4_2_Core->f.DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
 }
 
 
 // OpenGL 4.3 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glGetObjectPtrLabel(const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label)
 {
-    d_4_3_Core->GetObjectPtrLabel(ptr, bufSize, length, label);
+    d_4_3_Core->f.GetObjectPtrLabel(ptr, bufSize, length, label);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glObjectPtrLabel(const void *ptr, GLsizei length, const GLchar *label)
 {
-    d_4_3_Core->ObjectPtrLabel(ptr, length, label);
+    d_4_3_Core->f.ObjectPtrLabel(ptr, length, label);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetObjectLabel(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label)
 {
-    d_4_3_Core->GetObjectLabel(identifier, name, bufSize, length, label);
+    d_4_3_Core->f.GetObjectLabel(identifier, name, bufSize, length, label);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glObjectLabel(GLenum identifier, GLuint name, GLsizei length, const GLchar *label)
 {
-    d_4_3_Core->ObjectLabel(identifier, name, length, label);
+    d_4_3_Core->f.ObjectLabel(identifier, name, length, label);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPopDebugGroup()
 {
-    d_4_3_Core->PopDebugGroup();
+    d_4_3_Core->f.PopDebugGroup();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPushDebugGroup(GLenum source, GLuint id, GLsizei length, const GLchar *message)
 {
-    d_4_3_Core->PushDebugGroup(source, id, length, message);
+    d_4_3_Core->f.PushDebugGroup(source, id, length, message);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Compatibility::glGetDebugMessageLog(GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog)
 {
-    return d_4_3_Core->GetDebugMessageLog(count, bufSize, sources, types, ids, severities, lengths, messageLog);
+    return d_4_3_Core->f.GetDebugMessageLog(count, bufSize, sources, types, ids, severities, lengths, messageLog);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDebugMessageCallback(GLDEBUGPROC callback, const void *userParam)
 {
-    d_4_3_Core->DebugMessageCallback(callback, userParam);
+    d_4_3_Core->f.DebugMessageCallback(callback, userParam);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf)
 {
-    d_4_3_Core->DebugMessageInsert(source, type, id, severity, length, buf);
+    d_4_3_Core->f.DebugMessageInsert(source, type, id, severity, length, buf);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDebugMessageControl(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled)
 {
-    d_4_3_Core->DebugMessageControl(source, type, severity, count, ids, enabled);
+    d_4_3_Core->f.DebugMessageControl(source, type, severity, count, ids, enabled);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexBindingDivisor(GLuint bindingindex, GLuint divisor)
 {
-    d_4_3_Core->VertexBindingDivisor(bindingindex, divisor);
+    d_4_3_Core->f.VertexBindingDivisor(bindingindex, divisor);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribBinding(GLuint attribindex, GLuint bindingindex)
 {
-    d_4_3_Core->VertexAttribBinding(attribindex, bindingindex);
+    d_4_3_Core->f.VertexAttribBinding(attribindex, bindingindex);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribLFormat(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribLFormat(attribindex, size, type, relativeoffset);
+    d_4_3_Core->f.VertexAttribLFormat(attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribIFormat(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribIFormat(attribindex, size, type, relativeoffset);
+    d_4_3_Core->f.VertexAttribIFormat(attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexAttribFormat(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
+    d_4_3_Core->f.VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindVertexBuffer(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride)
 {
-    d_4_3_Core->BindVertexBuffer(bindingindex, buffer, offset, stride);
+    d_4_3_Core->f.BindVertexBuffer(bindingindex, buffer, offset, stride);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTextureView(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers)
 {
-    d_4_3_Core->TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers);
+    d_4_3_Core->f.TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_4_3_Core->TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_4_3_Core->f.TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexStorage2DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_4_3_Core->TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_4_3_Core->f.TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexBufferRange(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_4_3_Core->TexBufferRange(target, internalformat, buffer, offset, size);
+    d_4_3_Core->f.TexBufferRange(target, internalformat, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glShaderStorageBlockBinding(GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding)
 {
-    d_4_3_Core->ShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
+    d_4_3_Core->f.ShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
 }
 
 inline GLint QOpenGLFunctions_4_4_Compatibility::glGetProgramResourceLocationIndex(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceLocationIndex(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceLocationIndex(program, programInterface, name);
 }
 
 inline GLint QOpenGLFunctions_4_4_Compatibility::glGetProgramResourceLocation(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceLocation(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceLocation(program, programInterface, name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetProgramResourceiv(GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params)
 {
-    d_4_3_Core->GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
+    d_4_3_Core->f.GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetProgramResourceName(GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name)
 {
-    d_4_3_Core->GetProgramResourceName(program, programInterface, index, bufSize, length, name);
+    d_4_3_Core->f.GetProgramResourceName(program, programInterface, index, bufSize, length, name);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Compatibility::glGetProgramResourceIndex(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceIndex(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceIndex(program, programInterface, name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetProgramInterfaceiv(GLuint program, GLenum programInterface, GLenum pname, GLint *params)
 {
-    d_4_3_Core->GetProgramInterfaceiv(program, programInterface, pname, params);
+    d_4_3_Core->f.GetProgramInterfaceiv(program, programInterface, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride)
 {
-    d_4_3_Core->MultiDrawElementsIndirect(mode, type, indirect, drawcount, stride);
+    d_4_3_Core->f.MultiDrawElementsIndirect(mode, type, indirect, drawcount, stride);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiDrawArraysIndirect(GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride)
 {
-    d_4_3_Core->MultiDrawArraysIndirect(mode, indirect, drawcount, stride);
+    d_4_3_Core->f.MultiDrawArraysIndirect(mode, indirect, drawcount, stride);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_4_3_Core->InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
+    d_4_3_Core->f.InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glInvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments)
 {
-    d_4_3_Core->InvalidateFramebuffer(target, numAttachments, attachments);
+    d_4_3_Core->f.InvalidateFramebuffer(target, numAttachments, attachments);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glInvalidateBufferData(GLuint buffer)
 {
-    d_4_3_Core->InvalidateBufferData(buffer);
+    d_4_3_Core->f.InvalidateBufferData(buffer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glInvalidateBufferSubData(GLuint buffer, GLintptr offset, GLsizeiptr length)
 {
-    d_4_3_Core->InvalidateBufferSubData(buffer, offset, length);
+    d_4_3_Core->f.InvalidateBufferSubData(buffer, offset, length);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glInvalidateTexImage(GLuint texture, GLint level)
 {
-    d_4_3_Core->InvalidateTexImage(texture, level);
+    d_4_3_Core->f.InvalidateTexImage(texture, level);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glInvalidateTexSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_3_Core->InvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
+    d_4_3_Core->f.InvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetInternalformati64v(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params)
 {
-    d_4_3_Core->GetInternalformati64v(target, internalformat, pname, bufSize, params);
+    d_4_3_Core->f.GetInternalformati64v(target, internalformat, pname, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_4_3_Core->GetFramebufferParameteriv(target, pname, params);
+    d_4_3_Core->f.GetFramebufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFramebufferParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_4_3_Core->FramebufferParameteri(target, pname, param);
+    d_4_3_Core->f.FramebufferParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth)
 {
-    d_4_3_Core->CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth);
+    d_4_3_Core->f.CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDispatchComputeIndirect(GLintptr indirect)
 {
-    d_4_3_Core->DispatchComputeIndirect(indirect);
+    d_4_3_Core->f.DispatchComputeIndirect(indirect);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z)
 {
-    d_4_3_Core->DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
+    d_4_3_Core->f.DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClearBufferSubData(GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data)
 {
-    d_4_3_Core->ClearBufferSubData(target, internalformat, offset, size, format, type, data);
+    d_4_3_Core->f.ClearBufferSubData(target, internalformat, offset, size, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClearBufferData(GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data)
 {
-    d_4_3_Core->ClearBufferData(target, internalformat, format, type, data);
+    d_4_3_Core->f.ClearBufferData(target, internalformat, format, type, data);
 }
 
 
 // OpenGL 4.4 core functions
 inline void QOpenGLFunctions_4_4_Compatibility::glBindVertexBuffers(GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides)
 {
-    d_4_4_Core->BindVertexBuffers(first, count, buffers, offsets, strides);
+    d_4_4_Core->f.BindVertexBuffers(first, count, buffers, offsets, strides);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindImageTextures(GLuint first, GLsizei count, const GLuint *textures)
 {
-    d_4_4_Core->BindImageTextures(first, count, textures);
+    d_4_4_Core->f.BindImageTextures(first, count, textures);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindSamplers(GLuint first, GLsizei count, const GLuint *samplers)
 {
-    d_4_4_Core->BindSamplers(first, count, samplers);
+    d_4_4_Core->f.BindSamplers(first, count, samplers);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindTextures(GLuint first, GLsizei count, const GLuint *textures)
 {
-    d_4_4_Core->BindTextures(first, count, textures);
+    d_4_4_Core->f.BindTextures(first, count, textures);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindBuffersRange(GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes)
 {
-    d_4_4_Core->BindBuffersRange(target, first, count, buffers, offsets, sizes);
+    d_4_4_Core->f.BindBuffersRange(target, first, count, buffers, offsets, sizes);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBindBuffersBase(GLenum target, GLuint first, GLsizei count, const GLuint *buffers)
 {
-    d_4_4_Core->BindBuffersBase(target, first, count, buffers);
+    d_4_4_Core->f.BindBuffersBase(target, first, count, buffers);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClearTexSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data)
 {
-    d_4_4_Core->ClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data);
+    d_4_4_Core->f.ClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClearTexImage(GLuint texture, GLint level, GLenum format, GLenum type, const void *data)
 {
-    d_4_4_Core->ClearTexImage(texture, level, format, type, data);
+    d_4_4_Core->f.ClearTexImage(texture, level, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBufferStorage(GLenum target, GLsizeiptr size, const void *data, GLbitfield flags)
 {
-    d_4_4_Core->BufferStorage(target, size, data, flags);
+    d_4_4_Core->f.BufferStorage(target, size, data, flags);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_4_4_Compatibility::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPixelMapfv(GLenum map, GLsizei mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_4_4_Compatibility::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Compatibility::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCallLists(GLsizei n, GLenum type, const void *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_4_4_Compatibility::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Compatibility::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glNormalPointer(GLenum type, GLsizei stride, const void *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glInterleavedArrays(GLenum format, GLsizei stride, const void *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetPointerv(GLenum pname, void * *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glIndexPointer(GLenum type, GLsizei stride, const void *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glEdgeFlagPointer(GLsizei stride, const void *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_4_4_Compatibility::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetColorTable(GLenum target, GLenum format, GLenum type, void *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, void *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, void *row, void *column, void *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, void *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, void *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_4_4_Compatibility::glMultTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixd(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixf(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLoadTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixd(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glLoadTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixf(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord4sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_3_Deprecated->MultiTexCoord4s(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4s(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord4iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_3_Deprecated->MultiTexCoord4i(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4i(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord4fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_3_Deprecated->MultiTexCoord4f(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4f(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_3_Deprecated->MultiTexCoord4d(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4d(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord3sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-    d_1_3_Deprecated->MultiTexCoord3s(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3s(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord3iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
-    d_1_3_Deprecated->MultiTexCoord3i(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3i(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord3fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_3_Deprecated->MultiTexCoord3f(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3f(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_3_Deprecated->MultiTexCoord3d(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3d(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord2sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
-    d_1_3_Deprecated->MultiTexCoord2s(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2s(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord2iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
-    d_1_3_Deprecated->MultiTexCoord2i(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2i(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord2fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t)
 {
-    d_1_3_Deprecated->MultiTexCoord2f(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2f(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
-    d_1_3_Deprecated->MultiTexCoord2d(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2d(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord1sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord1s(GLenum target, GLshort s)
 {
-    d_1_3_Deprecated->MultiTexCoord1s(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1s(target, s);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord1iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord1i(GLenum target, GLint s)
 {
-    d_1_3_Deprecated->MultiTexCoord1i(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1i(target, s);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord1fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord1f(GLenum target, GLfloat s)
 {
-    d_1_3_Deprecated->MultiTexCoord1f(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1f(target, s);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoord1d(GLenum target, GLdouble s)
 {
-    d_1_3_Deprecated->MultiTexCoord1d(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1d(target, s);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glClientActiveTexture(GLenum texture)
 {
-    d_1_3_Deprecated->ClientActiveTexture(texture);
+    d_1_3_Deprecated->f.ClientActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 deprecated functions
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos3sv(v);
+    d_1_4_Deprecated->f.WindowPos3sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_4_Deprecated->WindowPos3s(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos3iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos3iv(v);
+    d_1_4_Deprecated->f.WindowPos3iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_4_Deprecated->WindowPos3i(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos3fv(v);
+    d_1_4_Deprecated->f.WindowPos3fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_4_Deprecated->WindowPos3f(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos3dv(v);
+    d_1_4_Deprecated->f.WindowPos3dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_4_Deprecated->WindowPos3d(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos2sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos2sv(v);
+    d_1_4_Deprecated->f.WindowPos2sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos2s(GLshort x, GLshort y)
 {
-    d_1_4_Deprecated->WindowPos2s(x, y);
+    d_1_4_Deprecated->f.WindowPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos2iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos2iv(v);
+    d_1_4_Deprecated->f.WindowPos2iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos2i(GLint x, GLint y)
 {
-    d_1_4_Deprecated->WindowPos2i(x, y);
+    d_1_4_Deprecated->f.WindowPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos2fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos2fv(v);
+    d_1_4_Deprecated->f.WindowPos2fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos2f(GLfloat x, GLfloat y)
 {
-    d_1_4_Deprecated->WindowPos2f(x, y);
+    d_1_4_Deprecated->f.WindowPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos2dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos2dv(v);
+    d_1_4_Deprecated->f.WindowPos2dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glWindowPos2d(GLdouble x, GLdouble y)
 {
-    d_1_4_Deprecated->WindowPos2d(x, y);
+    d_1_4_Deprecated->f.WindowPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_1_4_Deprecated->SecondaryColorPointer(size, type, stride, pointer);
+    d_1_4_Deprecated->f.SecondaryColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3usv(const GLushort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3usv(v);
+    d_1_4_Deprecated->f.SecondaryColor3usv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3us(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3uiv(const GLuint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3uiv(v);
+    d_1_4_Deprecated->f.SecondaryColor3uiv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ui(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3ubv(const GLubyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3ubv(v);
+    d_1_4_Deprecated->f.SecondaryColor3ubv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ub(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3sv(v);
+    d_1_4_Deprecated->f.SecondaryColor3sv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3s(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3iv(const GLint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3iv(v);
+    d_1_4_Deprecated->f.SecondaryColor3iv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3i(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->SecondaryColor3fv(v);
+    d_1_4_Deprecated->f.SecondaryColor3fv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_4_Deprecated->SecondaryColor3f(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->SecondaryColor3dv(v);
+    d_1_4_Deprecated->f.SecondaryColor3dv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_4_Deprecated->SecondaryColor3d(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3bv(const GLbyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3bv(v);
+    d_1_4_Deprecated->f.SecondaryColor3bv(v);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3b(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFogCoordPointer(GLenum type, GLsizei stride, const void *pointer)
 {
-    d_1_4_Deprecated->FogCoordPointer(type, stride, pointer);
+    d_1_4_Deprecated->f.FogCoordPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFogCoorddv(const GLdouble *coord)
 {
-    d_1_4_Deprecated->FogCoorddv(coord);
+    d_1_4_Deprecated->f.FogCoorddv(coord);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFogCoordd(GLdouble coord)
 {
-    d_1_4_Deprecated->FogCoordd(coord);
+    d_1_4_Deprecated->f.FogCoordd(coord);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFogCoordfv(const GLfloat *coord)
 {
-    d_1_4_Deprecated->FogCoordfv(coord);
+    d_1_4_Deprecated->f.FogCoordfv(coord);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glFogCoordf(GLfloat coord)
 {
-    d_1_4_Deprecated->FogCoordf(coord);
+    d_1_4_Deprecated->f.FogCoordf(coord);
 }
 
 
@@ -5792,152 +5799,152 @@ inline void QOpenGLFunctions_4_4_Compatibility::glFogCoordf(GLfloat coord)
 // OpenGL 3.3 deprecated functions
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->SecondaryColorP3uiv(type, color);
+    d_3_3_Deprecated->f.SecondaryColorP3uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glSecondaryColorP3ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->SecondaryColorP3ui(type, color);
+    d_3_3_Deprecated->f.SecondaryColorP3ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColorP4uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->ColorP4uiv(type, color);
+    d_3_3_Deprecated->f.ColorP4uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColorP4ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->ColorP4ui(type, color);
+    d_3_3_Deprecated->f.ColorP4ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColorP3uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->ColorP3uiv(type, color);
+    d_3_3_Deprecated->f.ColorP3uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glColorP3ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->ColorP3ui(type, color);
+    d_3_3_Deprecated->f.ColorP3ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glNormalP3uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->NormalP3uiv(type, coords);
+    d_3_3_Deprecated->f.NormalP3uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glNormalP3ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->NormalP3ui(type, coords);
+    d_3_3_Deprecated->f.NormalP3ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoordP4uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP4uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP4uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoordP4ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP4ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP4ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoordP3uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP3uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP3uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoordP3ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP3ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP3ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoordP2uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP2uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP2uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoordP2ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP2ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP2ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoordP1uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP1uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP1uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glMultiTexCoordP1ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP1ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP1ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoordP4uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP4uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP4uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoordP4ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP4ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP4ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoordP3uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP3uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP3uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoordP3ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP3ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP3ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoordP2uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP2uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP2uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoordP2ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP2ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP2ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoordP1uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP1uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP1uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glTexCoordP1ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP1ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP1ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexP4uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP4uiv(type, value);
+    d_3_3_Deprecated->f.VertexP4uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexP4ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP4ui(type, value);
+    d_3_3_Deprecated->f.VertexP4ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexP3uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP3uiv(type, value);
+    d_3_3_Deprecated->f.VertexP3uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexP3ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP3ui(type, value);
+    d_3_3_Deprecated->f.VertexP3ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexP2uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP2uiv(type, value);
+    d_3_3_Deprecated->f.VertexP2uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_4_Compatibility::glVertexP2ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP2ui(type, value);
+    d_3_3_Deprecated->f.VertexP2ui(type, value);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_4_4_core.cpp b/src/gui/opengl/qopenglfunctions_4_4_core.cpp
index f76130859d..95bfc3a438 100644
--- a/src/gui/opengl/qopenglfunctions_4_4_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_4_core.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -83,74 +89,57 @@ QOpenGLFunctions_4_4_Core::QOpenGLFunctions_4_4_Core()
 
 QOpenGLFunctions_4_4_Core::~QOpenGLFunctions_4_4_Core()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_3_3_Core && !d_3_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Core->context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        delete d_3_3_Core;
-    }
-    if (d_4_0_Core && !d_4_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_0_Core->context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        delete d_4_0_Core;
-    }
-    if (d_4_1_Core && !d_4_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_1_Core->context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        delete d_4_1_Core;
-    }
-    if (d_4_2_Core && !d_4_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_2_Core->context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        delete d_4_2_Core;
-    }
-    if (d_4_3_Core && !d_4_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_3_Core->context, QOpenGLFunctions_4_3_CoreBackend::versionStatus());
-        delete d_4_3_Core;
-    }
-    if (d_4_4_Core && !d_4_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_4_Core->context, QOpenGLFunctions_4_4_CoreBackend::versionStatus());
-        delete d_4_4_Core;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_3_3_Core)
+        d_3_3_Core->refs.deref();
+    Q_ASSERT(d_3_3_Core->refs.load());
+    if (d_4_0_Core)
+        d_4_0_Core->refs.deref();
+    Q_ASSERT(d_4_0_Core->refs.load());
+    if (d_4_1_Core)
+        d_4_1_Core->refs.deref();
+    Q_ASSERT(d_4_1_Core->refs.load());
+    if (d_4_2_Core)
+        d_4_2_Core->refs.deref();
+    Q_ASSERT(d_4_2_Core->refs.load());
+    if (d_4_3_Core)
+        d_4_3_Core->refs.deref();
+    Q_ASSERT(d_4_3_Core->refs.load());
+    if (d_4_4_Core)
+        d_4_4_Core->refs.deref();
+    Q_ASSERT(d_4_4_Core->refs.load());
 }
 
 bool QOpenGLFunctions_4_4_Core::initializeOpenGLFunctions()
@@ -169,138 +158,70 @@ bool QOpenGLFunctions_4_4_Core::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus(), d);
-        }
         d_3_3_Core = static_cast<QOpenGLFunctions_3_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus(), d);
-        }
         d_4_0_Core = static_cast<QOpenGLFunctions_4_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus(), d);
-        }
         d_4_1_Core = static_cast<QOpenGLFunctions_4_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus(), d);
-        }
         d_4_2_Core = static_cast<QOpenGLFunctions_4_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_3_CoreBackend::versionStatus(), d);
-        }
         d_4_3_Core = static_cast<QOpenGLFunctions_4_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_4_CoreBackend::versionStatus(), d);
-        }
         d_4_4_Core = static_cast<QOpenGLFunctions_4_4_CoreBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_4_4_core.h b/src/gui/opengl/qopenglfunctions_4_4_core.h
index e448d2a10e..e508478c50 100644
--- a/src/gui/opengl/qopenglfunctions_4_4_core.h
+++ b/src/gui/opengl/qopenglfunctions_4_4_core.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtWidgets module of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -664,2744 +671,2744 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_4_4_Core::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Core::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, void *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_4_Core::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetIntegerv(GLenum pname, GLint *data)
 {
-    d_1_0_Core->GetIntegerv(pname, data);
+    d_1_0_Core->f.GetIntegerv(pname, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetFloatv(GLenum pname, GLfloat *data)
 {
-    d_1_0_Core->GetFloatv(pname, data);
+    d_1_0_Core->f.GetFloatv(pname, data);
 }
 
 inline GLenum QOpenGLFunctions_4_4_Core::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetDoublev(GLenum pname, GLdouble *data)
 {
-    d_1_0_Core->GetDoublev(pname, data);
+    d_1_0_Core->f.GetDoublev(pname, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetBooleanv(GLenum pname, GLboolean *data)
 {
-    d_1_0_Core->GetBooleanv(pname, data);
+    d_1_0_Core->f.GetBooleanv(pname, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glReadBuffer(GLenum src)
 {
-    d_1_0_Core->ReadBuffer(src);
+    d_1_0_Core->f.ReadBuffer(src);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_4_4_Core::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_4_4_Core::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawBuffer(GLenum buf)
 {
-    d_1_0_Core->DrawBuffer(buf);
+    d_1_0_Core->f.DrawBuffer(buf);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline GLboolean QOpenGLFunctions_4_4_Core::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawElements(GLenum mode, GLsizei count, GLenum type, const void *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_4_4_Core::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_4_4_Core::glGetCompressedTexImage(GLenum target, GLint level, void *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_4_4_Core::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_4_4_Core::glGetBufferPointerv(GLenum target, GLenum pname, void * *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Core::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline void * QOpenGLFunctions_4_4_Core::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, void *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Core::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Core::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4usv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4usv(index, v);
+    d_2_0_Core->f.VertexAttrib4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4uiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4uiv(index, v);
+    d_2_0_Core->f.VertexAttrib4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4ubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4ubv(index, v);
+    d_2_0_Core->f.VertexAttrib4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4sv(index, v);
+    d_2_0_Core->f.VertexAttrib4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_2_0_Core->VertexAttrib4s(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4s(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4iv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4iv(index, v);
+    d_2_0_Core->f.VertexAttrib4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib4fv(index, v);
+    d_2_0_Core->f.VertexAttrib4fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_2_0_Core->VertexAttrib4f(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4f(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib4dv(index, v);
+    d_2_0_Core->f.VertexAttrib4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_2_0_Core->VertexAttrib4d(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4bv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4bv(index, v);
+    d_2_0_Core->f.VertexAttrib4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4Nusv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4Nusv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nusv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4Nuiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4Nuiv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nuiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4Nubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nubv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-    d_2_0_Core->VertexAttrib4Nub(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4Nub(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4Nsv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4Nsv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nsv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4Niv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4Niv(index, v);
+    d_2_0_Core->f.VertexAttrib4Niv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib4Nbv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nbv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nbv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib3sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib3sv(index, v);
+    d_2_0_Core->f.VertexAttrib3sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-    d_2_0_Core->VertexAttrib3s(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3s(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib3fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib3fv(index, v);
+    d_2_0_Core->f.VertexAttrib3fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_2_0_Core->VertexAttrib3f(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3f(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib3dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib3dv(index, v);
+    d_2_0_Core->f.VertexAttrib3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_2_0_Core->VertexAttrib3d(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib2sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib2sv(index, v);
+    d_2_0_Core->f.VertexAttrib2sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib2s(GLuint index, GLshort x, GLshort y)
 {
-    d_2_0_Core->VertexAttrib2s(index, x, y);
+    d_2_0_Core->f.VertexAttrib2s(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib2fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib2fv(index, v);
+    d_2_0_Core->f.VertexAttrib2fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    d_2_0_Core->VertexAttrib2f(index, x, y);
+    d_2_0_Core->f.VertexAttrib2f(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib2dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib2dv(index, v);
+    d_2_0_Core->f.VertexAttrib2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_2_0_Core->VertexAttrib2d(index, x, y);
+    d_2_0_Core->f.VertexAttrib2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib1sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib1sv(index, v);
+    d_2_0_Core->f.VertexAttrib1sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib1s(GLuint index, GLshort x)
 {
-    d_2_0_Core->VertexAttrib1s(index, x);
+    d_2_0_Core->f.VertexAttrib1s(index, x);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib1fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib1fv(index, v);
+    d_2_0_Core->f.VertexAttrib1fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    d_2_0_Core->VertexAttrib1f(index, x);
+    d_2_0_Core->f.VertexAttrib1f(index, x);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib1dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib1dv(index, v);
+    d_2_0_Core->f.VertexAttrib1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttrib1d(GLuint index, GLdouble x)
 {
-    d_2_0_Core->VertexAttrib1d(index, x);
+    d_2_0_Core->f.VertexAttrib1d(index, x);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glShaderSource(GLuint shader, GLsizei count, const GLchar *const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Core::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Core::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetVertexAttribPointerv(GLuint index, GLenum pname, void * *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_4_4_Core::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_4_4_Core::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, shaders);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, shaders);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Core::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Core::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_4_4_Core::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline void * QOpenGLFunctions_4_4_Core::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_4_4_Core::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Core::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Core::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_4_Core::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_4_4_Core::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI4usv(GLuint index, const GLushort *v)
 {
-    d_3_0_Core->VertexAttribI4usv(index, v);
+    d_3_0_Core->f.VertexAttribI4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI4ubv(GLuint index, const GLubyte *v)
 {
-    d_3_0_Core->VertexAttribI4ubv(index, v);
+    d_3_0_Core->f.VertexAttribI4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI4sv(GLuint index, const GLshort *v)
 {
-    d_3_0_Core->VertexAttribI4sv(index, v);
+    d_3_0_Core->f.VertexAttribI4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI4bv(GLuint index, const GLbyte *v)
 {
-    d_3_0_Core->VertexAttribI4bv(index, v);
+    d_3_0_Core->f.VertexAttribI4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI4uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI4uiv(index, v);
+    d_3_0_Core->f.VertexAttribI4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI3uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI3uiv(index, v);
+    d_3_0_Core->f.VertexAttribI3uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI2uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI2uiv(index, v);
+    d_3_0_Core->f.VertexAttribI2uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI1uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI1uiv(index, v);
+    d_3_0_Core->f.VertexAttribI1uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI4iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI4iv(index, v);
+    d_3_0_Core->f.VertexAttribI4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI3iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI3iv(index, v);
+    d_3_0_Core->f.VertexAttribI3iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI2iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI2iv(index, v);
+    d_3_0_Core->f.VertexAttribI2iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI1iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI1iv(index, v);
+    d_3_0_Core->f.VertexAttribI1iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
-    d_3_0_Core->VertexAttribI4ui(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4ui(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI3ui(GLuint index, GLuint x, GLuint y, GLuint z)
 {
-    d_3_0_Core->VertexAttribI3ui(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3ui(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI2ui(GLuint index, GLuint x, GLuint y)
 {
-    d_3_0_Core->VertexAttribI2ui(index, x, y);
+    d_3_0_Core->f.VertexAttribI2ui(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI1ui(GLuint index, GLuint x)
 {
-    d_3_0_Core->VertexAttribI1ui(index, x);
+    d_3_0_Core->f.VertexAttribI1ui(index, x);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
-    d_3_0_Core->VertexAttribI4i(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4i(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI3i(GLuint index, GLint x, GLint y, GLint z)
 {
-    d_3_0_Core->VertexAttribI3i(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3i(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI2i(GLuint index, GLint x, GLint y)
 {
-    d_3_0_Core->VertexAttribI2i(index, x, y);
+    d_3_0_Core->f.VertexAttribI2i(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribI1i(GLuint index, GLint x)
 {
-    d_3_0_Core->VertexAttribI1i(index, x);
+    d_3_0_Core->f.VertexAttribI1i(index, x);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar *const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Core::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_4_4_Core::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Core::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_4_4_Core::glSampleMaski(GLuint maskNumber, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(maskNumber, mask);
+    d_3_2_Core->f.SampleMaski(maskNumber, mask);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexImage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexImage2DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetInteger64v(GLenum pname, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64v(pname, data);
+    d_3_2_Core->f.GetInteger64v(pname, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_4_4_Core::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Core::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_4_4_Core::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 
 // OpenGL 3.3 core functions
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP4uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribP4ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP4ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribP3uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP3uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribP3ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP3ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribP2uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP2uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP2ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP1uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP1ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-    d_3_3_Core->VertexAttribDivisor(index, divisor);
+    d_3_3_Core->f.VertexAttribDivisor(index, divisor);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
 {
-    d_3_3_Core->GetQueryObjectui64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
 {
-    d_3_3_Core->GetQueryObjecti64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjecti64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glQueryCounter(GLuint id, GLenum target)
 {
-    d_3_3_Core->QueryCounter(id, target);
+    d_3_3_Core->f.QueryCounter(id, target);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
 {
-    d_3_3_Core->GetSamplerParameterIuiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIuiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
 {
-    d_3_3_Core->GetSamplerParameterfv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterfv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameterIiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameteriv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameteriv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
 {
-    d_3_3_Core->SamplerParameterIuiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIuiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameterIiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
 {
-    d_3_3_Core->SamplerParameterfv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterfv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-    d_3_3_Core->SamplerParameterf(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterf(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameteriv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteriv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-    d_3_3_Core->SamplerParameteri(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteri(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindSampler(GLuint unit, GLuint sampler)
 {
-    d_3_3_Core->BindSampler(unit, sampler);
+    d_3_3_Core->f.BindSampler(unit, sampler);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Core::glIsSampler(GLuint sampler)
 {
-    return d_3_3_Core->IsSampler(sampler);
+    return d_3_3_Core->f.IsSampler(sampler);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDeleteSamplers(GLsizei count, const GLuint *samplers)
 {
-    d_3_3_Core->DeleteSamplers(count, samplers);
+    d_3_3_Core->f.DeleteSamplers(count, samplers);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGenSamplers(GLsizei count, GLuint *samplers)
 {
-    d_3_3_Core->GenSamplers(count, samplers);
+    d_3_3_Core->f.GenSamplers(count, samplers);
 }
 
 inline GLint QOpenGLFunctions_4_4_Core::glGetFragDataIndex(GLuint program, const GLchar *name)
 {
-    return d_3_3_Core->GetFragDataIndex(program, name);
+    return d_3_3_Core->f.GetFragDataIndex(program, name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
-    d_3_3_Core->BindFragDataLocationIndexed(program, colorNumber, index, name);
+    d_3_3_Core->f.BindFragDataLocationIndexed(program, colorNumber, index, name);
 }
 
 
 // OpenGL 4.0 core functions
 inline void QOpenGLFunctions_4_4_Core::glGetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params)
 {
-    d_4_0_Core->GetQueryIndexediv(target, index, pname, params);
+    d_4_0_Core->f.GetQueryIndexediv(target, index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glEndQueryIndexed(GLenum target, GLuint index)
 {
-    d_4_0_Core->EndQueryIndexed(target, index);
+    d_4_0_Core->f.EndQueryIndexed(target, index);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBeginQueryIndexed(GLenum target, GLuint index, GLuint id)
 {
-    d_4_0_Core->BeginQueryIndexed(target, index, id);
+    d_4_0_Core->f.BeginQueryIndexed(target, index, id);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawTransformFeedbackStream(GLenum mode, GLuint id, GLuint stream)
 {
-    d_4_0_Core->DrawTransformFeedbackStream(mode, id, stream);
+    d_4_0_Core->f.DrawTransformFeedbackStream(mode, id, stream);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawTransformFeedback(GLenum mode, GLuint id)
 {
-    d_4_0_Core->DrawTransformFeedback(mode, id);
+    d_4_0_Core->f.DrawTransformFeedback(mode, id);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glResumeTransformFeedback()
 {
-    d_4_0_Core->ResumeTransformFeedback();
+    d_4_0_Core->f.ResumeTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_4_Core::glPauseTransformFeedback()
 {
-    d_4_0_Core->PauseTransformFeedback();
+    d_4_0_Core->f.PauseTransformFeedback();
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Core::glIsTransformFeedback(GLuint id)
 {
-    return d_4_0_Core->IsTransformFeedback(id);
+    return d_4_0_Core->f.IsTransformFeedback(id);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGenTransformFeedbacks(GLsizei n, GLuint *ids)
 {
-    d_4_0_Core->GenTransformFeedbacks(n, ids);
+    d_4_0_Core->f.GenTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
 {
-    d_4_0_Core->DeleteTransformFeedbacks(n, ids);
+    d_4_0_Core->f.DeleteTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindTransformFeedback(GLenum target, GLuint id)
 {
-    d_4_0_Core->BindTransformFeedback(target, id);
+    d_4_0_Core->f.BindTransformFeedback(target, id);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glPatchParameterfv(GLenum pname, const GLfloat *values)
 {
-    d_4_0_Core->PatchParameterfv(pname, values);
+    d_4_0_Core->f.PatchParameterfv(pname, values);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glPatchParameteri(GLenum pname, GLint value)
 {
-    d_4_0_Core->PatchParameteri(pname, value);
+    d_4_0_Core->f.PatchParameteri(pname, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetProgramStageiv(GLuint program, GLenum shadertype, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetProgramStageiv(program, shadertype, pname, values);
+    d_4_0_Core->f.GetProgramStageiv(program, shadertype, pname, values);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetUniformSubroutineuiv(GLenum shadertype, GLint location, GLuint *params)
 {
-    d_4_0_Core->GetUniformSubroutineuiv(shadertype, location, params);
+    d_4_0_Core->f.GetUniformSubroutineuiv(shadertype, location, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformSubroutinesuiv(GLenum shadertype, GLsizei count, const GLuint *indices)
 {
-    d_4_0_Core->UniformSubroutinesuiv(shadertype, count, indices);
+    d_4_0_Core->f.UniformSubroutinesuiv(shadertype, count, indices);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetActiveSubroutineName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetActiveSubroutineUniformName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
+    d_4_0_Core->f.GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Core::glGetSubroutineIndex(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineIndex(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineIndex(program, shadertype, name);
 }
 
 inline GLint QOpenGLFunctions_4_4_Core::glGetSubroutineUniformLocation(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineUniformLocation(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineUniformLocation(program, shadertype, name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetUniformdv(GLuint program, GLint location, GLdouble *params)
 {
-    d_4_0_Core->GetUniformdv(program, location, params);
+    d_4_0_Core->f.GetUniformdv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix4x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix4x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix3x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix3x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix2x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix2x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniformMatrix2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform4dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform4dv(location, count, value);
+    d_4_0_Core->f.Uniform4dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform3dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform3dv(location, count, value);
+    d_4_0_Core->f.Uniform3dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform2dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform2dv(location, count, value);
+    d_4_0_Core->f.Uniform2dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform1dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform1dv(location, count, value);
+    d_4_0_Core->f.Uniform1dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform4d(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_0_Core->Uniform4d(location, x, y, z, w);
+    d_4_0_Core->f.Uniform4d(location, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform3d(GLint location, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_0_Core->Uniform3d(location, x, y, z);
+    d_4_0_Core->f.Uniform3d(location, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform2d(GLint location, GLdouble x, GLdouble y)
 {
-    d_4_0_Core->Uniform2d(location, x, y);
+    d_4_0_Core->f.Uniform2d(location, x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUniform1d(GLint location, GLdouble x)
 {
-    d_4_0_Core->Uniform1d(location, x);
+    d_4_0_Core->f.Uniform1d(location, x);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect)
 {
-    d_4_0_Core->DrawElementsIndirect(mode, type, indirect);
+    d_4_0_Core->f.DrawElementsIndirect(mode, type, indirect);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawArraysIndirect(GLenum mode, const void *indirect)
 {
-    d_4_0_Core->DrawArraysIndirect(mode, indirect);
+    d_4_0_Core->f.DrawArraysIndirect(mode, indirect);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
 {
-    d_4_0_Core->BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+    d_4_0_Core->f.BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBlendFunci(GLuint buf, GLenum src, GLenum dst)
 {
-    d_4_0_Core->BlendFunci(buf, src, dst);
+    d_4_0_Core->f.BlendFunci(buf, src, dst);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
 {
-    d_4_0_Core->BlendEquationSeparatei(buf, modeRGB, modeAlpha);
+    d_4_0_Core->f.BlendEquationSeparatei(buf, modeRGB, modeAlpha);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBlendEquationi(GLuint buf, GLenum mode)
 {
-    d_4_0_Core->BlendEquationi(buf, mode);
+    d_4_0_Core->f.BlendEquationi(buf, mode);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glMinSampleShading(GLfloat value)
 {
-    d_4_0_Core->MinSampleShading(value);
+    d_4_0_Core->f.MinSampleShading(value);
 }
 
 
 // OpenGL 4.1 core functions
 inline void QOpenGLFunctions_4_4_Core::glGetDoublei_v(GLenum target, GLuint index, GLdouble *data)
 {
-    d_4_1_Core->GetDoublei_v(target, index, data);
+    d_4_1_Core->f.GetDoublei_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetFloati_v(GLenum target, GLuint index, GLfloat *data)
 {
-    d_4_1_Core->GetFloati_v(target, index, data);
+    d_4_1_Core->f.GetFloati_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDepthRangeIndexed(GLuint index, GLdouble n, GLdouble f)
 {
-    d_4_1_Core->DepthRangeIndexed(index, n, f);
+    d_4_1_Core->f.DepthRangeIndexed(index, n, f);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDepthRangeArrayv(GLuint first, GLsizei count, const GLdouble *v)
 {
-    d_4_1_Core->DepthRangeArrayv(first, count, v);
+    d_4_1_Core->f.DepthRangeArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glScissorIndexedv(GLuint index, const GLint *v)
 {
-    d_4_1_Core->ScissorIndexedv(index, v);
+    d_4_1_Core->f.ScissorIndexedv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glScissorIndexed(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height)
 {
-    d_4_1_Core->ScissorIndexed(index, left, bottom, width, height);
+    d_4_1_Core->f.ScissorIndexed(index, left, bottom, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glScissorArrayv(GLuint first, GLsizei count, const GLint *v)
 {
-    d_4_1_Core->ScissorArrayv(first, count, v);
+    d_4_1_Core->f.ScissorArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glViewportIndexedfv(GLuint index, const GLfloat *v)
 {
-    d_4_1_Core->ViewportIndexedfv(index, v);
+    d_4_1_Core->f.ViewportIndexedfv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glViewportIndexedf(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h)
 {
-    d_4_1_Core->ViewportIndexedf(index, x, y, w, h);
+    d_4_1_Core->f.ViewportIndexedf(index, x, y, w, h);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glViewportArrayv(GLuint first, GLsizei count, const GLfloat *v)
 {
-    d_4_1_Core->ViewportArrayv(first, count, v);
+    d_4_1_Core->f.ViewportArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetVertexAttribLdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_4_1_Core->GetVertexAttribLdv(index, pname, params);
+    d_4_1_Core->f.GetVertexAttribLdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribLPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_4_1_Core->VertexAttribLPointer(index, size, type, stride, pointer);
+    d_4_1_Core->f.VertexAttribLPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribL4dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL4dv(index, v);
+    d_4_1_Core->f.VertexAttribL4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribL3dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL3dv(index, v);
+    d_4_1_Core->f.VertexAttribL3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribL2dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL2dv(index, v);
+    d_4_1_Core->f.VertexAttribL2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribL1dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL1dv(index, v);
+    d_4_1_Core->f.VertexAttribL1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribL4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_1_Core->VertexAttribL4d(index, x, y, z, w);
+    d_4_1_Core->f.VertexAttribL4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribL3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_1_Core->VertexAttribL3d(index, x, y, z);
+    d_4_1_Core->f.VertexAttribL3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribL2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_4_1_Core->VertexAttribL2d(index, x, y);
+    d_4_1_Core->f.VertexAttribL2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribL1d(GLuint index, GLdouble x)
 {
-    d_4_1_Core->VertexAttribL1d(index, x);
+    d_4_1_Core->f.VertexAttribL1d(index, x);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetProgramPipelineInfoLog(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_4_1_Core->GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
+    d_4_1_Core->f.GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glValidateProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->ValidateProgramPipeline(pipeline);
+    d_4_1_Core->f.ValidateProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix4x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix3x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix4x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix2x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix3x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix2x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix4x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix3x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix4x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix2x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix3x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix2x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniformMatrix2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform4uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform4uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_4_1_Core->ProgramUniform4ui(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4ui(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform4dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform4dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform4d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3)
 {
-    d_4_1_Core->ProgramUniform4d(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4d(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform4fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform4fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_4_1_Core->ProgramUniform4f(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4f(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform4iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform4iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_4_1_Core->ProgramUniform4i(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4i(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform3uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform3uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_4_1_Core->ProgramUniform3ui(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3ui(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform3dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform3dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform3d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2)
 {
-    d_4_1_Core->ProgramUniform3d(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3d(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform3fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform3fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_4_1_Core->ProgramUniform3f(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3f(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform3iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform3iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_4_1_Core->ProgramUniform3i(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3i(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform2uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform2uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
 {
-    d_4_1_Core->ProgramUniform2ui(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2ui(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform2dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform2dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform2d(GLuint program, GLint location, GLdouble v0, GLdouble v1)
 {
-    d_4_1_Core->ProgramUniform2d(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2d(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform2fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform2fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1)
 {
-    d_4_1_Core->ProgramUniform2f(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2f(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform2iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform2iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
 {
-    d_4_1_Core->ProgramUniform2i(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2i(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform1uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform1uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform1ui(GLuint program, GLint location, GLuint v0)
 {
-    d_4_1_Core->ProgramUniform1ui(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1ui(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform1dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform1dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform1d(GLuint program, GLint location, GLdouble v0)
 {
-    d_4_1_Core->ProgramUniform1d(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1d(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform1fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform1fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform1f(GLuint program, GLint location, GLfloat v0)
 {
-    d_4_1_Core->ProgramUniform1f(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1f(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform1iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform1iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramUniform1i(GLuint program, GLint location, GLint v0)
 {
-    d_4_1_Core->ProgramUniform1i(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1i(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
 {
-    d_4_1_Core->GetProgramPipelineiv(pipeline, pname, params);
+    d_4_1_Core->f.GetProgramPipelineiv(pipeline, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_4_Core::glIsProgramPipeline(GLuint pipeline)
 {
-    return d_4_1_Core->IsProgramPipeline(pipeline);
+    return d_4_1_Core->f.IsProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGenProgramPipelines(GLsizei n, GLuint *pipelines)
 {
-    d_4_1_Core->GenProgramPipelines(n, pipelines);
+    d_4_1_Core->f.GenProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
 {
-    d_4_1_Core->DeleteProgramPipelines(n, pipelines);
+    d_4_1_Core->f.DeleteProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->BindProgramPipeline(pipeline);
+    d_4_1_Core->f.BindProgramPipeline(pipeline);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Core::glCreateShaderProgramv(GLenum type, GLsizei count, const GLchar *const *strings)
 {
-    return d_4_1_Core->CreateShaderProgramv(type, count, strings);
+    return d_4_1_Core->f.CreateShaderProgramv(type, count, strings);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glActiveShaderProgram(GLuint pipeline, GLuint program)
 {
-    d_4_1_Core->ActiveShaderProgram(pipeline, program);
+    d_4_1_Core->f.ActiveShaderProgram(pipeline, program);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glUseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
 {
-    d_4_1_Core->UseProgramStages(pipeline, stages, program);
+    d_4_1_Core->f.UseProgramStages(pipeline, stages, program);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramParameteri(GLuint program, GLenum pname, GLint value)
 {
-    d_4_1_Core->ProgramParameteri(program, pname, value);
+    d_4_1_Core->f.ProgramParameteri(program, pname, value);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glProgramBinary(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length)
 {
-    d_4_1_Core->ProgramBinary(program, binaryFormat, binary, length);
+    d_4_1_Core->f.ProgramBinary(program, binaryFormat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary)
 {
-    d_4_1_Core->GetProgramBinary(program, bufSize, length, binaryFormat, binary);
+    d_4_1_Core->f.GetProgramBinary(program, bufSize, length, binaryFormat, binary);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glClearDepthf(GLfloat dd)
 {
-    d_4_1_Core->ClearDepthf(dd);
+    d_4_1_Core->f.ClearDepthf(dd);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDepthRangef(GLfloat n, GLfloat f)
 {
-    d_4_1_Core->DepthRangef(n, f);
+    d_4_1_Core->f.DepthRangef(n, f);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)
 {
-    d_4_1_Core->GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+    d_4_1_Core->f.GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glShaderBinary(GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length)
 {
-    d_4_1_Core->ShaderBinary(count, shaders, binaryformat, binary, length);
+    d_4_1_Core->f.ShaderBinary(count, shaders, binaryformat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glReleaseShaderCompiler()
 {
-    d_4_1_Core->ReleaseShaderCompiler();
+    d_4_1_Core->f.ReleaseShaderCompiler();
 }
 
 
 // OpenGL 4.2 core functions
 inline void QOpenGLFunctions_4_4_Core::glDrawTransformFeedbackStreamInstanced(GLenum mode, GLuint id, GLuint stream, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawTransformFeedbackInstanced(GLenum mode, GLuint id, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackInstanced(mode, id, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackInstanced(mode, id, instancecount);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_2_Core->TexStorage3D(target, levels, internalformat, width, height, depth);
+    d_4_2_Core->f.TexStorage3D(target, levels, internalformat, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_4_2_Core->TexStorage2D(target, levels, internalformat, width, height);
+    d_4_2_Core->f.TexStorage2D(target, levels, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)
 {
-    d_4_2_Core->TexStorage1D(target, levels, internalformat, width);
+    d_4_2_Core->f.TexStorage1D(target, levels, internalformat, width);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glMemoryBarrier(GLbitfield barriers)
 {
-    d_4_2_Core->MemoryBarrier(barriers);
+    d_4_2_Core->f.MemoryBarrier(barriers);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindImageTexture(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format)
 {
-    d_4_2_Core->BindImageTexture(unit, texture, level, layered, layer, access, format);
+    d_4_2_Core->f.BindImageTexture(unit, texture, level, layered, layer, access, format);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetActiveAtomicCounterBufferiv(GLuint program, GLuint bufferIndex, GLenum pname, GLint *params)
 {
-    d_4_2_Core->GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
+    d_4_2_Core->f.GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params)
 {
-    d_4_2_Core->GetInternalformativ(target, internalformat, pname, bufSize, params);
+    d_4_2_Core->f.GetInternalformativ(target, internalformat, pname, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawElementsInstancedBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDrawArraysInstancedBaseInstance(GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
+    d_4_2_Core->f.DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
 }
 
 
 // OpenGL 4.3 core functions
 inline void QOpenGLFunctions_4_4_Core::glGetObjectPtrLabel(const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label)
 {
-    d_4_3_Core->GetObjectPtrLabel(ptr, bufSize, length, label);
+    d_4_3_Core->f.GetObjectPtrLabel(ptr, bufSize, length, label);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glObjectPtrLabel(const void *ptr, GLsizei length, const GLchar *label)
 {
-    d_4_3_Core->ObjectPtrLabel(ptr, length, label);
+    d_4_3_Core->f.ObjectPtrLabel(ptr, length, label);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetObjectLabel(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label)
 {
-    d_4_3_Core->GetObjectLabel(identifier, name, bufSize, length, label);
+    d_4_3_Core->f.GetObjectLabel(identifier, name, bufSize, length, label);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glObjectLabel(GLenum identifier, GLuint name, GLsizei length, const GLchar *label)
 {
-    d_4_3_Core->ObjectLabel(identifier, name, length, label);
+    d_4_3_Core->f.ObjectLabel(identifier, name, length, label);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glPopDebugGroup()
 {
-    d_4_3_Core->PopDebugGroup();
+    d_4_3_Core->f.PopDebugGroup();
 }
 
 inline void QOpenGLFunctions_4_4_Core::glPushDebugGroup(GLenum source, GLuint id, GLsizei length, const GLchar *message)
 {
-    d_4_3_Core->PushDebugGroup(source, id, length, message);
+    d_4_3_Core->f.PushDebugGroup(source, id, length, message);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Core::glGetDebugMessageLog(GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog)
 {
-    return d_4_3_Core->GetDebugMessageLog(count, bufSize, sources, types, ids, severities, lengths, messageLog);
+    return d_4_3_Core->f.GetDebugMessageLog(count, bufSize, sources, types, ids, severities, lengths, messageLog);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDebugMessageCallback(GLDEBUGPROC callback, const void *userParam)
 {
-    d_4_3_Core->DebugMessageCallback(callback, userParam);
+    d_4_3_Core->f.DebugMessageCallback(callback, userParam);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf)
 {
-    d_4_3_Core->DebugMessageInsert(source, type, id, severity, length, buf);
+    d_4_3_Core->f.DebugMessageInsert(source, type, id, severity, length, buf);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDebugMessageControl(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled)
 {
-    d_4_3_Core->DebugMessageControl(source, type, severity, count, ids, enabled);
+    d_4_3_Core->f.DebugMessageControl(source, type, severity, count, ids, enabled);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexBindingDivisor(GLuint bindingindex, GLuint divisor)
 {
-    d_4_3_Core->VertexBindingDivisor(bindingindex, divisor);
+    d_4_3_Core->f.VertexBindingDivisor(bindingindex, divisor);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribBinding(GLuint attribindex, GLuint bindingindex)
 {
-    d_4_3_Core->VertexAttribBinding(attribindex, bindingindex);
+    d_4_3_Core->f.VertexAttribBinding(attribindex, bindingindex);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribLFormat(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribLFormat(attribindex, size, type, relativeoffset);
+    d_4_3_Core->f.VertexAttribLFormat(attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribIFormat(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribIFormat(attribindex, size, type, relativeoffset);
+    d_4_3_Core->f.VertexAttribIFormat(attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glVertexAttribFormat(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
+    d_4_3_Core->f.VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindVertexBuffer(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride)
 {
-    d_4_3_Core->BindVertexBuffer(bindingindex, buffer, offset, stride);
+    d_4_3_Core->f.BindVertexBuffer(bindingindex, buffer, offset, stride);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTextureView(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers)
 {
-    d_4_3_Core->TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers);
+    d_4_3_Core->f.TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_4_3_Core->TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_4_3_Core->f.TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexStorage2DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_4_3_Core->TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_4_3_Core->f.TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glTexBufferRange(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_4_3_Core->TexBufferRange(target, internalformat, buffer, offset, size);
+    d_4_3_Core->f.TexBufferRange(target, internalformat, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glShaderStorageBlockBinding(GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding)
 {
-    d_4_3_Core->ShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
+    d_4_3_Core->f.ShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
 }
 
 inline GLint QOpenGLFunctions_4_4_Core::glGetProgramResourceLocationIndex(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceLocationIndex(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceLocationIndex(program, programInterface, name);
 }
 
 inline GLint QOpenGLFunctions_4_4_Core::glGetProgramResourceLocation(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceLocation(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceLocation(program, programInterface, name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetProgramResourceiv(GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params)
 {
-    d_4_3_Core->GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
+    d_4_3_Core->f.GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetProgramResourceName(GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name)
 {
-    d_4_3_Core->GetProgramResourceName(program, programInterface, index, bufSize, length, name);
+    d_4_3_Core->f.GetProgramResourceName(program, programInterface, index, bufSize, length, name);
 }
 
 inline GLuint QOpenGLFunctions_4_4_Core::glGetProgramResourceIndex(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceIndex(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceIndex(program, programInterface, name);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetProgramInterfaceiv(GLuint program, GLenum programInterface, GLenum pname, GLint *params)
 {
-    d_4_3_Core->GetProgramInterfaceiv(program, programInterface, pname, params);
+    d_4_3_Core->f.GetProgramInterfaceiv(program, programInterface, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glMultiDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride)
 {
-    d_4_3_Core->MultiDrawElementsIndirect(mode, type, indirect, drawcount, stride);
+    d_4_3_Core->f.MultiDrawElementsIndirect(mode, type, indirect, drawcount, stride);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glMultiDrawArraysIndirect(GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride)
 {
-    d_4_3_Core->MultiDrawArraysIndirect(mode, indirect, drawcount, stride);
+    d_4_3_Core->f.MultiDrawArraysIndirect(mode, indirect, drawcount, stride);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_4_3_Core->InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
+    d_4_3_Core->f.InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glInvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments)
 {
-    d_4_3_Core->InvalidateFramebuffer(target, numAttachments, attachments);
+    d_4_3_Core->f.InvalidateFramebuffer(target, numAttachments, attachments);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glInvalidateBufferData(GLuint buffer)
 {
-    d_4_3_Core->InvalidateBufferData(buffer);
+    d_4_3_Core->f.InvalidateBufferData(buffer);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glInvalidateBufferSubData(GLuint buffer, GLintptr offset, GLsizeiptr length)
 {
-    d_4_3_Core->InvalidateBufferSubData(buffer, offset, length);
+    d_4_3_Core->f.InvalidateBufferSubData(buffer, offset, length);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glInvalidateTexImage(GLuint texture, GLint level)
 {
-    d_4_3_Core->InvalidateTexImage(texture, level);
+    d_4_3_Core->f.InvalidateTexImage(texture, level);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glInvalidateTexSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_3_Core->InvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
+    d_4_3_Core->f.InvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetInternalformati64v(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params)
 {
-    d_4_3_Core->GetInternalformati64v(target, internalformat, pname, bufSize, params);
+    d_4_3_Core->f.GetInternalformati64v(target, internalformat, pname, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glGetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_4_3_Core->GetFramebufferParameteriv(target, pname, params);
+    d_4_3_Core->f.GetFramebufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glFramebufferParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_4_3_Core->FramebufferParameteri(target, pname, param);
+    d_4_3_Core->f.FramebufferParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glCopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth)
 {
-    d_4_3_Core->CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth);
+    d_4_3_Core->f.CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDispatchComputeIndirect(GLintptr indirect)
 {
-    d_4_3_Core->DispatchComputeIndirect(indirect);
+    d_4_3_Core->f.DispatchComputeIndirect(indirect);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glDispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z)
 {
-    d_4_3_Core->DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
+    d_4_3_Core->f.DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glClearBufferSubData(GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data)
 {
-    d_4_3_Core->ClearBufferSubData(target, internalformat, offset, size, format, type, data);
+    d_4_3_Core->f.ClearBufferSubData(target, internalformat, offset, size, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glClearBufferData(GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data)
 {
-    d_4_3_Core->ClearBufferData(target, internalformat, format, type, data);
+    d_4_3_Core->f.ClearBufferData(target, internalformat, format, type, data);
 }
 
 
 // OpenGL 4.4 core functions
 inline void QOpenGLFunctions_4_4_Core::glBindVertexBuffers(GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides)
 {
-    d_4_4_Core->BindVertexBuffers(first, count, buffers, offsets, strides);
+    d_4_4_Core->f.BindVertexBuffers(first, count, buffers, offsets, strides);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindImageTextures(GLuint first, GLsizei count, const GLuint *textures)
 {
-    d_4_4_Core->BindImageTextures(first, count, textures);
+    d_4_4_Core->f.BindImageTextures(first, count, textures);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindSamplers(GLuint first, GLsizei count, const GLuint *samplers)
 {
-    d_4_4_Core->BindSamplers(first, count, samplers);
+    d_4_4_Core->f.BindSamplers(first, count, samplers);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindTextures(GLuint first, GLsizei count, const GLuint *textures)
 {
-    d_4_4_Core->BindTextures(first, count, textures);
+    d_4_4_Core->f.BindTextures(first, count, textures);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindBuffersRange(GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes)
 {
-    d_4_4_Core->BindBuffersRange(target, first, count, buffers, offsets, sizes);
+    d_4_4_Core->f.BindBuffersRange(target, first, count, buffers, offsets, sizes);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBindBuffersBase(GLenum target, GLuint first, GLsizei count, const GLuint *buffers)
 {
-    d_4_4_Core->BindBuffersBase(target, first, count, buffers);
+    d_4_4_Core->f.BindBuffersBase(target, first, count, buffers);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glClearTexSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data)
 {
-    d_4_4_Core->ClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data);
+    d_4_4_Core->f.ClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glClearTexImage(GLuint texture, GLint level, GLenum format, GLenum type, const void *data)
 {
-    d_4_4_Core->ClearTexImage(texture, level, format, type, data);
+    d_4_4_Core->f.ClearTexImage(texture, level, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_4_Core::glBufferStorage(GLenum target, GLsizeiptr size, const void *data, GLbitfield flags)
 {
-    d_4_4_Core->BufferStorage(target, size, data, flags);
+    d_4_4_Core->f.BufferStorage(target, size, data, flags);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_4_5_compatibility.cpp b/src/gui/opengl/qopenglfunctions_4_5_compatibility.cpp
index 5c2d987085..81ee8559a5 100644
--- a/src/gui/opengl/qopenglfunctions_4_5_compatibility.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_5_compatibility.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtWidgets module of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -91,106 +97,81 @@ QOpenGLFunctions_4_5_Compatibility::QOpenGLFunctions_4_5_Compatibility()
 
 QOpenGLFunctions_4_5_Compatibility::~QOpenGLFunctions_4_5_Compatibility()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_3_3_Core && !d_3_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Core->context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        delete d_3_3_Core;
-    }
-    if (d_4_0_Core && !d_4_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_0_Core->context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        delete d_4_0_Core;
-    }
-    if (d_4_1_Core && !d_4_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_1_Core->context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        delete d_4_1_Core;
-    }
-    if (d_4_2_Core && !d_4_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_2_Core->context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        delete d_4_2_Core;
-    }
-    if (d_4_3_Core && !d_4_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_3_Core->context, QOpenGLFunctions_4_3_CoreBackend::versionStatus());
-        delete d_4_3_Core;
-    }
-    if (d_4_4_Core && !d_4_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_4_Core->context, QOpenGLFunctions_4_4_CoreBackend::versionStatus());
-        delete d_4_4_Core;
-    }
-    if (d_4_5_Core && !d_4_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_5_Core->context, QOpenGLFunctions_4_5_CoreBackend::versionStatus());
-        delete d_4_5_Core;
-    }
-    if (d_1_0_Deprecated && !d_1_0_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Deprecated->context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        delete d_1_0_Deprecated;
-    }
-    if (d_1_1_Deprecated && !d_1_1_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Deprecated->context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        delete d_1_1_Deprecated;
-    }
-    if (d_1_2_Deprecated && !d_1_2_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Deprecated->context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        delete d_1_2_Deprecated;
-    }
-    if (d_1_3_Deprecated && !d_1_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Deprecated->context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        delete d_1_3_Deprecated;
-    }
-    if (d_1_4_Deprecated && !d_1_4_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Deprecated->context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        delete d_1_4_Deprecated;
-    }
-    if (d_3_3_Deprecated && !d_3_3_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Deprecated->context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus());
-        delete d_3_3_Deprecated;
-    }
-    if (d_4_5_Deprecated && !d_4_5_Deprecated->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_5_Deprecated->context, QOpenGLFunctions_4_5_DeprecatedBackend::versionStatus());
-        delete d_4_5_Deprecated;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_3_3_Core)
+        d_3_3_Core->refs.deref();
+    Q_ASSERT(d_3_3_Core->refs.load());
+    if (d_4_0_Core)
+        d_4_0_Core->refs.deref();
+    Q_ASSERT(d_4_0_Core->refs.load());
+    if (d_4_1_Core)
+        d_4_1_Core->refs.deref();
+    Q_ASSERT(d_4_1_Core->refs.load());
+    if (d_4_2_Core)
+        d_4_2_Core->refs.deref();
+    Q_ASSERT(d_4_2_Core->refs.load());
+    if (d_4_3_Core)
+        d_4_3_Core->refs.deref();
+    Q_ASSERT(d_4_3_Core->refs.load());
+    if (d_4_4_Core)
+        d_4_4_Core->refs.deref();
+    Q_ASSERT(d_4_4_Core->refs.load());
+    if (d_4_5_Core)
+        d_4_5_Core->refs.deref();
+    Q_ASSERT(d_4_5_Core->refs.load());
+    if (d_1_0_Deprecated)
+        d_1_0_Deprecated->refs.deref();
+    Q_ASSERT(d_1_0_Deprecated->refs.load());
+    if (d_1_1_Deprecated)
+        d_1_1_Deprecated->refs.deref();
+    Q_ASSERT(d_1_1_Deprecated->refs.load());
+    if (d_1_2_Deprecated)
+        d_1_2_Deprecated->refs.deref();
+    Q_ASSERT(d_1_2_Deprecated->refs.load());
+    if (d_1_3_Deprecated)
+        d_1_3_Deprecated->refs.deref();
+    Q_ASSERT(d_1_3_Deprecated->refs.load());
+    if (d_1_4_Deprecated)
+        d_1_4_Deprecated->refs.deref();
+    Q_ASSERT(d_1_4_Deprecated->refs.load());
+    if (d_3_3_Deprecated)
+        d_3_3_Deprecated->refs.deref();
+    Q_ASSERT(d_3_3_Deprecated->refs.load());
+    if (d_4_5_Deprecated)
+        d_4_5_Deprecated->refs.deref();
+    Q_ASSERT(d_4_5_Deprecated->refs.load());
 }
 
 bool QOpenGLFunctions_4_5_Compatibility::initializeOpenGLFunctions()
@@ -209,202 +190,102 @@ bool QOpenGLFunctions_4_5_Compatibility::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus(), d);
-        }
         d_3_3_Core = static_cast<QOpenGLFunctions_3_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus(), d);
-        }
         d_4_0_Core = static_cast<QOpenGLFunctions_4_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus(), d);
-        }
         d_4_1_Core = static_cast<QOpenGLFunctions_4_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus(), d);
-        }
         d_4_2_Core = static_cast<QOpenGLFunctions_4_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_3_CoreBackend::versionStatus(), d);
-        }
         d_4_3_Core = static_cast<QOpenGLFunctions_4_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_4_CoreBackend::versionStatus(), d);
-        }
         d_4_4_Core = static_cast<QOpenGLFunctions_4_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_5_CoreBackend::versionStatus(), d);
-        }
         d_4_5_Core = static_cast<QOpenGLFunctions_4_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_0_Deprecated = static_cast<QOpenGLFunctions_1_0_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_1_Deprecated = static_cast<QOpenGLFunctions_1_1_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_2_Deprecated = static_cast<QOpenGLFunctions_1_2_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_3_Deprecated = static_cast<QOpenGLFunctions_1_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus(), d);
-        }
         d_1_4_Deprecated = static_cast<QOpenGLFunctions_1_4_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus(), d);
-        }
         d_3_3_Deprecated = static_cast<QOpenGLFunctions_3_3_DeprecatedBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_5_DeprecatedBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_5_DeprecatedBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_5_DeprecatedBackend::versionStatus(), d);
-        }
         d_4_5_Deprecated = static_cast<QOpenGLFunctions_4_5_DeprecatedBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_4_5_compatibility.h b/src/gui/opengl/qopenglfunctions_4_5_compatibility.h
index 5540cf6433..1c50dafd65 100644
--- a/src/gui/opengl/qopenglfunctions_4_5_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_4_5_compatibility.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -1240,5196 +1247,5196 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, void *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_5_Compatibility::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetIntegerv(GLenum pname, GLint *data)
 {
-    d_1_0_Core->GetIntegerv(pname, data);
+    d_1_0_Core->f.GetIntegerv(pname, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetFloatv(GLenum pname, GLfloat *data)
 {
-    d_1_0_Core->GetFloatv(pname, data);
+    d_1_0_Core->f.GetFloatv(pname, data);
 }
 
 inline GLenum QOpenGLFunctions_4_5_Compatibility::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetDoublev(GLenum pname, GLdouble *data)
 {
-    d_1_0_Core->GetDoublev(pname, data);
+    d_1_0_Core->f.GetDoublev(pname, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetBooleanv(GLenum pname, GLboolean *data)
 {
-    d_1_0_Core->GetBooleanv(pname, data);
+    d_1_0_Core->f.GetBooleanv(pname, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glReadBuffer(GLenum src)
 {
-    d_1_0_Core->ReadBuffer(src);
+    d_1_0_Core->f.ReadBuffer(src);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawBuffer(GLenum buf)
 {
-    d_1_0_Core->DrawBuffer(buf);
+    d_1_0_Core->f.DrawBuffer(buf);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawElements(GLenum mode, GLsizei count, GLenum type, const void *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glGetCompressedTexImage(GLenum target, GLint level, void *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glGetBufferPointerv(GLenum target, GLenum pname, void * *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline void * QOpenGLFunctions_4_5_Compatibility::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, void *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4usv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4usv(index, v);
+    d_2_0_Core->f.VertexAttrib4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4uiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4uiv(index, v);
+    d_2_0_Core->f.VertexAttrib4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4ubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4ubv(index, v);
+    d_2_0_Core->f.VertexAttrib4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4sv(index, v);
+    d_2_0_Core->f.VertexAttrib4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_2_0_Core->VertexAttrib4s(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4s(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4iv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4iv(index, v);
+    d_2_0_Core->f.VertexAttrib4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib4fv(index, v);
+    d_2_0_Core->f.VertexAttrib4fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_2_0_Core->VertexAttrib4f(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4f(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib4dv(index, v);
+    d_2_0_Core->f.VertexAttrib4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_2_0_Core->VertexAttrib4d(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4bv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4bv(index, v);
+    d_2_0_Core->f.VertexAttrib4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4Nusv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4Nusv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nusv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4Nuiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4Nuiv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nuiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4Nubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nubv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-    d_2_0_Core->VertexAttrib4Nub(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4Nub(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4Nsv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4Nsv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nsv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4Niv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4Niv(index, v);
+    d_2_0_Core->f.VertexAttrib4Niv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib4Nbv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nbv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nbv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib3sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib3sv(index, v);
+    d_2_0_Core->f.VertexAttrib3sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-    d_2_0_Core->VertexAttrib3s(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3s(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib3fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib3fv(index, v);
+    d_2_0_Core->f.VertexAttrib3fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_2_0_Core->VertexAttrib3f(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3f(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib3dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib3dv(index, v);
+    d_2_0_Core->f.VertexAttrib3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_2_0_Core->VertexAttrib3d(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib2sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib2sv(index, v);
+    d_2_0_Core->f.VertexAttrib2sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib2s(GLuint index, GLshort x, GLshort y)
 {
-    d_2_0_Core->VertexAttrib2s(index, x, y);
+    d_2_0_Core->f.VertexAttrib2s(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib2fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib2fv(index, v);
+    d_2_0_Core->f.VertexAttrib2fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    d_2_0_Core->VertexAttrib2f(index, x, y);
+    d_2_0_Core->f.VertexAttrib2f(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib2dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib2dv(index, v);
+    d_2_0_Core->f.VertexAttrib2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_2_0_Core->VertexAttrib2d(index, x, y);
+    d_2_0_Core->f.VertexAttrib2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib1sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib1sv(index, v);
+    d_2_0_Core->f.VertexAttrib1sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib1s(GLuint index, GLshort x)
 {
-    d_2_0_Core->VertexAttrib1s(index, x);
+    d_2_0_Core->f.VertexAttrib1s(index, x);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib1fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib1fv(index, v);
+    d_2_0_Core->f.VertexAttrib1fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    d_2_0_Core->VertexAttrib1f(index, x);
+    d_2_0_Core->f.VertexAttrib1f(index, x);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib1dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib1dv(index, v);
+    d_2_0_Core->f.VertexAttrib1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttrib1d(GLuint index, GLdouble x)
 {
-    d_2_0_Core->VertexAttrib1d(index, x);
+    d_2_0_Core->f.VertexAttrib1d(index, x);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glShaderSource(GLuint shader, GLsizei count, const GLchar *const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetVertexAttribPointerv(GLuint index, GLenum pname, void * *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_4_5_Compatibility::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_4_5_Compatibility::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, shaders);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, shaders);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Compatibility::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Compatibility::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline void * QOpenGLFunctions_4_5_Compatibility::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_4_5_Compatibility::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_5_Compatibility::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_4_5_Compatibility::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI4usv(GLuint index, const GLushort *v)
 {
-    d_3_0_Core->VertexAttribI4usv(index, v);
+    d_3_0_Core->f.VertexAttribI4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI4ubv(GLuint index, const GLubyte *v)
 {
-    d_3_0_Core->VertexAttribI4ubv(index, v);
+    d_3_0_Core->f.VertexAttribI4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI4sv(GLuint index, const GLshort *v)
 {
-    d_3_0_Core->VertexAttribI4sv(index, v);
+    d_3_0_Core->f.VertexAttribI4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI4bv(GLuint index, const GLbyte *v)
 {
-    d_3_0_Core->VertexAttribI4bv(index, v);
+    d_3_0_Core->f.VertexAttribI4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI4uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI4uiv(index, v);
+    d_3_0_Core->f.VertexAttribI4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI3uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI3uiv(index, v);
+    d_3_0_Core->f.VertexAttribI3uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI2uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI2uiv(index, v);
+    d_3_0_Core->f.VertexAttribI2uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI1uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI1uiv(index, v);
+    d_3_0_Core->f.VertexAttribI1uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI4iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI4iv(index, v);
+    d_3_0_Core->f.VertexAttribI4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI3iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI3iv(index, v);
+    d_3_0_Core->f.VertexAttribI3iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI2iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI2iv(index, v);
+    d_3_0_Core->f.VertexAttribI2iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI1iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI1iv(index, v);
+    d_3_0_Core->f.VertexAttribI1iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
-    d_3_0_Core->VertexAttribI4ui(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4ui(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI3ui(GLuint index, GLuint x, GLuint y, GLuint z)
 {
-    d_3_0_Core->VertexAttribI3ui(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3ui(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI2ui(GLuint index, GLuint x, GLuint y)
 {
-    d_3_0_Core->VertexAttribI2ui(index, x, y);
+    d_3_0_Core->f.VertexAttribI2ui(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI1ui(GLuint index, GLuint x)
 {
-    d_3_0_Core->VertexAttribI1ui(index, x);
+    d_3_0_Core->f.VertexAttribI1ui(index, x);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
-    d_3_0_Core->VertexAttribI4i(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4i(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI3i(GLuint index, GLint x, GLint y, GLint z)
 {
-    d_3_0_Core->VertexAttribI3i(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3i(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI2i(GLuint index, GLint x, GLint y)
 {
-    d_3_0_Core->VertexAttribI2i(index, x, y);
+    d_3_0_Core->f.VertexAttribI2i(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribI1i(GLuint index, GLint x)
 {
-    d_3_0_Core->VertexAttribI1i(index, x);
+    d_3_0_Core->f.VertexAttribI1i(index, x);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar *const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Compatibility::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glSampleMaski(GLuint maskNumber, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(maskNumber, mask);
+    d_3_2_Core->f.SampleMaski(maskNumber, mask);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexImage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexImage2DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetInteger64v(GLenum pname, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64v(pname, data);
+    d_3_2_Core->f.GetInteger64v(pname, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_4_5_Compatibility::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_4_5_Compatibility::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 
 // OpenGL 3.3 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP4uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribP4ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP4ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribP3uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP3uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribP3ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP3ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribP2uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP2uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP2ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP1uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP1ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-    d_3_3_Core->VertexAttribDivisor(index, divisor);
+    d_3_3_Core->f.VertexAttribDivisor(index, divisor);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
 {
-    d_3_3_Core->GetQueryObjectui64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
 {
-    d_3_3_Core->GetQueryObjecti64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjecti64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glQueryCounter(GLuint id, GLenum target)
 {
-    d_3_3_Core->QueryCounter(id, target);
+    d_3_3_Core->f.QueryCounter(id, target);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
 {
-    d_3_3_Core->GetSamplerParameterIuiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIuiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
 {
-    d_3_3_Core->GetSamplerParameterfv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterfv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameterIiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameteriv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameteriv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
 {
-    d_3_3_Core->SamplerParameterIuiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIuiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameterIiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
 {
-    d_3_3_Core->SamplerParameterfv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterfv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-    d_3_3_Core->SamplerParameterf(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterf(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameteriv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteriv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-    d_3_3_Core->SamplerParameteri(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteri(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindSampler(GLuint unit, GLuint sampler)
 {
-    d_3_3_Core->BindSampler(unit, sampler);
+    d_3_3_Core->f.BindSampler(unit, sampler);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsSampler(GLuint sampler)
 {
-    return d_3_3_Core->IsSampler(sampler);
+    return d_3_3_Core->f.IsSampler(sampler);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDeleteSamplers(GLsizei count, const GLuint *samplers)
 {
-    d_3_3_Core->DeleteSamplers(count, samplers);
+    d_3_3_Core->f.DeleteSamplers(count, samplers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGenSamplers(GLsizei count, GLuint *samplers)
 {
-    d_3_3_Core->GenSamplers(count, samplers);
+    d_3_3_Core->f.GenSamplers(count, samplers);
 }
 
 inline GLint QOpenGLFunctions_4_5_Compatibility::glGetFragDataIndex(GLuint program, const GLchar *name)
 {
-    return d_3_3_Core->GetFragDataIndex(program, name);
+    return d_3_3_Core->f.GetFragDataIndex(program, name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
-    d_3_3_Core->BindFragDataLocationIndexed(program, colorNumber, index, name);
+    d_3_3_Core->f.BindFragDataLocationIndexed(program, colorNumber, index, name);
 }
 
 
 // OpenGL 4.0 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glGetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params)
 {
-    d_4_0_Core->GetQueryIndexediv(target, index, pname, params);
+    d_4_0_Core->f.GetQueryIndexediv(target, index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEndQueryIndexed(GLenum target, GLuint index)
 {
-    d_4_0_Core->EndQueryIndexed(target, index);
+    d_4_0_Core->f.EndQueryIndexed(target, index);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBeginQueryIndexed(GLenum target, GLuint index, GLuint id)
 {
-    d_4_0_Core->BeginQueryIndexed(target, index, id);
+    d_4_0_Core->f.BeginQueryIndexed(target, index, id);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawTransformFeedbackStream(GLenum mode, GLuint id, GLuint stream)
 {
-    d_4_0_Core->DrawTransformFeedbackStream(mode, id, stream);
+    d_4_0_Core->f.DrawTransformFeedbackStream(mode, id, stream);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawTransformFeedback(GLenum mode, GLuint id)
 {
-    d_4_0_Core->DrawTransformFeedback(mode, id);
+    d_4_0_Core->f.DrawTransformFeedback(mode, id);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glResumeTransformFeedback()
 {
-    d_4_0_Core->ResumeTransformFeedback();
+    d_4_0_Core->f.ResumeTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPauseTransformFeedback()
 {
-    d_4_0_Core->PauseTransformFeedback();
+    d_4_0_Core->f.PauseTransformFeedback();
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsTransformFeedback(GLuint id)
 {
-    return d_4_0_Core->IsTransformFeedback(id);
+    return d_4_0_Core->f.IsTransformFeedback(id);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGenTransformFeedbacks(GLsizei n, GLuint *ids)
 {
-    d_4_0_Core->GenTransformFeedbacks(n, ids);
+    d_4_0_Core->f.GenTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
 {
-    d_4_0_Core->DeleteTransformFeedbacks(n, ids);
+    d_4_0_Core->f.DeleteTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindTransformFeedback(GLenum target, GLuint id)
 {
-    d_4_0_Core->BindTransformFeedback(target, id);
+    d_4_0_Core->f.BindTransformFeedback(target, id);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPatchParameterfv(GLenum pname, const GLfloat *values)
 {
-    d_4_0_Core->PatchParameterfv(pname, values);
+    d_4_0_Core->f.PatchParameterfv(pname, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPatchParameteri(GLenum pname, GLint value)
 {
-    d_4_0_Core->PatchParameteri(pname, value);
+    d_4_0_Core->f.PatchParameteri(pname, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetProgramStageiv(GLuint program, GLenum shadertype, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetProgramStageiv(program, shadertype, pname, values);
+    d_4_0_Core->f.GetProgramStageiv(program, shadertype, pname, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetUniformSubroutineuiv(GLenum shadertype, GLint location, GLuint *params)
 {
-    d_4_0_Core->GetUniformSubroutineuiv(shadertype, location, params);
+    d_4_0_Core->f.GetUniformSubroutineuiv(shadertype, location, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformSubroutinesuiv(GLenum shadertype, GLsizei count, const GLuint *indices)
 {
-    d_4_0_Core->UniformSubroutinesuiv(shadertype, count, indices);
+    d_4_0_Core->f.UniformSubroutinesuiv(shadertype, count, indices);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetActiveSubroutineName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetActiveSubroutineUniformName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
+    d_4_0_Core->f.GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Compatibility::glGetSubroutineIndex(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineIndex(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineIndex(program, shadertype, name);
 }
 
 inline GLint QOpenGLFunctions_4_5_Compatibility::glGetSubroutineUniformLocation(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineUniformLocation(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineUniformLocation(program, shadertype, name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetUniformdv(GLuint program, GLint location, GLdouble *params)
 {
-    d_4_0_Core->GetUniformdv(program, location, params);
+    d_4_0_Core->f.GetUniformdv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix4x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix4x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix3x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix3x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix2x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix2x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniformMatrix2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform4dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform4dv(location, count, value);
+    d_4_0_Core->f.Uniform4dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform3dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform3dv(location, count, value);
+    d_4_0_Core->f.Uniform3dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform2dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform2dv(location, count, value);
+    d_4_0_Core->f.Uniform2dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform1dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform1dv(location, count, value);
+    d_4_0_Core->f.Uniform1dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform4d(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_0_Core->Uniform4d(location, x, y, z, w);
+    d_4_0_Core->f.Uniform4d(location, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform3d(GLint location, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_0_Core->Uniform3d(location, x, y, z);
+    d_4_0_Core->f.Uniform3d(location, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform2d(GLint location, GLdouble x, GLdouble y)
 {
-    d_4_0_Core->Uniform2d(location, x, y);
+    d_4_0_Core->f.Uniform2d(location, x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUniform1d(GLint location, GLdouble x)
 {
-    d_4_0_Core->Uniform1d(location, x);
+    d_4_0_Core->f.Uniform1d(location, x);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect)
 {
-    d_4_0_Core->DrawElementsIndirect(mode, type, indirect);
+    d_4_0_Core->f.DrawElementsIndirect(mode, type, indirect);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawArraysIndirect(GLenum mode, const void *indirect)
 {
-    d_4_0_Core->DrawArraysIndirect(mode, indirect);
+    d_4_0_Core->f.DrawArraysIndirect(mode, indirect);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
 {
-    d_4_0_Core->BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+    d_4_0_Core->f.BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBlendFunci(GLuint buf, GLenum src, GLenum dst)
 {
-    d_4_0_Core->BlendFunci(buf, src, dst);
+    d_4_0_Core->f.BlendFunci(buf, src, dst);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
 {
-    d_4_0_Core->BlendEquationSeparatei(buf, modeRGB, modeAlpha);
+    d_4_0_Core->f.BlendEquationSeparatei(buf, modeRGB, modeAlpha);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBlendEquationi(GLuint buf, GLenum mode)
 {
-    d_4_0_Core->BlendEquationi(buf, mode);
+    d_4_0_Core->f.BlendEquationi(buf, mode);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMinSampleShading(GLfloat value)
 {
-    d_4_0_Core->MinSampleShading(value);
+    d_4_0_Core->f.MinSampleShading(value);
 }
 
 
 // OpenGL 4.1 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glGetDoublei_v(GLenum target, GLuint index, GLdouble *data)
 {
-    d_4_1_Core->GetDoublei_v(target, index, data);
+    d_4_1_Core->f.GetDoublei_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetFloati_v(GLenum target, GLuint index, GLfloat *data)
 {
-    d_4_1_Core->GetFloati_v(target, index, data);
+    d_4_1_Core->f.GetFloati_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDepthRangeIndexed(GLuint index, GLdouble n, GLdouble f)
 {
-    d_4_1_Core->DepthRangeIndexed(index, n, f);
+    d_4_1_Core->f.DepthRangeIndexed(index, n, f);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDepthRangeArrayv(GLuint first, GLsizei count, const GLdouble *v)
 {
-    d_4_1_Core->DepthRangeArrayv(first, count, v);
+    d_4_1_Core->f.DepthRangeArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glScissorIndexedv(GLuint index, const GLint *v)
 {
-    d_4_1_Core->ScissorIndexedv(index, v);
+    d_4_1_Core->f.ScissorIndexedv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glScissorIndexed(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height)
 {
-    d_4_1_Core->ScissorIndexed(index, left, bottom, width, height);
+    d_4_1_Core->f.ScissorIndexed(index, left, bottom, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glScissorArrayv(GLuint first, GLsizei count, const GLint *v)
 {
-    d_4_1_Core->ScissorArrayv(first, count, v);
+    d_4_1_Core->f.ScissorArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glViewportIndexedfv(GLuint index, const GLfloat *v)
 {
-    d_4_1_Core->ViewportIndexedfv(index, v);
+    d_4_1_Core->f.ViewportIndexedfv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glViewportIndexedf(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h)
 {
-    d_4_1_Core->ViewportIndexedf(index, x, y, w, h);
+    d_4_1_Core->f.ViewportIndexedf(index, x, y, w, h);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glViewportArrayv(GLuint first, GLsizei count, const GLfloat *v)
 {
-    d_4_1_Core->ViewportArrayv(first, count, v);
+    d_4_1_Core->f.ViewportArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetVertexAttribLdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_4_1_Core->GetVertexAttribLdv(index, pname, params);
+    d_4_1_Core->f.GetVertexAttribLdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribLPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_4_1_Core->VertexAttribLPointer(index, size, type, stride, pointer);
+    d_4_1_Core->f.VertexAttribLPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribL4dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL4dv(index, v);
+    d_4_1_Core->f.VertexAttribL4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribL3dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL3dv(index, v);
+    d_4_1_Core->f.VertexAttribL3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribL2dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL2dv(index, v);
+    d_4_1_Core->f.VertexAttribL2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribL1dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL1dv(index, v);
+    d_4_1_Core->f.VertexAttribL1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribL4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_1_Core->VertexAttribL4d(index, x, y, z, w);
+    d_4_1_Core->f.VertexAttribL4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribL3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_1_Core->VertexAttribL3d(index, x, y, z);
+    d_4_1_Core->f.VertexAttribL3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribL2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_4_1_Core->VertexAttribL2d(index, x, y);
+    d_4_1_Core->f.VertexAttribL2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribL1d(GLuint index, GLdouble x)
 {
-    d_4_1_Core->VertexAttribL1d(index, x);
+    d_4_1_Core->f.VertexAttribL1d(index, x);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetProgramPipelineInfoLog(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_4_1_Core->GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
+    d_4_1_Core->f.GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glValidateProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->ValidateProgramPipeline(pipeline);
+    d_4_1_Core->f.ValidateProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix4x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix3x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix4x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix2x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix3x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix2x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix4x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix3x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix4x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix2x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix3x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix2x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniformMatrix2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform4uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform4uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_4_1_Core->ProgramUniform4ui(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4ui(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform4dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform4dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform4d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3)
 {
-    d_4_1_Core->ProgramUniform4d(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4d(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform4fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform4fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_4_1_Core->ProgramUniform4f(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4f(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform4iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform4iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_4_1_Core->ProgramUniform4i(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4i(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform3uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform3uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_4_1_Core->ProgramUniform3ui(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3ui(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform3dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform3dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform3d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2)
 {
-    d_4_1_Core->ProgramUniform3d(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3d(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform3fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform3fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_4_1_Core->ProgramUniform3f(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3f(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform3iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform3iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_4_1_Core->ProgramUniform3i(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3i(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform2uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform2uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
 {
-    d_4_1_Core->ProgramUniform2ui(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2ui(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform2dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform2dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform2d(GLuint program, GLint location, GLdouble v0, GLdouble v1)
 {
-    d_4_1_Core->ProgramUniform2d(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2d(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform2fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform2fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1)
 {
-    d_4_1_Core->ProgramUniform2f(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2f(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform2iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform2iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
 {
-    d_4_1_Core->ProgramUniform2i(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2i(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform1uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform1uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform1ui(GLuint program, GLint location, GLuint v0)
 {
-    d_4_1_Core->ProgramUniform1ui(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1ui(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform1dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform1dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform1d(GLuint program, GLint location, GLdouble v0)
 {
-    d_4_1_Core->ProgramUniform1d(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1d(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform1fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform1fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform1f(GLuint program, GLint location, GLfloat v0)
 {
-    d_4_1_Core->ProgramUniform1f(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1f(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform1iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform1iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramUniform1i(GLuint program, GLint location, GLint v0)
 {
-    d_4_1_Core->ProgramUniform1i(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1i(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
 {
-    d_4_1_Core->GetProgramPipelineiv(pipeline, pname, params);
+    d_4_1_Core->f.GetProgramPipelineiv(pipeline, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsProgramPipeline(GLuint pipeline)
 {
-    return d_4_1_Core->IsProgramPipeline(pipeline);
+    return d_4_1_Core->f.IsProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGenProgramPipelines(GLsizei n, GLuint *pipelines)
 {
-    d_4_1_Core->GenProgramPipelines(n, pipelines);
+    d_4_1_Core->f.GenProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
 {
-    d_4_1_Core->DeleteProgramPipelines(n, pipelines);
+    d_4_1_Core->f.DeleteProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->BindProgramPipeline(pipeline);
+    d_4_1_Core->f.BindProgramPipeline(pipeline);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Compatibility::glCreateShaderProgramv(GLenum type, GLsizei count, const GLchar *const *strings)
 {
-    return d_4_1_Core->CreateShaderProgramv(type, count, strings);
+    return d_4_1_Core->f.CreateShaderProgramv(type, count, strings);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glActiveShaderProgram(GLuint pipeline, GLuint program)
 {
-    d_4_1_Core->ActiveShaderProgram(pipeline, program);
+    d_4_1_Core->f.ActiveShaderProgram(pipeline, program);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glUseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
 {
-    d_4_1_Core->UseProgramStages(pipeline, stages, program);
+    d_4_1_Core->f.UseProgramStages(pipeline, stages, program);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramParameteri(GLuint program, GLenum pname, GLint value)
 {
-    d_4_1_Core->ProgramParameteri(program, pname, value);
+    d_4_1_Core->f.ProgramParameteri(program, pname, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glProgramBinary(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length)
 {
-    d_4_1_Core->ProgramBinary(program, binaryFormat, binary, length);
+    d_4_1_Core->f.ProgramBinary(program, binaryFormat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary)
 {
-    d_4_1_Core->GetProgramBinary(program, bufSize, length, binaryFormat, binary);
+    d_4_1_Core->f.GetProgramBinary(program, bufSize, length, binaryFormat, binary);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearDepthf(GLfloat dd)
 {
-    d_4_1_Core->ClearDepthf(dd);
+    d_4_1_Core->f.ClearDepthf(dd);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDepthRangef(GLfloat n, GLfloat f)
 {
-    d_4_1_Core->DepthRangef(n, f);
+    d_4_1_Core->f.DepthRangef(n, f);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)
 {
-    d_4_1_Core->GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+    d_4_1_Core->f.GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glShaderBinary(GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length)
 {
-    d_4_1_Core->ShaderBinary(count, shaders, binaryformat, binary, length);
+    d_4_1_Core->f.ShaderBinary(count, shaders, binaryformat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glReleaseShaderCompiler()
 {
-    d_4_1_Core->ReleaseShaderCompiler();
+    d_4_1_Core->f.ReleaseShaderCompiler();
 }
 
 
 // OpenGL 4.2 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawTransformFeedbackStreamInstanced(GLenum mode, GLuint id, GLuint stream, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawTransformFeedbackInstanced(GLenum mode, GLuint id, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackInstanced(mode, id, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackInstanced(mode, id, instancecount);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_2_Core->TexStorage3D(target, levels, internalformat, width, height, depth);
+    d_4_2_Core->f.TexStorage3D(target, levels, internalformat, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_4_2_Core->TexStorage2D(target, levels, internalformat, width, height);
+    d_4_2_Core->f.TexStorage2D(target, levels, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)
 {
-    d_4_2_Core->TexStorage1D(target, levels, internalformat, width);
+    d_4_2_Core->f.TexStorage1D(target, levels, internalformat, width);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMemoryBarrier(GLbitfield barriers)
 {
-    d_4_2_Core->MemoryBarrier(barriers);
+    d_4_2_Core->f.MemoryBarrier(barriers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindImageTexture(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format)
 {
-    d_4_2_Core->BindImageTexture(unit, texture, level, layered, layer, access, format);
+    d_4_2_Core->f.BindImageTexture(unit, texture, level, layered, layer, access, format);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetActiveAtomicCounterBufferiv(GLuint program, GLuint bufferIndex, GLenum pname, GLint *params)
 {
-    d_4_2_Core->GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
+    d_4_2_Core->f.GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params)
 {
-    d_4_2_Core->GetInternalformativ(target, internalformat, pname, bufSize, params);
+    d_4_2_Core->f.GetInternalformativ(target, internalformat, pname, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawElementsInstancedBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawArraysInstancedBaseInstance(GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
+    d_4_2_Core->f.DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
 }
 
 
 // OpenGL 4.3 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glGetObjectPtrLabel(const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label)
 {
-    d_4_3_Core->GetObjectPtrLabel(ptr, bufSize, length, label);
+    d_4_3_Core->f.GetObjectPtrLabel(ptr, bufSize, length, label);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glObjectPtrLabel(const void *ptr, GLsizei length, const GLchar *label)
 {
-    d_4_3_Core->ObjectPtrLabel(ptr, length, label);
+    d_4_3_Core->f.ObjectPtrLabel(ptr, length, label);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetObjectLabel(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label)
 {
-    d_4_3_Core->GetObjectLabel(identifier, name, bufSize, length, label);
+    d_4_3_Core->f.GetObjectLabel(identifier, name, bufSize, length, label);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glObjectLabel(GLenum identifier, GLuint name, GLsizei length, const GLchar *label)
 {
-    d_4_3_Core->ObjectLabel(identifier, name, length, label);
+    d_4_3_Core->f.ObjectLabel(identifier, name, length, label);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPopDebugGroup()
 {
-    d_4_3_Core->PopDebugGroup();
+    d_4_3_Core->f.PopDebugGroup();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPushDebugGroup(GLenum source, GLuint id, GLsizei length, const GLchar *message)
 {
-    d_4_3_Core->PushDebugGroup(source, id, length, message);
+    d_4_3_Core->f.PushDebugGroup(source, id, length, message);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Compatibility::glGetDebugMessageLog(GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog)
 {
-    return d_4_3_Core->GetDebugMessageLog(count, bufSize, sources, types, ids, severities, lengths, messageLog);
+    return d_4_3_Core->f.GetDebugMessageLog(count, bufSize, sources, types, ids, severities, lengths, messageLog);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDebugMessageCallback(GLDEBUGPROC callback, const void *userParam)
 {
-    d_4_3_Core->DebugMessageCallback(callback, userParam);
+    d_4_3_Core->f.DebugMessageCallback(callback, userParam);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf)
 {
-    d_4_3_Core->DebugMessageInsert(source, type, id, severity, length, buf);
+    d_4_3_Core->f.DebugMessageInsert(source, type, id, severity, length, buf);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDebugMessageControl(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled)
 {
-    d_4_3_Core->DebugMessageControl(source, type, severity, count, ids, enabled);
+    d_4_3_Core->f.DebugMessageControl(source, type, severity, count, ids, enabled);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexBindingDivisor(GLuint bindingindex, GLuint divisor)
 {
-    d_4_3_Core->VertexBindingDivisor(bindingindex, divisor);
+    d_4_3_Core->f.VertexBindingDivisor(bindingindex, divisor);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribBinding(GLuint attribindex, GLuint bindingindex)
 {
-    d_4_3_Core->VertexAttribBinding(attribindex, bindingindex);
+    d_4_3_Core->f.VertexAttribBinding(attribindex, bindingindex);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribLFormat(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribLFormat(attribindex, size, type, relativeoffset);
+    d_4_3_Core->f.VertexAttribLFormat(attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribIFormat(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribIFormat(attribindex, size, type, relativeoffset);
+    d_4_3_Core->f.VertexAttribIFormat(attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexAttribFormat(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
+    d_4_3_Core->f.VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindVertexBuffer(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride)
 {
-    d_4_3_Core->BindVertexBuffer(bindingindex, buffer, offset, stride);
+    d_4_3_Core->f.BindVertexBuffer(bindingindex, buffer, offset, stride);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureView(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers)
 {
-    d_4_3_Core->TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers);
+    d_4_3_Core->f.TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_4_3_Core->TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_4_3_Core->f.TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexStorage2DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_4_3_Core->TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_4_3_Core->f.TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexBufferRange(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_4_3_Core->TexBufferRange(target, internalformat, buffer, offset, size);
+    d_4_3_Core->f.TexBufferRange(target, internalformat, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glShaderStorageBlockBinding(GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding)
 {
-    d_4_3_Core->ShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
+    d_4_3_Core->f.ShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
 }
 
 inline GLint QOpenGLFunctions_4_5_Compatibility::glGetProgramResourceLocationIndex(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceLocationIndex(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceLocationIndex(program, programInterface, name);
 }
 
 inline GLint QOpenGLFunctions_4_5_Compatibility::glGetProgramResourceLocation(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceLocation(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceLocation(program, programInterface, name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetProgramResourceiv(GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params)
 {
-    d_4_3_Core->GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
+    d_4_3_Core->f.GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetProgramResourceName(GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name)
 {
-    d_4_3_Core->GetProgramResourceName(program, programInterface, index, bufSize, length, name);
+    d_4_3_Core->f.GetProgramResourceName(program, programInterface, index, bufSize, length, name);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Compatibility::glGetProgramResourceIndex(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceIndex(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceIndex(program, programInterface, name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetProgramInterfaceiv(GLuint program, GLenum programInterface, GLenum pname, GLint *params)
 {
-    d_4_3_Core->GetProgramInterfaceiv(program, programInterface, pname, params);
+    d_4_3_Core->f.GetProgramInterfaceiv(program, programInterface, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride)
 {
-    d_4_3_Core->MultiDrawElementsIndirect(mode, type, indirect, drawcount, stride);
+    d_4_3_Core->f.MultiDrawElementsIndirect(mode, type, indirect, drawcount, stride);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiDrawArraysIndirect(GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride)
 {
-    d_4_3_Core->MultiDrawArraysIndirect(mode, indirect, drawcount, stride);
+    d_4_3_Core->f.MultiDrawArraysIndirect(mode, indirect, drawcount, stride);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_4_3_Core->InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
+    d_4_3_Core->f.InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glInvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments)
 {
-    d_4_3_Core->InvalidateFramebuffer(target, numAttachments, attachments);
+    d_4_3_Core->f.InvalidateFramebuffer(target, numAttachments, attachments);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glInvalidateBufferData(GLuint buffer)
 {
-    d_4_3_Core->InvalidateBufferData(buffer);
+    d_4_3_Core->f.InvalidateBufferData(buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glInvalidateBufferSubData(GLuint buffer, GLintptr offset, GLsizeiptr length)
 {
-    d_4_3_Core->InvalidateBufferSubData(buffer, offset, length);
+    d_4_3_Core->f.InvalidateBufferSubData(buffer, offset, length);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glInvalidateTexImage(GLuint texture, GLint level)
 {
-    d_4_3_Core->InvalidateTexImage(texture, level);
+    d_4_3_Core->f.InvalidateTexImage(texture, level);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glInvalidateTexSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_3_Core->InvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
+    d_4_3_Core->f.InvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetInternalformati64v(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params)
 {
-    d_4_3_Core->GetInternalformati64v(target, internalformat, pname, bufSize, params);
+    d_4_3_Core->f.GetInternalformati64v(target, internalformat, pname, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_4_3_Core->GetFramebufferParameteriv(target, pname, params);
+    d_4_3_Core->f.GetFramebufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFramebufferParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_4_3_Core->FramebufferParameteri(target, pname, param);
+    d_4_3_Core->f.FramebufferParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth)
 {
-    d_4_3_Core->CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth);
+    d_4_3_Core->f.CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDispatchComputeIndirect(GLintptr indirect)
 {
-    d_4_3_Core->DispatchComputeIndirect(indirect);
+    d_4_3_Core->f.DispatchComputeIndirect(indirect);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z)
 {
-    d_4_3_Core->DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
+    d_4_3_Core->f.DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearBufferSubData(GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data)
 {
-    d_4_3_Core->ClearBufferSubData(target, internalformat, offset, size, format, type, data);
+    d_4_3_Core->f.ClearBufferSubData(target, internalformat, offset, size, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearBufferData(GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data)
 {
-    d_4_3_Core->ClearBufferData(target, internalformat, format, type, data);
+    d_4_3_Core->f.ClearBufferData(target, internalformat, format, type, data);
 }
 
 
 // OpenGL 4.4 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glBindVertexBuffers(GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides)
 {
-    d_4_4_Core->BindVertexBuffers(first, count, buffers, offsets, strides);
+    d_4_4_Core->f.BindVertexBuffers(first, count, buffers, offsets, strides);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindImageTextures(GLuint first, GLsizei count, const GLuint *textures)
 {
-    d_4_4_Core->BindImageTextures(first, count, textures);
+    d_4_4_Core->f.BindImageTextures(first, count, textures);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindSamplers(GLuint first, GLsizei count, const GLuint *samplers)
 {
-    d_4_4_Core->BindSamplers(first, count, samplers);
+    d_4_4_Core->f.BindSamplers(first, count, samplers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindTextures(GLuint first, GLsizei count, const GLuint *textures)
 {
-    d_4_4_Core->BindTextures(first, count, textures);
+    d_4_4_Core->f.BindTextures(first, count, textures);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindBuffersRange(GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes)
 {
-    d_4_4_Core->BindBuffersRange(target, first, count, buffers, offsets, sizes);
+    d_4_4_Core->f.BindBuffersRange(target, first, count, buffers, offsets, sizes);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindBuffersBase(GLenum target, GLuint first, GLsizei count, const GLuint *buffers)
 {
-    d_4_4_Core->BindBuffersBase(target, first, count, buffers);
+    d_4_4_Core->f.BindBuffersBase(target, first, count, buffers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearTexSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data)
 {
-    d_4_4_Core->ClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data);
+    d_4_4_Core->f.ClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearTexImage(GLuint texture, GLint level, GLenum format, GLenum type, const void *data)
 {
-    d_4_4_Core->ClearTexImage(texture, level, format, type, data);
+    d_4_4_Core->f.ClearTexImage(texture, level, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBufferStorage(GLenum target, GLsizeiptr size, const void *data, GLbitfield flags)
 {
-    d_4_4_Core->BufferStorage(target, size, data, flags);
+    d_4_4_Core->f.BufferStorage(target, size, data, flags);
 }
 
 
 // OpenGL 4.5 core functions
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureBarrier()
 {
-    d_4_5_Core->TextureBarrier();
+    d_4_5_Core->f.TextureBarrier();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glReadnPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data)
 {
-    d_4_5_Core->ReadnPixels(x, y, width, height, format, type, bufSize, data);
+    d_4_5_Core->f.ReadnPixels(x, y, width, height, format, type, bufSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnUniformuiv(GLuint program, GLint location, GLsizei bufSize, GLuint *params)
 {
-    d_4_5_Core->GetnUniformuiv(program, location, bufSize, params);
+    d_4_5_Core->f.GetnUniformuiv(program, location, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnUniformiv(GLuint program, GLint location, GLsizei bufSize, GLint *params)
 {
-    d_4_5_Core->GetnUniformiv(program, location, bufSize, params);
+    d_4_5_Core->f.GetnUniformiv(program, location, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnUniformfv(GLuint program, GLint location, GLsizei bufSize, GLfloat *params)
 {
-    d_4_5_Core->GetnUniformfv(program, location, bufSize, params);
+    d_4_5_Core->f.GetnUniformfv(program, location, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnUniformdv(GLuint program, GLint location, GLsizei bufSize, GLdouble *params)
 {
-    d_4_5_Core->GetnUniformdv(program, location, bufSize, params);
+    d_4_5_Core->f.GetnUniformdv(program, location, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels)
 {
-    d_4_5_Core->GetnTexImage(target, level, format, type, bufSize, pixels);
+    d_4_5_Core->f.GetnTexImage(target, level, format, type, bufSize, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnCompressedTexImage(GLenum target, GLint lod, GLsizei bufSize, void *pixels)
 {
-    d_4_5_Core->GetnCompressedTexImage(target, lod, bufSize, pixels);
+    d_4_5_Core->f.GetnCompressedTexImage(target, lod, bufSize, pixels);
 }
 
 inline GLenum QOpenGLFunctions_4_5_Compatibility::glGetGraphicsResetStatus()
 {
-    return d_4_5_Core->GetGraphicsResetStatus();
+    return d_4_5_Core->f.GetGraphicsResetStatus();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetCompressedTextureSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void *pixels)
 {
-    d_4_5_Core->GetCompressedTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, bufSize, pixels);
+    d_4_5_Core->f.GetCompressedTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, bufSize, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTextureSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels)
 {
-    d_4_5_Core->GetTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, bufSize, pixels);
+    d_4_5_Core->f.GetTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, bufSize, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMemoryBarrierByRegion(GLbitfield barriers)
 {
-    d_4_5_Core->MemoryBarrierByRegion(barriers);
+    d_4_5_Core->f.MemoryBarrierByRegion(barriers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCreateQueries(GLenum target, GLsizei n, GLuint *ids)
 {
-    d_4_5_Core->CreateQueries(target, n, ids);
+    d_4_5_Core->f.CreateQueries(target, n, ids);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCreateProgramPipelines(GLsizei n, GLuint *pipelines)
 {
-    d_4_5_Core->CreateProgramPipelines(n, pipelines);
+    d_4_5_Core->f.CreateProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCreateSamplers(GLsizei n, GLuint *samplers)
 {
-    d_4_5_Core->CreateSamplers(n, samplers);
+    d_4_5_Core->f.CreateSamplers(n, samplers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetVertexArrayIndexed64iv(GLuint vaobj, GLuint index, GLenum pname, GLint64 *param)
 {
-    d_4_5_Core->GetVertexArrayIndexed64iv(vaobj, index, pname, param);
+    d_4_5_Core->f.GetVertexArrayIndexed64iv(vaobj, index, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetVertexArrayIndexediv(GLuint vaobj, GLuint index, GLenum pname, GLint *param)
 {
-    d_4_5_Core->GetVertexArrayIndexediv(vaobj, index, pname, param);
+    d_4_5_Core->f.GetVertexArrayIndexediv(vaobj, index, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetVertexArrayiv(GLuint vaobj, GLenum pname, GLint *param)
 {
-    d_4_5_Core->GetVertexArrayiv(vaobj, pname, param);
+    d_4_5_Core->f.GetVertexArrayiv(vaobj, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexArrayBindingDivisor(GLuint vaobj, GLuint bindingindex, GLuint divisor)
 {
-    d_4_5_Core->VertexArrayBindingDivisor(vaobj, bindingindex, divisor);
+    d_4_5_Core->f.VertexArrayBindingDivisor(vaobj, bindingindex, divisor);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexArrayAttribLFormat(GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_5_Core->VertexArrayAttribLFormat(vaobj, attribindex, size, type, relativeoffset);
+    d_4_5_Core->f.VertexArrayAttribLFormat(vaobj, attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexArrayAttribIFormat(GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_5_Core->VertexArrayAttribIFormat(vaobj, attribindex, size, type, relativeoffset);
+    d_4_5_Core->f.VertexArrayAttribIFormat(vaobj, attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexArrayAttribFormat(GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset)
 {
-    d_4_5_Core->VertexArrayAttribFormat(vaobj, attribindex, size, type, normalized, relativeoffset);
+    d_4_5_Core->f.VertexArrayAttribFormat(vaobj, attribindex, size, type, normalized, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexArrayAttribBinding(GLuint vaobj, GLuint attribindex, GLuint bindingindex)
 {
-    d_4_5_Core->VertexArrayAttribBinding(vaobj, attribindex, bindingindex);
+    d_4_5_Core->f.VertexArrayAttribBinding(vaobj, attribindex, bindingindex);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexArrayVertexBuffers(GLuint vaobj, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides)
 {
-    d_4_5_Core->VertexArrayVertexBuffers(vaobj, first, count, buffers, offsets, strides);
+    d_4_5_Core->f.VertexArrayVertexBuffers(vaobj, first, count, buffers, offsets, strides);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexArrayVertexBuffer(GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride)
 {
-    d_4_5_Core->VertexArrayVertexBuffer(vaobj, bindingindex, buffer, offset, stride);
+    d_4_5_Core->f.VertexArrayVertexBuffer(vaobj, bindingindex, buffer, offset, stride);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexArrayElementBuffer(GLuint vaobj, GLuint buffer)
 {
-    d_4_5_Core->VertexArrayElementBuffer(vaobj, buffer);
+    d_4_5_Core->f.VertexArrayElementBuffer(vaobj, buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEnableVertexArrayAttrib(GLuint vaobj, GLuint index)
 {
-    d_4_5_Core->EnableVertexArrayAttrib(vaobj, index);
+    d_4_5_Core->f.EnableVertexArrayAttrib(vaobj, index);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDisableVertexArrayAttrib(GLuint vaobj, GLuint index)
 {
-    d_4_5_Core->DisableVertexArrayAttrib(vaobj, index);
+    d_4_5_Core->f.DisableVertexArrayAttrib(vaobj, index);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCreateVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_4_5_Core->CreateVertexArrays(n, arrays);
+    d_4_5_Core->f.CreateVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTextureParameteriv(GLuint texture, GLenum pname, GLint *params)
 {
-    d_4_5_Core->GetTextureParameteriv(texture, pname, params);
+    d_4_5_Core->f.GetTextureParameteriv(texture, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTextureParameterIuiv(GLuint texture, GLenum pname, GLuint *params)
 {
-    d_4_5_Core->GetTextureParameterIuiv(texture, pname, params);
+    d_4_5_Core->f.GetTextureParameterIuiv(texture, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTextureParameterIiv(GLuint texture, GLenum pname, GLint *params)
 {
-    d_4_5_Core->GetTextureParameterIiv(texture, pname, params);
+    d_4_5_Core->f.GetTextureParameterIiv(texture, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTextureParameterfv(GLuint texture, GLenum pname, GLfloat *params)
 {
-    d_4_5_Core->GetTextureParameterfv(texture, pname, params);
+    d_4_5_Core->f.GetTextureParameterfv(texture, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTextureLevelParameteriv(GLuint texture, GLint level, GLenum pname, GLint *params)
 {
-    d_4_5_Core->GetTextureLevelParameteriv(texture, level, pname, params);
+    d_4_5_Core->f.GetTextureLevelParameteriv(texture, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTextureLevelParameterfv(GLuint texture, GLint level, GLenum pname, GLfloat *params)
 {
-    d_4_5_Core->GetTextureLevelParameterfv(texture, level, pname, params);
+    d_4_5_Core->f.GetTextureLevelParameterfv(texture, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetCompressedTextureImage(GLuint texture, GLint level, GLsizei bufSize, void *pixels)
 {
-    d_4_5_Core->GetCompressedTextureImage(texture, level, bufSize, pixels);
+    d_4_5_Core->f.GetCompressedTextureImage(texture, level, bufSize, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTextureImage(GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels)
 {
-    d_4_5_Core->GetTextureImage(texture, level, format, type, bufSize, pixels);
+    d_4_5_Core->f.GetTextureImage(texture, level, format, type, bufSize, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBindTextureUnit(GLuint unit, GLuint texture)
 {
-    d_4_5_Core->BindTextureUnit(unit, texture);
+    d_4_5_Core->f.BindTextureUnit(unit, texture);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGenerateTextureMipmap(GLuint texture)
 {
-    d_4_5_Core->GenerateTextureMipmap(texture);
+    d_4_5_Core->f.GenerateTextureMipmap(texture);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureParameteriv(GLuint texture, GLenum pname, const GLint *param)
 {
-    d_4_5_Core->TextureParameteriv(texture, pname, param);
+    d_4_5_Core->f.TextureParameteriv(texture, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureParameterIuiv(GLuint texture, GLenum pname, const GLuint *params)
 {
-    d_4_5_Core->TextureParameterIuiv(texture, pname, params);
+    d_4_5_Core->f.TextureParameterIuiv(texture, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureParameterIiv(GLuint texture, GLenum pname, const GLint *params)
 {
-    d_4_5_Core->TextureParameterIiv(texture, pname, params);
+    d_4_5_Core->f.TextureParameterIiv(texture, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureParameteri(GLuint texture, GLenum pname, GLint param)
 {
-    d_4_5_Core->TextureParameteri(texture, pname, param);
+    d_4_5_Core->f.TextureParameteri(texture, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureParameterfv(GLuint texture, GLenum pname, const GLfloat *param)
 {
-    d_4_5_Core->TextureParameterfv(texture, pname, param);
+    d_4_5_Core->f.TextureParameterfv(texture, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureParameterf(GLuint texture, GLenum pname, GLfloat param)
 {
-    d_4_5_Core->TextureParameterf(texture, pname, param);
+    d_4_5_Core->f.TextureParameterf(texture, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyTextureSubImage3D(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_4_5_Core->CopyTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_4_5_Core->f.CopyTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyTextureSubImage2D(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_4_5_Core->CopyTextureSubImage2D(texture, level, xoffset, yoffset, x, y, width, height);
+    d_4_5_Core->f.CopyTextureSubImage2D(texture, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyTextureSubImage1D(GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_4_5_Core->CopyTextureSubImage1D(texture, level, xoffset, x, y, width);
+    d_4_5_Core->f.CopyTextureSubImage1D(texture, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCompressedTextureSubImage3D(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_4_5_Core->CompressedTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_4_5_Core->f.CompressedTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCompressedTextureSubImage2D(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_4_5_Core->CompressedTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_4_5_Core->f.CompressedTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCompressedTextureSubImage1D(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_4_5_Core->CompressedTextureSubImage1D(texture, level, xoffset, width, format, imageSize, data);
+    d_4_5_Core->f.CompressedTextureSubImage1D(texture, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureSubImage3D(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)
 {
-    d_4_5_Core->TextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_4_5_Core->f.TextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureSubImage2D(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels)
 {
-    d_4_5_Core->TextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_4_5_Core->f.TextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureSubImage1D(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels)
 {
-    d_4_5_Core->TextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
+    d_4_5_Core->f.TextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureStorage3DMultisample(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_4_5_Core->TextureStorage3DMultisample(texture, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_4_5_Core->f.TextureStorage3DMultisample(texture, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureStorage2DMultisample(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_4_5_Core->TextureStorage2DMultisample(texture, samples, internalformat, width, height, fixedsamplelocations);
+    d_4_5_Core->f.TextureStorage2DMultisample(texture, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureStorage3D(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_5_Core->TextureStorage3D(texture, levels, internalformat, width, height, depth);
+    d_4_5_Core->f.TextureStorage3D(texture, levels, internalformat, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureStorage2D(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_4_5_Core->TextureStorage2D(texture, levels, internalformat, width, height);
+    d_4_5_Core->f.TextureStorage2D(texture, levels, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureStorage1D(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width)
 {
-    d_4_5_Core->TextureStorage1D(texture, levels, internalformat, width);
+    d_4_5_Core->f.TextureStorage1D(texture, levels, internalformat, width);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureBufferRange(GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizei size)
 {
-    d_4_5_Core->TextureBufferRange(texture, internalformat, buffer, offset, size);
+    d_4_5_Core->f.TextureBufferRange(texture, internalformat, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTextureBuffer(GLuint texture, GLenum internalformat, GLuint buffer)
 {
-    d_4_5_Core->TextureBuffer(texture, internalformat, buffer);
+    d_4_5_Core->f.TextureBuffer(texture, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCreateTextures(GLenum target, GLsizei n, GLuint *textures)
 {
-    d_4_5_Core->CreateTextures(target, n, textures);
+    d_4_5_Core->f.CreateTextures(target, n, textures);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetNamedRenderbufferParameteriv(GLuint renderbuffer, GLenum pname, GLint *params)
 {
-    d_4_5_Core->GetNamedRenderbufferParameteriv(renderbuffer, pname, params);
+    d_4_5_Core->f.GetNamedRenderbufferParameteriv(renderbuffer, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNamedRenderbufferStorageMultisample(GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_4_5_Core->NamedRenderbufferStorageMultisample(renderbuffer, samples, internalformat, width, height);
+    d_4_5_Core->f.NamedRenderbufferStorageMultisample(renderbuffer, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNamedRenderbufferStorage(GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_4_5_Core->NamedRenderbufferStorage(renderbuffer, internalformat, width, height);
+    d_4_5_Core->f.NamedRenderbufferStorage(renderbuffer, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCreateRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_4_5_Core->CreateRenderbuffers(n, renderbuffers);
+    d_4_5_Core->f.CreateRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetNamedFramebufferAttachmentParameteriv(GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_4_5_Core->GetNamedFramebufferAttachmentParameteriv(framebuffer, attachment, pname, params);
+    d_4_5_Core->f.GetNamedFramebufferAttachmentParameteriv(framebuffer, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetNamedFramebufferParameteriv(GLuint framebuffer, GLenum pname, GLint *param)
 {
-    d_4_5_Core->GetNamedFramebufferParameteriv(framebuffer, pname, param);
+    d_4_5_Core->f.GetNamedFramebufferParameteriv(framebuffer, pname, param);
 }
 
 inline GLenum QOpenGLFunctions_4_5_Compatibility::glCheckNamedFramebufferStatus(GLuint framebuffer, GLenum target)
 {
-    return d_4_5_Core->CheckNamedFramebufferStatus(framebuffer, target);
+    return d_4_5_Core->f.CheckNamedFramebufferStatus(framebuffer, target);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBlitNamedFramebuffer(GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_4_5_Core->BlitNamedFramebuffer(readFramebuffer, drawFramebuffer, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_4_5_Core->f.BlitNamedFramebuffer(readFramebuffer, drawFramebuffer, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearNamedFramebufferfi(GLuint framebuffer, GLenum buffer, GLfloat depth, GLint stencil)
 {
-    d_4_5_Core->ClearNamedFramebufferfi(framebuffer, buffer, depth, stencil);
+    d_4_5_Core->f.ClearNamedFramebufferfi(framebuffer, buffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearNamedFramebufferfv(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_4_5_Core->ClearNamedFramebufferfv(framebuffer, buffer, drawbuffer, value);
+    d_4_5_Core->f.ClearNamedFramebufferfv(framebuffer, buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearNamedFramebufferuiv(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_4_5_Core->ClearNamedFramebufferuiv(framebuffer, buffer, drawbuffer, value);
+    d_4_5_Core->f.ClearNamedFramebufferuiv(framebuffer, buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearNamedFramebufferiv(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_4_5_Core->ClearNamedFramebufferiv(framebuffer, buffer, drawbuffer, value);
+    d_4_5_Core->f.ClearNamedFramebufferiv(framebuffer, buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glInvalidateNamedFramebufferSubData(GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_4_5_Core->InvalidateNamedFramebufferSubData(framebuffer, numAttachments, attachments, x, y, width, height);
+    d_4_5_Core->f.InvalidateNamedFramebufferSubData(framebuffer, numAttachments, attachments, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glInvalidateNamedFramebufferData(GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments)
 {
-    d_4_5_Core->InvalidateNamedFramebufferData(framebuffer, numAttachments, attachments);
+    d_4_5_Core->f.InvalidateNamedFramebufferData(framebuffer, numAttachments, attachments);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNamedFramebufferReadBuffer(GLuint framebuffer, GLenum src)
 {
-    d_4_5_Core->NamedFramebufferReadBuffer(framebuffer, src);
+    d_4_5_Core->f.NamedFramebufferReadBuffer(framebuffer, src);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNamedFramebufferDrawBuffers(GLuint framebuffer, GLsizei n, const GLenum *bufs)
 {
-    d_4_5_Core->NamedFramebufferDrawBuffers(framebuffer, n, bufs);
+    d_4_5_Core->f.NamedFramebufferDrawBuffers(framebuffer, n, bufs);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNamedFramebufferDrawBuffer(GLuint framebuffer, GLenum buf)
 {
-    d_4_5_Core->NamedFramebufferDrawBuffer(framebuffer, buf);
+    d_4_5_Core->f.NamedFramebufferDrawBuffer(framebuffer, buf);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNamedFramebufferTextureLayer(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_4_5_Core->NamedFramebufferTextureLayer(framebuffer, attachment, texture, level, layer);
+    d_4_5_Core->f.NamedFramebufferTextureLayer(framebuffer, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNamedFramebufferTexture(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level)
 {
-    d_4_5_Core->NamedFramebufferTexture(framebuffer, attachment, texture, level);
+    d_4_5_Core->f.NamedFramebufferTexture(framebuffer, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNamedFramebufferParameteri(GLuint framebuffer, GLenum pname, GLint param)
 {
-    d_4_5_Core->NamedFramebufferParameteri(framebuffer, pname, param);
+    d_4_5_Core->f.NamedFramebufferParameteri(framebuffer, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNamedFramebufferRenderbuffer(GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_4_5_Core->NamedFramebufferRenderbuffer(framebuffer, attachment, renderbuffertarget, renderbuffer);
+    d_4_5_Core->f.NamedFramebufferRenderbuffer(framebuffer, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCreateFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_4_5_Core->CreateFramebuffers(n, framebuffers);
+    d_4_5_Core->f.CreateFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetNamedBufferSubData(GLuint buffer, GLintptr offset, GLsizei size, void *data)
 {
-    d_4_5_Core->GetNamedBufferSubData(buffer, offset, size, data);
+    d_4_5_Core->f.GetNamedBufferSubData(buffer, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetNamedBufferPointerv(GLuint buffer, GLenum pname, void * *params)
 {
-    d_4_5_Core->GetNamedBufferPointerv(buffer, pname, params);
+    d_4_5_Core->f.GetNamedBufferPointerv(buffer, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetNamedBufferParameteri64v(GLuint buffer, GLenum pname, GLint64 *params)
 {
-    d_4_5_Core->GetNamedBufferParameteri64v(buffer, pname, params);
+    d_4_5_Core->f.GetNamedBufferParameteri64v(buffer, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetNamedBufferParameteriv(GLuint buffer, GLenum pname, GLint *params)
 {
-    d_4_5_Core->GetNamedBufferParameteriv(buffer, pname, params);
+    d_4_5_Core->f.GetNamedBufferParameteriv(buffer, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFlushMappedNamedBufferRange(GLuint buffer, GLintptr offset, GLsizei length)
 {
-    d_4_5_Core->FlushMappedNamedBufferRange(buffer, offset, length);
+    d_4_5_Core->f.FlushMappedNamedBufferRange(buffer, offset, length);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glUnmapNamedBuffer(GLuint buffer)
 {
-    return d_4_5_Core->UnmapNamedBuffer(buffer);
+    return d_4_5_Core->f.UnmapNamedBuffer(buffer);
 }
 
 inline void * QOpenGLFunctions_4_5_Compatibility::glMapNamedBufferRange(GLuint buffer, GLintptr offset, GLsizei length, GLbitfield access)
 {
-    return d_4_5_Core->MapNamedBufferRange(buffer, offset, length, access);
+    return d_4_5_Core->f.MapNamedBufferRange(buffer, offset, length, access);
 }
 
 inline void * QOpenGLFunctions_4_5_Compatibility::glMapNamedBuffer(GLuint buffer, GLenum access)
 {
-    return d_4_5_Core->MapNamedBuffer(buffer, access);
+    return d_4_5_Core->f.MapNamedBuffer(buffer, access);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearNamedBufferSubData(GLuint buffer, GLenum internalformat, GLintptr offset, GLsizei size, GLenum format, GLenum type, const void *data)
 {
-    d_4_5_Core->ClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
+    d_4_5_Core->f.ClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearNamedBufferData(GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data)
 {
-    d_4_5_Core->ClearNamedBufferData(buffer, internalformat, format, type, data);
+    d_4_5_Core->f.ClearNamedBufferData(buffer, internalformat, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyNamedBufferSubData(GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizei size)
 {
-    d_4_5_Core->CopyNamedBufferSubData(readBuffer, writeBuffer, readOffset, writeOffset, size);
+    d_4_5_Core->f.CopyNamedBufferSubData(readBuffer, writeBuffer, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNamedBufferSubData(GLuint buffer, GLintptr offset, GLsizei size, const void *data)
 {
-    d_4_5_Core->NamedBufferSubData(buffer, offset, size, data);
+    d_4_5_Core->f.NamedBufferSubData(buffer, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNamedBufferData(GLuint buffer, GLsizei size, const void *data, GLenum usage)
 {
-    d_4_5_Core->NamedBufferData(buffer, size, data, usage);
+    d_4_5_Core->f.NamedBufferData(buffer, size, data, usage);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNamedBufferStorage(GLuint buffer, GLsizei size, const void *data, GLbitfield flags)
 {
-    d_4_5_Core->NamedBufferStorage(buffer, size, data, flags);
+    d_4_5_Core->f.NamedBufferStorage(buffer, size, data, flags);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCreateBuffers(GLsizei n, GLuint *buffers)
 {
-    d_4_5_Core->CreateBuffers(n, buffers);
+    d_4_5_Core->f.CreateBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTransformFeedbacki64_v(GLuint xfb, GLenum pname, GLuint index, GLint64 *param)
 {
-    d_4_5_Core->GetTransformFeedbacki64_v(xfb, pname, index, param);
+    d_4_5_Core->f.GetTransformFeedbacki64_v(xfb, pname, index, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTransformFeedbacki_v(GLuint xfb, GLenum pname, GLuint index, GLint *param)
 {
-    d_4_5_Core->GetTransformFeedbacki_v(xfb, pname, index, param);
+    d_4_5_Core->f.GetTransformFeedbacki_v(xfb, pname, index, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTransformFeedbackiv(GLuint xfb, GLenum pname, GLint *param)
 {
-    d_4_5_Core->GetTransformFeedbackiv(xfb, pname, param);
+    d_4_5_Core->f.GetTransformFeedbackiv(xfb, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTransformFeedbackBufferRange(GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizei size)
 {
-    d_4_5_Core->TransformFeedbackBufferRange(xfb, index, buffer, offset, size);
+    d_4_5_Core->f.TransformFeedbackBufferRange(xfb, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTransformFeedbackBufferBase(GLuint xfb, GLuint index, GLuint buffer)
 {
-    d_4_5_Core->TransformFeedbackBufferBase(xfb, index, buffer);
+    d_4_5_Core->f.TransformFeedbackBufferBase(xfb, index, buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCreateTransformFeedbacks(GLsizei n, GLuint *ids)
 {
-    d_4_5_Core->CreateTransformFeedbacks(n, ids);
+    d_4_5_Core->f.CreateTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClipControl(GLenum origin, GLenum depth)
 {
-    d_4_5_Core->ClipControl(origin, depth);
+    d_4_5_Core->f.ClipControl(origin, depth);
 }
 
 
 // OpenGL 1.0 deprecated functions
 inline void QOpenGLFunctions_4_5_Compatibility::glTranslatef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Translatef(x, y, z);
+    d_1_0_Deprecated->f.Translatef(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTranslated(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Translated(x, y, z);
+    d_1_0_Deprecated->f.Translated(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glScalef(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Scalef(x, y, z);
+    d_1_0_Deprecated->f.Scalef(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glScaled(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Scaled(x, y, z);
+    d_1_0_Deprecated->f.Scaled(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Rotatef(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotatef(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Rotated(angle, x, y, z);
+    d_1_0_Deprecated->f.Rotated(angle, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPushMatrix()
 {
-    d_1_0_Deprecated->PushMatrix();
+    d_1_0_Deprecated->f.PushMatrix();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPopMatrix()
 {
-    d_1_0_Deprecated->PopMatrix();
+    d_1_0_Deprecated->f.PopMatrix();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Ortho(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Ortho(left, right, bottom, top, zNear, zFar);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->MultMatrixd(m);
+    d_1_0_Deprecated->f.MultMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->MultMatrixf(m);
+    d_1_0_Deprecated->f.MultMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMatrixMode(GLenum mode)
 {
-    d_1_0_Deprecated->MatrixMode(mode);
+    d_1_0_Deprecated->f.MatrixMode(mode);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLoadMatrixd(const GLdouble *m)
 {
-    d_1_0_Deprecated->LoadMatrixd(m);
+    d_1_0_Deprecated->f.LoadMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLoadMatrixf(const GLfloat *m)
 {
-    d_1_0_Deprecated->LoadMatrixf(m);
+    d_1_0_Deprecated->f.LoadMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLoadIdentity()
 {
-    d_1_0_Deprecated->LoadIdentity();
+    d_1_0_Deprecated->f.LoadIdentity();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
 {
-    d_1_0_Deprecated->Frustum(left, right, bottom, top, zNear, zFar);
+    d_1_0_Deprecated->f.Frustum(left, right, bottom, top, zNear, zFar);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glIsList(GLuint list)
 {
-    return d_1_0_Deprecated->IsList(list);
+    return d_1_0_Deprecated->f.IsList(list);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
 {
-    d_1_0_Deprecated->GetTexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.GetTexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTexEnviv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetTexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetTexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.GetTexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetPolygonStipple(GLubyte *mask)
 {
-    d_1_0_Deprecated->GetPolygonStipple(mask);
+    d_1_0_Deprecated->f.GetPolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetPixelMapusv(GLenum map, GLushort *values)
 {
-    d_1_0_Deprecated->GetPixelMapusv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapusv(map, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetPixelMapuiv(GLenum map, GLuint *values)
 {
-    d_1_0_Deprecated->GetPixelMapuiv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapuiv(map, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetPixelMapfv(GLenum map, GLfloat *values)
 {
-    d_1_0_Deprecated->GetPixelMapfv(map, values);
+    d_1_0_Deprecated->f.GetPixelMapfv(map, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetMaterialiv(GLenum face, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetMaterialiv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetMaterialfv(face, pname, params);
+    d_1_0_Deprecated->f.GetMaterialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetMapiv(GLenum target, GLenum query, GLint *v)
 {
-    d_1_0_Deprecated->GetMapiv(target, query, v);
+    d_1_0_Deprecated->f.GetMapiv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetMapfv(GLenum target, GLenum query, GLfloat *v)
 {
-    d_1_0_Deprecated->GetMapfv(target, query, v);
+    d_1_0_Deprecated->f.GetMapfv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetMapdv(GLenum target, GLenum query, GLdouble *v)
 {
-    d_1_0_Deprecated->GetMapdv(target, query, v);
+    d_1_0_Deprecated->f.GetMapdv(target, query, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetLightiv(GLenum light, GLenum pname, GLint *params)
 {
-    d_1_0_Deprecated->GetLightiv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetLightfv(GLenum light, GLenum pname, GLfloat *params)
 {
-    d_1_0_Deprecated->GetLightfv(light, pname, params);
+    d_1_0_Deprecated->f.GetLightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetClipPlane(GLenum plane, GLdouble *equation)
 {
-    d_1_0_Deprecated->GetClipPlane(plane, equation);
+    d_1_0_Deprecated->f.GetClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_0_Deprecated->DrawPixels(width, height, format, type, pixels);
+    d_1_0_Deprecated->f.DrawPixels(width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-    d_1_0_Deprecated->CopyPixels(x, y, width, height, type);
+    d_1_0_Deprecated->f.CopyPixels(x, y, width, height, type);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values)
 {
-    d_1_0_Deprecated->PixelMapusv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapusv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values)
 {
-    d_1_0_Deprecated->PixelMapuiv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapuiv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPixelMapfv(GLenum map, GLsizei mapsize, const GLfloat *values)
 {
-    d_1_0_Deprecated->PixelMapfv(map, mapsize, values);
+    d_1_0_Deprecated->f.PixelMapfv(map, mapsize, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPixelTransferi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->PixelTransferi(pname, param);
+    d_1_0_Deprecated->f.PixelTransferi(pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPixelTransferf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->PixelTransferf(pname, param);
+    d_1_0_Deprecated->f.PixelTransferf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPixelZoom(GLfloat xfactor, GLfloat yfactor)
 {
-    d_1_0_Deprecated->PixelZoom(xfactor, yfactor);
+    d_1_0_Deprecated->f.PixelZoom(xfactor, yfactor);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glAlphaFunc(GLenum func, GLfloat ref)
 {
-    d_1_0_Deprecated->AlphaFunc(func, ref);
+    d_1_0_Deprecated->f.AlphaFunc(func, ref);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEvalPoint2(GLint i, GLint j)
 {
-    d_1_0_Deprecated->EvalPoint2(i, j);
+    d_1_0_Deprecated->f.EvalPoint2(i, j);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-    d_1_0_Deprecated->EvalMesh2(mode, i1, i2, j1, j2);
+    d_1_0_Deprecated->f.EvalMesh2(mode, i1, i2, j1, j2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEvalPoint1(GLint i)
 {
-    d_1_0_Deprecated->EvalPoint1(i);
+    d_1_0_Deprecated->f.EvalPoint1(i);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEvalMesh1(GLenum mode, GLint i1, GLint i2)
 {
-    d_1_0_Deprecated->EvalMesh1(mode, i1, i2);
+    d_1_0_Deprecated->f.EvalMesh1(mode, i1, i2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEvalCoord2fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord2fv(u);
+    d_1_0_Deprecated->f.EvalCoord2fv(u);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEvalCoord2f(GLfloat u, GLfloat v)
 {
-    d_1_0_Deprecated->EvalCoord2f(u, v);
+    d_1_0_Deprecated->f.EvalCoord2f(u, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEvalCoord2dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord2dv(u);
+    d_1_0_Deprecated->f.EvalCoord2dv(u);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEvalCoord2d(GLdouble u, GLdouble v)
 {
-    d_1_0_Deprecated->EvalCoord2d(u, v);
+    d_1_0_Deprecated->f.EvalCoord2d(u, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEvalCoord1fv(const GLfloat *u)
 {
-    d_1_0_Deprecated->EvalCoord1fv(u);
+    d_1_0_Deprecated->f.EvalCoord1fv(u);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEvalCoord1f(GLfloat u)
 {
-    d_1_0_Deprecated->EvalCoord1f(u);
+    d_1_0_Deprecated->f.EvalCoord1f(u);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEvalCoord1dv(const GLdouble *u)
 {
-    d_1_0_Deprecated->EvalCoord1dv(u);
+    d_1_0_Deprecated->f.EvalCoord1dv(u);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEvalCoord1d(GLdouble u)
 {
-    d_1_0_Deprecated->EvalCoord1d(u);
+    d_1_0_Deprecated->f.EvalCoord1d(u);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-    d_1_0_Deprecated->MapGrid2f(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2f(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-    d_1_0_Deprecated->MapGrid2d(un, u1, u2, vn, v1, v2);
+    d_1_0_Deprecated->f.MapGrid2d(un, u1, u2, vn, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
 {
-    d_1_0_Deprecated->MapGrid1f(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1f(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
 {
-    d_1_0_Deprecated->MapGrid1d(un, u1, u2);
+    d_1_0_Deprecated->f.MapGrid1d(un, u1, u2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
+    d_1_0_Deprecated->f.Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-    d_1_0_Deprecated->Map1f(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1f(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-    d_1_0_Deprecated->Map1d(target, u1, u2, stride, order, points);
+    d_1_0_Deprecated->f.Map1d(target, u1, u2, stride, order, points);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPushAttrib(GLbitfield mask)
 {
-    d_1_0_Deprecated->PushAttrib(mask);
+    d_1_0_Deprecated->f.PushAttrib(mask);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPopAttrib()
 {
-    d_1_0_Deprecated->PopAttrib();
+    d_1_0_Deprecated->f.PopAttrib();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glAccum(GLenum op, GLfloat value)
 {
-    d_1_0_Deprecated->Accum(op, value);
+    d_1_0_Deprecated->f.Accum(op, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glIndexMask(GLuint mask)
 {
-    d_1_0_Deprecated->IndexMask(mask);
+    d_1_0_Deprecated->f.IndexMask(mask);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearIndex(GLfloat c)
 {
-    d_1_0_Deprecated->ClearIndex(c);
+    d_1_0_Deprecated->f.ClearIndex(c);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->ClearAccum(red, green, blue, alpha);
+    d_1_0_Deprecated->f.ClearAccum(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPushName(GLuint name)
 {
-    d_1_0_Deprecated->PushName(name);
+    d_1_0_Deprecated->f.PushName(name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPopName()
 {
-    d_1_0_Deprecated->PopName();
+    d_1_0_Deprecated->f.PopName();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPassThrough(GLfloat token)
 {
-    d_1_0_Deprecated->PassThrough(token);
+    d_1_0_Deprecated->f.PassThrough(token);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLoadName(GLuint name)
 {
-    d_1_0_Deprecated->LoadName(name);
+    d_1_0_Deprecated->f.LoadName(name);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glInitNames()
 {
-    d_1_0_Deprecated->InitNames();
+    d_1_0_Deprecated->f.InitNames();
 }
 
 inline GLint QOpenGLFunctions_4_5_Compatibility::glRenderMode(GLenum mode)
 {
-    return d_1_0_Deprecated->RenderMode(mode);
+    return d_1_0_Deprecated->f.RenderMode(mode);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSelectBuffer(GLsizei size, GLuint *buffer)
 {
-    d_1_0_Deprecated->SelectBuffer(size, buffer);
+    d_1_0_Deprecated->f.SelectBuffer(size, buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
 {
-    d_1_0_Deprecated->FeedbackBuffer(size, type, buffer);
+    d_1_0_Deprecated->f.FeedbackBuffer(size, type, buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexGeniv(GLenum coord, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexGeniv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGeniv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexGeni(GLenum coord, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexGeni(coord, pname, param);
+    d_1_0_Deprecated->f.TexGeni(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexGenfv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGenfv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexGenf(GLenum coord, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexGenf(coord, pname, param);
+    d_1_0_Deprecated->f.TexGenf(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
 {
-    d_1_0_Deprecated->TexGendv(coord, pname, params);
+    d_1_0_Deprecated->f.TexGendv(coord, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexGend(GLenum coord, GLenum pname, GLdouble param)
 {
-    d_1_0_Deprecated->TexGend(coord, pname, param);
+    d_1_0_Deprecated->f.TexGend(coord, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexEnviv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->TexEnviv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnviv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexEnvi(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->TexEnvi(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvi(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->TexEnvfv(target, pname, params);
+    d_1_0_Deprecated->f.TexEnvfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexEnvf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->TexEnvf(target, pname, param);
+    d_1_0_Deprecated->f.TexEnvf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glShadeModel(GLenum mode)
 {
-    d_1_0_Deprecated->ShadeModel(mode);
+    d_1_0_Deprecated->f.ShadeModel(mode);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPolygonStipple(const GLubyte *mask)
 {
-    d_1_0_Deprecated->PolygonStipple(mask);
+    d_1_0_Deprecated->f.PolygonStipple(mask);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMaterialiv(GLenum face, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Materialiv(face, pname, params);
+    d_1_0_Deprecated->f.Materialiv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMateriali(GLenum face, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Materiali(face, pname, param);
+    d_1_0_Deprecated->f.Materiali(face, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Materialfv(face, pname, params);
+    d_1_0_Deprecated->f.Materialfv(face, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMaterialf(GLenum face, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Materialf(face, pname, param);
+    d_1_0_Deprecated->f.Materialf(face, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLineStipple(GLint factor, GLushort pattern)
 {
-    d_1_0_Deprecated->LineStipple(factor, pattern);
+    d_1_0_Deprecated->f.LineStipple(factor, pattern);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLightModeliv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->LightModeliv(pname, params);
+    d_1_0_Deprecated->f.LightModeliv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLightModeli(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->LightModeli(pname, param);
+    d_1_0_Deprecated->f.LightModeli(pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLightModelfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->LightModelfv(pname, params);
+    d_1_0_Deprecated->f.LightModelfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLightModelf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->LightModelf(pname, param);
+    d_1_0_Deprecated->f.LightModelf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLightiv(GLenum light, GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Lightiv(light, pname, params);
+    d_1_0_Deprecated->f.Lightiv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLighti(GLenum light, GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Lighti(light, pname, param);
+    d_1_0_Deprecated->f.Lighti(light, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLightfv(GLenum light, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Lightfv(light, pname, params);
+    d_1_0_Deprecated->f.Lightfv(light, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLightf(GLenum light, GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Lightf(light, pname, param);
+    d_1_0_Deprecated->f.Lightf(light, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFogiv(GLenum pname, const GLint *params)
 {
-    d_1_0_Deprecated->Fogiv(pname, params);
+    d_1_0_Deprecated->f.Fogiv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFogi(GLenum pname, GLint param)
 {
-    d_1_0_Deprecated->Fogi(pname, param);
+    d_1_0_Deprecated->f.Fogi(pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFogfv(GLenum pname, const GLfloat *params)
 {
-    d_1_0_Deprecated->Fogfv(pname, params);
+    d_1_0_Deprecated->f.Fogfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFogf(GLenum pname, GLfloat param)
 {
-    d_1_0_Deprecated->Fogf(pname, param);
+    d_1_0_Deprecated->f.Fogf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColorMaterial(GLenum face, GLenum mode)
 {
-    d_1_0_Deprecated->ColorMaterial(face, mode);
+    d_1_0_Deprecated->f.ColorMaterial(face, mode);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClipPlane(GLenum plane, const GLdouble *equation)
 {
-    d_1_0_Deprecated->ClipPlane(plane, equation);
+    d_1_0_Deprecated->f.ClipPlane(plane, equation);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex4sv(v);
+    d_1_0_Deprecated->f.Vertex4sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->Vertex4s(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex4iv(v);
+    d_1_0_Deprecated->f.Vertex4iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->Vertex4i(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex4fv(v);
+    d_1_0_Deprecated->f.Vertex4fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->Vertex4f(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex4dv(v);
+    d_1_0_Deprecated->f.Vertex4dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->Vertex4d(x, y, z, w);
+    d_1_0_Deprecated->f.Vertex4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex3sv(v);
+    d_1_0_Deprecated->f.Vertex3sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->Vertex3s(x, y, z);
+    d_1_0_Deprecated->f.Vertex3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex3iv(v);
+    d_1_0_Deprecated->f.Vertex3iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->Vertex3i(x, y, z);
+    d_1_0_Deprecated->f.Vertex3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex3fv(v);
+    d_1_0_Deprecated->f.Vertex3fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->Vertex3f(x, y, z);
+    d_1_0_Deprecated->f.Vertex3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex3dv(v);
+    d_1_0_Deprecated->f.Vertex3dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->Vertex3d(x, y, z);
+    d_1_0_Deprecated->f.Vertex3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Vertex2sv(v);
+    d_1_0_Deprecated->f.Vertex2sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->Vertex2s(x, y);
+    d_1_0_Deprecated->f.Vertex2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex2iv(const GLint *v)
 {
-    d_1_0_Deprecated->Vertex2iv(v);
+    d_1_0_Deprecated->f.Vertex2iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->Vertex2i(x, y);
+    d_1_0_Deprecated->f.Vertex2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Vertex2fv(v);
+    d_1_0_Deprecated->f.Vertex2fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->Vertex2f(x, y);
+    d_1_0_Deprecated->f.Vertex2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Vertex2dv(v);
+    d_1_0_Deprecated->f.Vertex2dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertex2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->Vertex2d(x, y);
+    d_1_0_Deprecated->f.Vertex2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord4sv(v);
+    d_1_0_Deprecated->f.TexCoord4sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_0_Deprecated->TexCoord4s(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4s(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord4iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord4iv(v);
+    d_1_0_Deprecated->f.TexCoord4iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord4i(GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_0_Deprecated->TexCoord4i(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4i(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord4fv(v);
+    d_1_0_Deprecated->f.TexCoord4fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_0_Deprecated->TexCoord4f(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4f(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord4dv(v);
+    d_1_0_Deprecated->f.TexCoord4dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_0_Deprecated->TexCoord4d(s, t, r, q);
+    d_1_0_Deprecated->f.TexCoord4d(s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord3sv(v);
+    d_1_0_Deprecated->f.TexCoord3sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord3s(GLshort s, GLshort t, GLshort r)
 {
-    d_1_0_Deprecated->TexCoord3s(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3s(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord3iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord3iv(v);
+    d_1_0_Deprecated->f.TexCoord3iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord3i(GLint s, GLint t, GLint r)
 {
-    d_1_0_Deprecated->TexCoord3i(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3i(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord3fv(v);
+    d_1_0_Deprecated->f.TexCoord3fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_0_Deprecated->TexCoord3f(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3f(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord3dv(v);
+    d_1_0_Deprecated->f.TexCoord3dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_0_Deprecated->TexCoord3d(s, t, r);
+    d_1_0_Deprecated->f.TexCoord3d(s, t, r);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord2sv(v);
+    d_1_0_Deprecated->f.TexCoord2sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord2s(GLshort s, GLshort t)
 {
-    d_1_0_Deprecated->TexCoord2s(s, t);
+    d_1_0_Deprecated->f.TexCoord2s(s, t);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord2iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord2iv(v);
+    d_1_0_Deprecated->f.TexCoord2iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord2i(GLint s, GLint t)
 {
-    d_1_0_Deprecated->TexCoord2i(s, t);
+    d_1_0_Deprecated->f.TexCoord2i(s, t);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord2fv(v);
+    d_1_0_Deprecated->f.TexCoord2fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord2f(GLfloat s, GLfloat t)
 {
-    d_1_0_Deprecated->TexCoord2f(s, t);
+    d_1_0_Deprecated->f.TexCoord2f(s, t);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord2dv(v);
+    d_1_0_Deprecated->f.TexCoord2dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord2d(GLdouble s, GLdouble t)
 {
-    d_1_0_Deprecated->TexCoord2d(s, t);
+    d_1_0_Deprecated->f.TexCoord2d(s, t);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord1sv(const GLshort *v)
 {
-    d_1_0_Deprecated->TexCoord1sv(v);
+    d_1_0_Deprecated->f.TexCoord1sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord1s(GLshort s)
 {
-    d_1_0_Deprecated->TexCoord1s(s);
+    d_1_0_Deprecated->f.TexCoord1s(s);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord1iv(const GLint *v)
 {
-    d_1_0_Deprecated->TexCoord1iv(v);
+    d_1_0_Deprecated->f.TexCoord1iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord1i(GLint s)
 {
-    d_1_0_Deprecated->TexCoord1i(s);
+    d_1_0_Deprecated->f.TexCoord1i(s);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord1fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->TexCoord1fv(v);
+    d_1_0_Deprecated->f.TexCoord1fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord1f(GLfloat s)
 {
-    d_1_0_Deprecated->TexCoord1f(s);
+    d_1_0_Deprecated->f.TexCoord1f(s);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord1dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->TexCoord1dv(v);
+    d_1_0_Deprecated->f.TexCoord1dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoord1d(GLdouble s)
 {
-    d_1_0_Deprecated->TexCoord1d(s);
+    d_1_0_Deprecated->f.TexCoord1d(s);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRectsv(const GLshort *v1, const GLshort *v2)
 {
-    d_1_0_Deprecated->Rectsv(v1, v2);
+    d_1_0_Deprecated->f.Rectsv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-    d_1_0_Deprecated->Rects(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rects(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRectiv(const GLint *v1, const GLint *v2)
 {
-    d_1_0_Deprecated->Rectiv(v1, v2);
+    d_1_0_Deprecated->f.Rectiv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRecti(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-    d_1_0_Deprecated->Recti(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Recti(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRectfv(const GLfloat *v1, const GLfloat *v2)
 {
-    d_1_0_Deprecated->Rectfv(v1, v2);
+    d_1_0_Deprecated->f.Rectfv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-    d_1_0_Deprecated->Rectf(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectf(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRectdv(const GLdouble *v1, const GLdouble *v2)
 {
-    d_1_0_Deprecated->Rectdv(v1, v2);
+    d_1_0_Deprecated->f.Rectdv(v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-    d_1_0_Deprecated->Rectd(x1, y1, x2, y2);
+    d_1_0_Deprecated->f.Rectd(x1, y1, x2, y2);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos4sv(v);
+    d_1_0_Deprecated->f.RasterPos4sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_1_0_Deprecated->RasterPos4s(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4s(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos4iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos4iv(v);
+    d_1_0_Deprecated->f.RasterPos4iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos4i(GLint x, GLint y, GLint z, GLint w)
 {
-    d_1_0_Deprecated->RasterPos4i(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4i(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos4fv(v);
+    d_1_0_Deprecated->f.RasterPos4fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_1_0_Deprecated->RasterPos4f(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4f(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos4dv(v);
+    d_1_0_Deprecated->f.RasterPos4dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_1_0_Deprecated->RasterPos4d(x, y, z, w);
+    d_1_0_Deprecated->f.RasterPos4d(x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos3sv(v);
+    d_1_0_Deprecated->f.RasterPos3sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_0_Deprecated->RasterPos3s(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos3iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos3iv(v);
+    d_1_0_Deprecated->f.RasterPos3iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_0_Deprecated->RasterPos3i(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos3fv(v);
+    d_1_0_Deprecated->f.RasterPos3fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_0_Deprecated->RasterPos3f(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos3dv(v);
+    d_1_0_Deprecated->f.RasterPos3dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_0_Deprecated->RasterPos3d(x, y, z);
+    d_1_0_Deprecated->f.RasterPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos2sv(const GLshort *v)
 {
-    d_1_0_Deprecated->RasterPos2sv(v);
+    d_1_0_Deprecated->f.RasterPos2sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos2s(GLshort x, GLshort y)
 {
-    d_1_0_Deprecated->RasterPos2s(x, y);
+    d_1_0_Deprecated->f.RasterPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos2iv(const GLint *v)
 {
-    d_1_0_Deprecated->RasterPos2iv(v);
+    d_1_0_Deprecated->f.RasterPos2iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos2i(GLint x, GLint y)
 {
-    d_1_0_Deprecated->RasterPos2i(x, y);
+    d_1_0_Deprecated->f.RasterPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos2fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->RasterPos2fv(v);
+    d_1_0_Deprecated->f.RasterPos2fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos2f(GLfloat x, GLfloat y)
 {
-    d_1_0_Deprecated->RasterPos2f(x, y);
+    d_1_0_Deprecated->f.RasterPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos2dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->RasterPos2dv(v);
+    d_1_0_Deprecated->f.RasterPos2dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glRasterPos2d(GLdouble x, GLdouble y)
 {
-    d_1_0_Deprecated->RasterPos2d(x, y);
+    d_1_0_Deprecated->f.RasterPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNormal3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Normal3sv(v);
+    d_1_0_Deprecated->f.Normal3sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNormal3s(GLshort nx, GLshort ny, GLshort nz)
 {
-    d_1_0_Deprecated->Normal3s(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3s(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNormal3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Normal3iv(v);
+    d_1_0_Deprecated->f.Normal3iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNormal3i(GLint nx, GLint ny, GLint nz)
 {
-    d_1_0_Deprecated->Normal3i(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3i(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNormal3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Normal3fv(v);
+    d_1_0_Deprecated->f.Normal3fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-    d_1_0_Deprecated->Normal3f(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3f(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNormal3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Normal3dv(v);
+    d_1_0_Deprecated->f.Normal3dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-    d_1_0_Deprecated->Normal3d(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3d(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNormal3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Normal3bv(v);
+    d_1_0_Deprecated->f.Normal3bv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-    d_1_0_Deprecated->Normal3b(nx, ny, nz);
+    d_1_0_Deprecated->f.Normal3b(nx, ny, nz);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glIndexsv(const GLshort *c)
 {
-    d_1_0_Deprecated->Indexsv(c);
+    d_1_0_Deprecated->f.Indexsv(c);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glIndexs(GLshort c)
 {
-    d_1_0_Deprecated->Indexs(c);
+    d_1_0_Deprecated->f.Indexs(c);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glIndexiv(const GLint *c)
 {
-    d_1_0_Deprecated->Indexiv(c);
+    d_1_0_Deprecated->f.Indexiv(c);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glIndexi(GLint c)
 {
-    d_1_0_Deprecated->Indexi(c);
+    d_1_0_Deprecated->f.Indexi(c);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glIndexfv(const GLfloat *c)
 {
-    d_1_0_Deprecated->Indexfv(c);
+    d_1_0_Deprecated->f.Indexfv(c);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glIndexf(GLfloat c)
 {
-    d_1_0_Deprecated->Indexf(c);
+    d_1_0_Deprecated->f.Indexf(c);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glIndexdv(const GLdouble *c)
 {
-    d_1_0_Deprecated->Indexdv(c);
+    d_1_0_Deprecated->f.Indexdv(c);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glIndexd(GLdouble c)
 {
-    d_1_0_Deprecated->Indexd(c);
+    d_1_0_Deprecated->f.Indexd(c);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEnd()
 {
-    d_1_0_Deprecated->End();
+    d_1_0_Deprecated->f.End();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEdgeFlagv(const GLboolean *flag)
 {
-    d_1_0_Deprecated->EdgeFlagv(flag);
+    d_1_0_Deprecated->f.EdgeFlagv(flag);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEdgeFlag(GLboolean flag)
 {
-    d_1_0_Deprecated->EdgeFlag(flag);
+    d_1_0_Deprecated->f.EdgeFlag(flag);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color4usv(v);
+    d_1_0_Deprecated->f.Color4usv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-    d_1_0_Deprecated->Color4us(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4us(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color4uiv(v);
+    d_1_0_Deprecated->f.Color4uiv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-    d_1_0_Deprecated->Color4ui(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ui(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color4ubv(v);
+    d_1_0_Deprecated->f.Color4ubv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-    d_1_0_Deprecated->Color4ub(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4ub(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color4sv(v);
+    d_1_0_Deprecated->f.Color4sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-    d_1_0_Deprecated->Color4s(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4s(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color4iv(v);
+    d_1_0_Deprecated->f.Color4iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4i(GLint red, GLint green, GLint blue, GLint alpha)
 {
-    d_1_0_Deprecated->Color4i(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4i(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color4fv(v);
+    d_1_0_Deprecated->f.Color4fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Deprecated->Color4f(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4f(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color4dv(v);
+    d_1_0_Deprecated->f.Color4dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-    d_1_0_Deprecated->Color4d(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4d(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color4bv(v);
+    d_1_0_Deprecated->f.Color4bv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-    d_1_0_Deprecated->Color4b(red, green, blue, alpha);
+    d_1_0_Deprecated->f.Color4b(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3usv(const GLushort *v)
 {
-    d_1_0_Deprecated->Color3usv(v);
+    d_1_0_Deprecated->f.Color3usv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_0_Deprecated->Color3us(red, green, blue);
+    d_1_0_Deprecated->f.Color3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3uiv(const GLuint *v)
 {
-    d_1_0_Deprecated->Color3uiv(v);
+    d_1_0_Deprecated->f.Color3uiv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_0_Deprecated->Color3ui(red, green, blue);
+    d_1_0_Deprecated->f.Color3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3ubv(const GLubyte *v)
 {
-    d_1_0_Deprecated->Color3ubv(v);
+    d_1_0_Deprecated->f.Color3ubv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_0_Deprecated->Color3ub(red, green, blue);
+    d_1_0_Deprecated->f.Color3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3sv(const GLshort *v)
 {
-    d_1_0_Deprecated->Color3sv(v);
+    d_1_0_Deprecated->f.Color3sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_0_Deprecated->Color3s(red, green, blue);
+    d_1_0_Deprecated->f.Color3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3iv(const GLint *v)
 {
-    d_1_0_Deprecated->Color3iv(v);
+    d_1_0_Deprecated->f.Color3iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_0_Deprecated->Color3i(red, green, blue);
+    d_1_0_Deprecated->f.Color3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3fv(const GLfloat *v)
 {
-    d_1_0_Deprecated->Color3fv(v);
+    d_1_0_Deprecated->f.Color3fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_0_Deprecated->Color3f(red, green, blue);
+    d_1_0_Deprecated->f.Color3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3dv(const GLdouble *v)
 {
-    d_1_0_Deprecated->Color3dv(v);
+    d_1_0_Deprecated->f.Color3dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_0_Deprecated->Color3d(red, green, blue);
+    d_1_0_Deprecated->f.Color3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3bv(const GLbyte *v)
 {
-    d_1_0_Deprecated->Color3bv(v);
+    d_1_0_Deprecated->f.Color3bv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_0_Deprecated->Color3b(red, green, blue);
+    d_1_0_Deprecated->f.Color3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-    d_1_0_Deprecated->Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+    d_1_0_Deprecated->f.Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glBegin(GLenum mode)
 {
-    d_1_0_Deprecated->Begin(mode);
+    d_1_0_Deprecated->f.Begin(mode);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glListBase(GLuint base)
 {
-    d_1_0_Deprecated->ListBase(base);
+    d_1_0_Deprecated->f.ListBase(base);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Compatibility::glGenLists(GLsizei range)
 {
-    return d_1_0_Deprecated->GenLists(range);
+    return d_1_0_Deprecated->f.GenLists(range);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDeleteLists(GLuint list, GLsizei range)
 {
-    d_1_0_Deprecated->DeleteLists(list, range);
+    d_1_0_Deprecated->f.DeleteLists(list, range);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCallLists(GLsizei n, GLenum type, const void *lists)
 {
-    d_1_0_Deprecated->CallLists(n, type, lists);
+    d_1_0_Deprecated->f.CallLists(n, type, lists);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCallList(GLuint list)
 {
-    d_1_0_Deprecated->CallList(list);
+    d_1_0_Deprecated->f.CallList(list);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEndList()
 {
-    d_1_0_Deprecated->EndList();
+    d_1_0_Deprecated->f.EndList();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNewList(GLuint list, GLenum mode)
 {
-    d_1_0_Deprecated->NewList(list, mode);
+    d_1_0_Deprecated->f.NewList(list, mode);
 }
 
 
 // OpenGL 1.1 deprecated functions
 inline void QOpenGLFunctions_4_5_Compatibility::glPushClientAttrib(GLbitfield mask)
 {
-    d_1_1_Deprecated->PushClientAttrib(mask);
+    d_1_1_Deprecated->f.PushClientAttrib(mask);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPopClientAttrib()
 {
-    d_1_1_Deprecated->PopClientAttrib();
+    d_1_1_Deprecated->f.PopClientAttrib();
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glIndexubv(const GLubyte *c)
 {
-    d_1_1_Deprecated->Indexubv(c);
+    d_1_1_Deprecated->f.Indexubv(c);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glIndexub(GLubyte c)
 {
-    d_1_1_Deprecated->Indexub(c);
+    d_1_1_Deprecated->f.Indexub(c);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glPrioritizeTextures(GLsizei n, const GLuint *textures, const GLfloat *priorities)
 {
-    d_1_1_Deprecated->PrioritizeTextures(n, textures, priorities);
+    d_1_1_Deprecated->f.PrioritizeTextures(n, textures, priorities);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Compatibility::glAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-    return d_1_1_Deprecated->AreTexturesResident(n, textures, residences);
+    return d_1_1_Deprecated->f.AreTexturesResident(n, textures, residences);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_1_1_Deprecated->VertexPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.VertexPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_1_1_Deprecated->TexCoordPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.TexCoordPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNormalPointer(GLenum type, GLsizei stride, const void *pointer)
 {
-    d_1_1_Deprecated->NormalPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.NormalPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glInterleavedArrays(GLenum format, GLsizei stride, const void *pointer)
 {
-    d_1_1_Deprecated->InterleavedArrays(format, stride, pointer);
+    d_1_1_Deprecated->f.InterleavedArrays(format, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetPointerv(GLenum pname, void * *params)
 {
-    d_1_1_Deprecated->GetPointerv(pname, params);
+    d_1_1_Deprecated->f.GetPointerv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glIndexPointer(GLenum type, GLsizei stride, const void *pointer)
 {
-    d_1_1_Deprecated->IndexPointer(type, stride, pointer);
+    d_1_1_Deprecated->f.IndexPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEnableClientState(GLenum array)
 {
-    d_1_1_Deprecated->EnableClientState(array);
+    d_1_1_Deprecated->f.EnableClientState(array);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glEdgeFlagPointer(GLsizei stride, const void *pointer)
 {
-    d_1_1_Deprecated->EdgeFlagPointer(stride, pointer);
+    d_1_1_Deprecated->f.EdgeFlagPointer(stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glDisableClientState(GLenum array)
 {
-    d_1_1_Deprecated->DisableClientState(array);
+    d_1_1_Deprecated->f.DisableClientState(array);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_1_1_Deprecated->ColorPointer(size, type, stride, pointer);
+    d_1_1_Deprecated->f.ColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glArrayElement(GLint i)
 {
-    d_1_1_Deprecated->ArrayElement(i);
+    d_1_1_Deprecated->f.ArrayElement(i);
 }
 
 
 // OpenGL 1.2 deprecated functions
 inline void QOpenGLFunctions_4_5_Compatibility::glColorTable(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table)
 {
-    d_1_2_Deprecated->ColorTable(target, internalformat, width, format, type, table);
+    d_1_2_Deprecated->f.ColorTable(target, internalformat, width, format, type, table);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorTable(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyColorTable(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetColorTable(GLenum target, GLenum format, GLenum type, void *table)
 {
-    d_1_2_Deprecated->GetColorTable(target, format, type, table);
+    d_1_2_Deprecated->f.GetColorTable(target, format, type, table);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetColorTableParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetColorTableParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetColorTableParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetColorTableParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColorSubTable(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data)
 {
-    d_1_2_Deprecated->ColorSubTable(target, start, count, format, type, data);
+    d_1_2_Deprecated->f.ColorSubTable(target, start, count, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyColorSubTable(target, start, x, y, width);
+    d_1_2_Deprecated->f.CopyColorSubTable(target, start, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter1D(target, internalformat, width, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter1D(target, internalformat, width, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image)
 {
-    d_1_2_Deprecated->ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
+    d_1_2_Deprecated->f.ConvolutionFilter2D(target, internalformat, width, height, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glConvolutionParameterf(GLenum target, GLenum pname, GLfloat params)
 {
-    d_1_2_Deprecated->ConvolutionParameterf(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterf(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_2_Deprecated->ConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glConvolutionParameteri(GLenum target, GLenum pname, GLint params)
 {
-    d_1_2_Deprecated->ConvolutionParameteri(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteri(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_2_Deprecated->ConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.ConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyConvolutionFilter1D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter1D(target, internalformat, x, y, width);
+    d_1_2_Deprecated->f.CopyConvolutionFilter1D(target, internalformat, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glCopyConvolutionFilter2D(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Deprecated->CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
+    d_1_2_Deprecated->f.CopyConvolutionFilter2D(target, internalformat, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetConvolutionFilter(GLenum target, GLenum format, GLenum type, void *image)
 {
-    d_1_2_Deprecated->GetConvolutionFilter(target, format, type, image);
+    d_1_2_Deprecated->f.GetConvolutionFilter(target, format, type, image);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetConvolutionParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetConvolutionParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetSeparableFilter(GLenum target, GLenum format, GLenum type, void *row, void *column, void *span)
 {
-    d_1_2_Deprecated->GetSeparableFilter(target, format, type, row, column, span);
+    d_1_2_Deprecated->f.GetSeparableFilter(target, format, type, row, column, span);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSeparableFilter2D(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column)
 {
-    d_1_2_Deprecated->SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
+    d_1_2_Deprecated->f.SeparableFilter2D(target, internalformat, width, height, format, type, row, column);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, void *values)
 {
-    d_1_2_Deprecated->GetHistogram(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetHistogram(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetHistogramParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetHistogramParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetHistogramParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, void *values)
 {
-    d_1_2_Deprecated->GetMinmax(target, reset, format, type, values);
+    d_1_2_Deprecated->f.GetMinmax(target, reset, format, type, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameterfv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_2_Deprecated->GetMinmaxParameteriv(target, pname, params);
+    d_1_2_Deprecated->f.GetMinmaxParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glHistogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Histogram(target, width, internalformat, sink);
+    d_1_2_Deprecated->f.Histogram(target, width, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMinmax(GLenum target, GLenum internalformat, GLboolean sink)
 {
-    d_1_2_Deprecated->Minmax(target, internalformat, sink);
+    d_1_2_Deprecated->f.Minmax(target, internalformat, sink);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glResetHistogram(GLenum target)
 {
-    d_1_2_Deprecated->ResetHistogram(target);
+    d_1_2_Deprecated->f.ResetHistogram(target);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glResetMinmax(GLenum target)
 {
-    d_1_2_Deprecated->ResetMinmax(target);
+    d_1_2_Deprecated->f.ResetMinmax(target);
 }
 
 
 // OpenGL 1.3 deprecated functions
 inline void QOpenGLFunctions_4_5_Compatibility::glMultTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixd(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->MultTransposeMatrixf(m);
+    d_1_3_Deprecated->f.MultTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLoadTransposeMatrixd(const GLdouble *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixd(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixd(m);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glLoadTransposeMatrixf(const GLfloat *m)
 {
-    d_1_3_Deprecated->LoadTransposeMatrixf(m);
+    d_1_3_Deprecated->f.LoadTransposeMatrixf(m);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord4sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-    d_1_3_Deprecated->MultiTexCoord4s(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4s(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord4iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-    d_1_3_Deprecated->MultiTexCoord4i(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4i(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord4fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-    d_1_3_Deprecated->MultiTexCoord4f(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4f(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord4dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord4dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord4dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-    d_1_3_Deprecated->MultiTexCoord4d(target, s, t, r, q);
+    d_1_3_Deprecated->f.MultiTexCoord4d(target, s, t, r, q);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord3sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-    d_1_3_Deprecated->MultiTexCoord3s(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3s(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord3iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r)
 {
-    d_1_3_Deprecated->MultiTexCoord3i(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3i(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord3fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord3f(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-    d_1_3_Deprecated->MultiTexCoord3f(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3f(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord3dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord3dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord3dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-    d_1_3_Deprecated->MultiTexCoord3d(target, s, t, r);
+    d_1_3_Deprecated->f.MultiTexCoord3d(target, s, t, r);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord2sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord2s(GLenum target, GLshort s, GLshort t)
 {
-    d_1_3_Deprecated->MultiTexCoord2s(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2s(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord2iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord2i(GLenum target, GLint s, GLint t)
 {
-    d_1_3_Deprecated->MultiTexCoord2i(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2i(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord2fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord2f(GLenum target, GLfloat s, GLfloat t)
 {
-    d_1_3_Deprecated->MultiTexCoord2f(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2f(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord2dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord2dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord2dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord2d(GLenum target, GLdouble s, GLdouble t)
 {
-    d_1_3_Deprecated->MultiTexCoord2d(target, s, t);
+    d_1_3_Deprecated->f.MultiTexCoord2d(target, s, t);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord1sv(GLenum target, const GLshort *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1sv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1sv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord1s(GLenum target, GLshort s)
 {
-    d_1_3_Deprecated->MultiTexCoord1s(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1s(target, s);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord1iv(GLenum target, const GLint *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1iv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1iv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord1i(GLenum target, GLint s)
 {
-    d_1_3_Deprecated->MultiTexCoord1i(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1i(target, s);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord1fv(GLenum target, const GLfloat *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1fv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1fv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord1f(GLenum target, GLfloat s)
 {
-    d_1_3_Deprecated->MultiTexCoord1f(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1f(target, s);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord1dv(GLenum target, const GLdouble *v)
 {
-    d_1_3_Deprecated->MultiTexCoord1dv(target, v);
+    d_1_3_Deprecated->f.MultiTexCoord1dv(target, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoord1d(GLenum target, GLdouble s)
 {
-    d_1_3_Deprecated->MultiTexCoord1d(target, s);
+    d_1_3_Deprecated->f.MultiTexCoord1d(target, s);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glClientActiveTexture(GLenum texture)
 {
-    d_1_3_Deprecated->ClientActiveTexture(texture);
+    d_1_3_Deprecated->f.ClientActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 deprecated functions
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos3sv(v);
+    d_1_4_Deprecated->f.WindowPos3sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos3s(GLshort x, GLshort y, GLshort z)
 {
-    d_1_4_Deprecated->WindowPos3s(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3s(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos3iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos3iv(v);
+    d_1_4_Deprecated->f.WindowPos3iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos3i(GLint x, GLint y, GLint z)
 {
-    d_1_4_Deprecated->WindowPos3i(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3i(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos3fv(v);
+    d_1_4_Deprecated->f.WindowPos3fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos3f(GLfloat x, GLfloat y, GLfloat z)
 {
-    d_1_4_Deprecated->WindowPos3f(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3f(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos3dv(v);
+    d_1_4_Deprecated->f.WindowPos3dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos3d(GLdouble x, GLdouble y, GLdouble z)
 {
-    d_1_4_Deprecated->WindowPos3d(x, y, z);
+    d_1_4_Deprecated->f.WindowPos3d(x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos2sv(const GLshort *v)
 {
-    d_1_4_Deprecated->WindowPos2sv(v);
+    d_1_4_Deprecated->f.WindowPos2sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos2s(GLshort x, GLshort y)
 {
-    d_1_4_Deprecated->WindowPos2s(x, y);
+    d_1_4_Deprecated->f.WindowPos2s(x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos2iv(const GLint *v)
 {
-    d_1_4_Deprecated->WindowPos2iv(v);
+    d_1_4_Deprecated->f.WindowPos2iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos2i(GLint x, GLint y)
 {
-    d_1_4_Deprecated->WindowPos2i(x, y);
+    d_1_4_Deprecated->f.WindowPos2i(x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos2fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->WindowPos2fv(v);
+    d_1_4_Deprecated->f.WindowPos2fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos2f(GLfloat x, GLfloat y)
 {
-    d_1_4_Deprecated->WindowPos2f(x, y);
+    d_1_4_Deprecated->f.WindowPos2f(x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos2dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->WindowPos2dv(v);
+    d_1_4_Deprecated->f.WindowPos2dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glWindowPos2d(GLdouble x, GLdouble y)
 {
-    d_1_4_Deprecated->WindowPos2d(x, y);
+    d_1_4_Deprecated->f.WindowPos2d(x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_1_4_Deprecated->SecondaryColorPointer(size, type, stride, pointer);
+    d_1_4_Deprecated->f.SecondaryColorPointer(size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3usv(const GLushort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3usv(v);
+    d_1_4_Deprecated->f.SecondaryColor3usv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3us(GLushort red, GLushort green, GLushort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3us(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3us(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3uiv(const GLuint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3uiv(v);
+    d_1_4_Deprecated->f.SecondaryColor3uiv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3ui(GLuint red, GLuint green, GLuint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ui(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ui(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3ubv(const GLubyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3ubv(v);
+    d_1_4_Deprecated->f.SecondaryColor3ubv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3ub(GLubyte red, GLubyte green, GLubyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3ub(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3ub(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3sv(const GLshort *v)
 {
-    d_1_4_Deprecated->SecondaryColor3sv(v);
+    d_1_4_Deprecated->f.SecondaryColor3sv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3s(GLshort red, GLshort green, GLshort blue)
 {
-    d_1_4_Deprecated->SecondaryColor3s(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3s(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3iv(const GLint *v)
 {
-    d_1_4_Deprecated->SecondaryColor3iv(v);
+    d_1_4_Deprecated->f.SecondaryColor3iv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3i(GLint red, GLint green, GLint blue)
 {
-    d_1_4_Deprecated->SecondaryColor3i(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3i(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3fv(const GLfloat *v)
 {
-    d_1_4_Deprecated->SecondaryColor3fv(v);
+    d_1_4_Deprecated->f.SecondaryColor3fv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3f(GLfloat red, GLfloat green, GLfloat blue)
 {
-    d_1_4_Deprecated->SecondaryColor3f(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3f(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3dv(const GLdouble *v)
 {
-    d_1_4_Deprecated->SecondaryColor3dv(v);
+    d_1_4_Deprecated->f.SecondaryColor3dv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3d(GLdouble red, GLdouble green, GLdouble blue)
 {
-    d_1_4_Deprecated->SecondaryColor3d(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3d(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3bv(const GLbyte *v)
 {
-    d_1_4_Deprecated->SecondaryColor3bv(v);
+    d_1_4_Deprecated->f.SecondaryColor3bv(v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColor3b(GLbyte red, GLbyte green, GLbyte blue)
 {
-    d_1_4_Deprecated->SecondaryColor3b(red, green, blue);
+    d_1_4_Deprecated->f.SecondaryColor3b(red, green, blue);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFogCoordPointer(GLenum type, GLsizei stride, const void *pointer)
 {
-    d_1_4_Deprecated->FogCoordPointer(type, stride, pointer);
+    d_1_4_Deprecated->f.FogCoordPointer(type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFogCoorddv(const GLdouble *coord)
 {
-    d_1_4_Deprecated->FogCoorddv(coord);
+    d_1_4_Deprecated->f.FogCoorddv(coord);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFogCoordd(GLdouble coord)
 {
-    d_1_4_Deprecated->FogCoordd(coord);
+    d_1_4_Deprecated->f.FogCoordd(coord);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFogCoordfv(const GLfloat *coord)
 {
-    d_1_4_Deprecated->FogCoordfv(coord);
+    d_1_4_Deprecated->f.FogCoordfv(coord);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glFogCoordf(GLfloat coord)
 {
-    d_1_4_Deprecated->FogCoordf(coord);
+    d_1_4_Deprecated->f.FogCoordf(coord);
 }
 
 
@@ -6448,152 +6455,152 @@ inline void QOpenGLFunctions_4_5_Compatibility::glFogCoordf(GLfloat coord)
 // OpenGL 3.3 deprecated functions
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColorP3uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->SecondaryColorP3uiv(type, color);
+    d_3_3_Deprecated->f.SecondaryColorP3uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glSecondaryColorP3ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->SecondaryColorP3ui(type, color);
+    d_3_3_Deprecated->f.SecondaryColorP3ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColorP4uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->ColorP4uiv(type, color);
+    d_3_3_Deprecated->f.ColorP4uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColorP4ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->ColorP4ui(type, color);
+    d_3_3_Deprecated->f.ColorP4ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColorP3uiv(GLenum type, const GLuint *color)
 {
-    d_3_3_Deprecated->ColorP3uiv(type, color);
+    d_3_3_Deprecated->f.ColorP3uiv(type, color);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glColorP3ui(GLenum type, GLuint color)
 {
-    d_3_3_Deprecated->ColorP3ui(type, color);
+    d_3_3_Deprecated->f.ColorP3ui(type, color);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNormalP3uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->NormalP3uiv(type, coords);
+    d_3_3_Deprecated->f.NormalP3uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glNormalP3ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->NormalP3ui(type, coords);
+    d_3_3_Deprecated->f.NormalP3ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoordP4uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP4uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP4uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoordP4ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP4ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP4ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoordP3uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP3uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP3uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoordP3ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP3ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP3ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoordP2uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP2uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP2uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoordP2ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP2ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP2ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoordP1uiv(GLenum texture, GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP1uiv(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP1uiv(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glMultiTexCoordP1ui(GLenum texture, GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->MultiTexCoordP1ui(texture, type, coords);
+    d_3_3_Deprecated->f.MultiTexCoordP1ui(texture, type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoordP4uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP4uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP4uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoordP4ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP4ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP4ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoordP3uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP3uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP3uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoordP3ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP3ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP3ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoordP2uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP2uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP2uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoordP2ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP2ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP2ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoordP1uiv(GLenum type, const GLuint *coords)
 {
-    d_3_3_Deprecated->TexCoordP1uiv(type, coords);
+    d_3_3_Deprecated->f.TexCoordP1uiv(type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glTexCoordP1ui(GLenum type, GLuint coords)
 {
-    d_3_3_Deprecated->TexCoordP1ui(type, coords);
+    d_3_3_Deprecated->f.TexCoordP1ui(type, coords);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexP4uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP4uiv(type, value);
+    d_3_3_Deprecated->f.VertexP4uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexP4ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP4ui(type, value);
+    d_3_3_Deprecated->f.VertexP4ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexP3uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP3uiv(type, value);
+    d_3_3_Deprecated->f.VertexP3uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexP3ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP3ui(type, value);
+    d_3_3_Deprecated->f.VertexP3ui(type, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexP2uiv(GLenum type, const GLuint *value)
 {
-    d_3_3_Deprecated->VertexP2uiv(type, value);
+    d_3_3_Deprecated->f.VertexP2uiv(type, value);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glVertexP2ui(GLenum type, GLuint value)
 {
-    d_3_3_Deprecated->VertexP2ui(type, value);
+    d_3_3_Deprecated->f.VertexP2ui(type, value);
 }
 
 
@@ -6610,62 +6617,62 @@ inline void QOpenGLFunctions_4_5_Compatibility::glVertexP2ui(GLenum type, GLuint
 // OpenGL 4.5 deprecated functions
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values)
 {
-    d_4_5_Deprecated->GetnMinmax(target, reset, format, type, bufSize, values);
+    d_4_5_Deprecated->f.GetnMinmax(target, reset, format, type, bufSize, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values)
 {
-    d_4_5_Deprecated->GetnHistogram(target, reset, format, type, bufSize, values);
+    d_4_5_Deprecated->f.GetnHistogram(target, reset, format, type, bufSize, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnSeparableFilter(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span)
 {
-    d_4_5_Deprecated->GetnSeparableFilter(target, format, type, rowBufSize, row, columnBufSize, column, span);
+    d_4_5_Deprecated->f.GetnSeparableFilter(target, format, type, rowBufSize, row, columnBufSize, column, span);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnConvolutionFilter(GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image)
 {
-    d_4_5_Deprecated->GetnConvolutionFilter(target, format, type, bufSize, image);
+    d_4_5_Deprecated->f.GetnConvolutionFilter(target, format, type, bufSize, image);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnColorTable(GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table)
 {
-    d_4_5_Deprecated->GetnColorTable(target, format, type, bufSize, table);
+    d_4_5_Deprecated->f.GetnColorTable(target, format, type, bufSize, table);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnPolygonStipple(GLsizei bufSize, GLubyte *pattern)
 {
-    d_4_5_Deprecated->GetnPolygonStipple(bufSize, pattern);
+    d_4_5_Deprecated->f.GetnPolygonStipple(bufSize, pattern);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnPixelMapusv(GLenum map, GLsizei bufSize, GLushort *values)
 {
-    d_4_5_Deprecated->GetnPixelMapusv(map, bufSize, values);
+    d_4_5_Deprecated->f.GetnPixelMapusv(map, bufSize, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnPixelMapuiv(GLenum map, GLsizei bufSize, GLuint *values)
 {
-    d_4_5_Deprecated->GetnPixelMapuiv(map, bufSize, values);
+    d_4_5_Deprecated->f.GetnPixelMapuiv(map, bufSize, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnPixelMapfv(GLenum map, GLsizei bufSize, GLfloat *values)
 {
-    d_4_5_Deprecated->GetnPixelMapfv(map, bufSize, values);
+    d_4_5_Deprecated->f.GetnPixelMapfv(map, bufSize, values);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnMapiv(GLenum target, GLenum query, GLsizei bufSize, GLint *v)
 {
-    d_4_5_Deprecated->GetnMapiv(target, query, bufSize, v);
+    d_4_5_Deprecated->f.GetnMapiv(target, query, bufSize, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnMapfv(GLenum target, GLenum query, GLsizei bufSize, GLfloat *v)
 {
-    d_4_5_Deprecated->GetnMapfv(target, query, bufSize, v);
+    d_4_5_Deprecated->f.GetnMapfv(target, query, bufSize, v);
 }
 
 inline void QOpenGLFunctions_4_5_Compatibility::glGetnMapdv(GLenum target, GLenum query, GLsizei bufSize, GLdouble *v)
 {
-    d_4_5_Deprecated->GetnMapdv(target, query, bufSize, v);
+    d_4_5_Deprecated->f.GetnMapdv(target, query, bufSize, v);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_4_5_core.cpp b/src/gui/opengl/qopenglfunctions_4_5_core.cpp
index ce57ec51f2..2fdb9ef855 100644
--- a/src/gui/opengl/qopenglfunctions_4_5_core.cpp
+++ b/src/gui/opengl/qopenglfunctions_4_5_core.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -84,78 +90,60 @@ QOpenGLFunctions_4_5_Core::QOpenGLFunctions_4_5_Core()
 
 QOpenGLFunctions_4_5_Core::~QOpenGLFunctions_4_5_Core()
 {
-    if (d_1_0_Core && !d_1_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_0_Core->context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        delete d_1_0_Core;
-    }
-    if (d_1_1_Core && !d_1_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_1_Core->context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        delete d_1_1_Core;
-    }
-    if (d_1_2_Core && !d_1_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_2_Core->context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        delete d_1_2_Core;
-    }
-    if (d_1_3_Core && !d_1_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_3_Core->context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        delete d_1_3_Core;
-    }
-    if (d_1_4_Core && !d_1_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_4_Core->context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        delete d_1_4_Core;
-    }
-    if (d_1_5_Core && !d_1_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_1_5_Core->context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        delete d_1_5_Core;
-    }
-    if (d_2_0_Core && !d_2_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_0_Core->context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        delete d_2_0_Core;
-    }
-    if (d_2_1_Core && !d_2_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_2_1_Core->context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        delete d_2_1_Core;
-    }
-    if (d_3_0_Core && !d_3_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_0_Core->context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        delete d_3_0_Core;
-    }
-    if (d_3_1_Core && !d_3_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_1_Core->context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        delete d_3_1_Core;
-    }
-    if (d_3_2_Core && !d_3_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_2_Core->context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        delete d_3_2_Core;
-    }
-    if (d_3_3_Core && !d_3_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_3_3_Core->context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        delete d_3_3_Core;
-    }
-    if (d_4_0_Core && !d_4_0_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_0_Core->context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        delete d_4_0_Core;
-    }
-    if (d_4_1_Core && !d_4_1_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_1_Core->context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        delete d_4_1_Core;
-    }
-    if (d_4_2_Core && !d_4_2_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_2_Core->context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        delete d_4_2_Core;
-    }
-    if (d_4_3_Core && !d_4_3_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_3_Core->context, QOpenGLFunctions_4_3_CoreBackend::versionStatus());
-        delete d_4_3_Core;
-    }
-    if (d_4_4_Core && !d_4_4_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_4_Core->context, QOpenGLFunctions_4_4_CoreBackend::versionStatus());
-        delete d_4_4_Core;
-    }
-    if (d_4_5_Core && !d_4_5_Core->refs.deref()) {
-        QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(d_4_5_Core->context, QOpenGLFunctions_4_5_CoreBackend::versionStatus());
-        delete d_4_5_Core;
-    }
+    if (d_1_0_Core)
+        d_1_0_Core->refs.deref();
+    Q_ASSERT(d_1_0_Core->refs.load());
+    if (d_1_1_Core)
+        d_1_1_Core->refs.deref();
+    Q_ASSERT(d_1_1_Core->refs.load());
+    if (d_1_2_Core)
+        d_1_2_Core->refs.deref();
+    Q_ASSERT(d_1_2_Core->refs.load());
+    if (d_1_3_Core)
+        d_1_3_Core->refs.deref();
+    Q_ASSERT(d_1_3_Core->refs.load());
+    if (d_1_4_Core)
+        d_1_4_Core->refs.deref();
+    Q_ASSERT(d_1_4_Core->refs.load());
+    if (d_1_5_Core)
+        d_1_5_Core->refs.deref();
+    Q_ASSERT(d_1_5_Core->refs.load());
+    if (d_2_0_Core)
+        d_2_0_Core->refs.deref();
+    Q_ASSERT(d_2_0_Core->refs.load());
+    if (d_2_1_Core)
+        d_2_1_Core->refs.deref();
+    Q_ASSERT(d_2_1_Core->refs.load());
+    if (d_3_0_Core)
+        d_3_0_Core->refs.deref();
+    Q_ASSERT(d_3_0_Core->refs.load());
+    if (d_3_1_Core)
+        d_3_1_Core->refs.deref();
+    Q_ASSERT(d_3_1_Core->refs.load());
+    if (d_3_2_Core)
+        d_3_2_Core->refs.deref();
+    Q_ASSERT(d_3_2_Core->refs.load());
+    if (d_3_3_Core)
+        d_3_3_Core->refs.deref();
+    Q_ASSERT(d_3_3_Core->refs.load());
+    if (d_4_0_Core)
+        d_4_0_Core->refs.deref();
+    Q_ASSERT(d_4_0_Core->refs.load());
+    if (d_4_1_Core)
+        d_4_1_Core->refs.deref();
+    Q_ASSERT(d_4_1_Core->refs.load());
+    if (d_4_2_Core)
+        d_4_2_Core->refs.deref();
+    Q_ASSERT(d_4_2_Core->refs.load());
+    if (d_4_3_Core)
+        d_4_3_Core->refs.deref();
+    Q_ASSERT(d_4_3_Core->refs.load());
+    if (d_4_4_Core)
+        d_4_4_Core->refs.deref();
+    Q_ASSERT(d_4_4_Core->refs.load());
+    if (d_4_5_Core)
+        d_4_5_Core->refs.deref();
+    Q_ASSERT(d_4_5_Core->refs.load());
 }
 
 bool QOpenGLFunctions_4_5_Core::initializeOpenGLFunctions()
@@ -174,146 +162,74 @@ bool QOpenGLFunctions_4_5_Core::initializeOpenGLFunctions()
         // Function pointers in the backends are resolved at creation time
         QOpenGLVersionFunctionsBackend* d = 0;
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_0_CoreBackend::versionStatus(), d);
-        }
         d_1_0_Core = static_cast<QOpenGLFunctions_1_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_1_CoreBackend::versionStatus(), d);
-        }
         d_1_1_Core = static_cast<QOpenGLFunctions_1_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_2_CoreBackend::versionStatus(), d);
-        }
         d_1_2_Core = static_cast<QOpenGLFunctions_1_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_3_CoreBackend::versionStatus(), d);
-        }
         d_1_3_Core = static_cast<QOpenGLFunctions_1_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_4_CoreBackend::versionStatus(), d);
-        }
         d_1_4_Core = static_cast<QOpenGLFunctions_1_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_1_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_1_5_CoreBackend::versionStatus(), d);
-        }
         d_1_5_Core = static_cast<QOpenGLFunctions_1_5_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_0_CoreBackend::versionStatus(), d);
-        }
         d_2_0_Core = static_cast<QOpenGLFunctions_2_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_2_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_2_1_CoreBackend::versionStatus(), d);
-        }
         d_2_1_Core = static_cast<QOpenGLFunctions_2_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_0_CoreBackend::versionStatus(), d);
-        }
         d_3_0_Core = static_cast<QOpenGLFunctions_3_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_1_CoreBackend::versionStatus(), d);
-        }
         d_3_1_Core = static_cast<QOpenGLFunctions_3_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_2_CoreBackend::versionStatus(), d);
-        }
         d_3_2_Core = static_cast<QOpenGLFunctions_3_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_3_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_3_3_CoreBackend::versionStatus(), d);
-        }
         d_3_3_Core = static_cast<QOpenGLFunctions_3_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_0_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_0_CoreBackend::versionStatus(), d);
-        }
         d_4_0_Core = static_cast<QOpenGLFunctions_4_0_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_1_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_1_CoreBackend::versionStatus(), d);
-        }
         d_4_1_Core = static_cast<QOpenGLFunctions_4_1_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_2_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_2_CoreBackend::versionStatus(), d);
-        }
         d_4_2_Core = static_cast<QOpenGLFunctions_4_2_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_3_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_3_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_3_CoreBackend::versionStatus(), d);
-        }
         d_4_3_Core = static_cast<QOpenGLFunctions_4_3_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_4_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_4_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_4_CoreBackend::versionStatus(), d);
-        }
         d_4_4_Core = static_cast<QOpenGLFunctions_4_4_CoreBackend*>(d);
         d->refs.ref();
 
         d = QAbstractOpenGLFunctionsPrivate::functionsBackend(context, QOpenGLFunctions_4_5_CoreBackend::versionStatus());
-        if (!d) {
-            d = new QOpenGLFunctions_4_5_CoreBackend(context);
-            QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(context, QOpenGLFunctions_4_5_CoreBackend::versionStatus(), d);
-        }
         d_4_5_Core = static_cast<QOpenGLFunctions_4_5_CoreBackend*>(d);
         d->refs.ref();
 
diff --git a/src/gui/opengl/qopenglfunctions_4_5_core.h b/src/gui/opengl/qopenglfunctions_4_5_core.h
index 8191f9da8e..b086e63917 100644
--- a/src/gui/opengl/qopenglfunctions_4_5_core.h
+++ b/src/gui/opengl/qopenglfunctions_4_5_core.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the QtWidgets module of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -773,3276 +780,3276 @@ private:
 // OpenGL 1.0 core functions
 inline void QOpenGLFunctions_4_5_Core::glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Viewport(x, y, width, height);
+    d_1_0_Core->f.Viewport(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDepthRange(GLdouble nearVal, GLdouble farVal)
 {
-    d_1_0_Core->DepthRange(nearVal, farVal);
+    d_1_0_Core->f.DepthRange(nearVal, farVal);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Core::glIsEnabled(GLenum cap)
 {
-    return d_1_0_Core->IsEnabled(cap);
+    return d_1_0_Core->f.IsEnabled(cap);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexLevelParameteriv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameteriv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexLevelParameterfv(target, level, pname, params);
+    d_1_0_Core->f.GetTexLevelParameterfv(target, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_0_Core->GetTexParameteriv(target, pname, params);
+    d_1_0_Core->f.GetTexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
-    d_1_0_Core->GetTexParameterfv(target, pname, params);
+    d_1_0_Core->f.GetTexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, void *pixels)
 {
-    d_1_0_Core->GetTexImage(target, level, format, type, pixels);
+    d_1_0_Core->f.GetTexImage(target, level, format, type, pixels);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_5_Core::glGetString(GLenum name)
 {
-    return d_1_0_Core->GetString(name);
+    return d_1_0_Core->f.GetString(name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetIntegerv(GLenum pname, GLint *data)
 {
-    d_1_0_Core->GetIntegerv(pname, data);
+    d_1_0_Core->f.GetIntegerv(pname, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetFloatv(GLenum pname, GLfloat *data)
 {
-    d_1_0_Core->GetFloatv(pname, data);
+    d_1_0_Core->f.GetFloatv(pname, data);
 }
 
 inline GLenum QOpenGLFunctions_4_5_Core::glGetError()
 {
-    return d_1_0_Core->GetError();
+    return d_1_0_Core->f.GetError();
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetDoublev(GLenum pname, GLdouble *data)
 {
-    d_1_0_Core->GetDoublev(pname, data);
+    d_1_0_Core->f.GetDoublev(pname, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetBooleanv(GLenum pname, GLboolean *data)
 {
-    d_1_0_Core->GetBooleanv(pname, data);
+    d_1_0_Core->f.GetBooleanv(pname, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels)
 {
-    d_1_0_Core->ReadPixels(x, y, width, height, format, type, pixels);
+    d_1_0_Core->f.ReadPixels(x, y, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glReadBuffer(GLenum src)
 {
-    d_1_0_Core->ReadBuffer(src);
+    d_1_0_Core->f.ReadBuffer(src);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glPixelStorei(GLenum pname, GLint param)
 {
-    d_1_0_Core->PixelStorei(pname, param);
+    d_1_0_Core->f.PixelStorei(pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glPixelStoref(GLenum pname, GLfloat param)
 {
-    d_1_0_Core->PixelStoref(pname, param);
+    d_1_0_Core->f.PixelStoref(pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDepthFunc(GLenum func)
 {
-    d_1_0_Core->DepthFunc(func);
+    d_1_0_Core->f.DepthFunc(func);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
 {
-    d_1_0_Core->StencilOp(fail, zfail, zpass);
+    d_1_0_Core->f.StencilOp(fail, zfail, zpass);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glStencilFunc(GLenum func, GLint ref, GLuint mask)
 {
-    d_1_0_Core->StencilFunc(func, ref, mask);
+    d_1_0_Core->f.StencilFunc(func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glLogicOp(GLenum opcode)
 {
-    d_1_0_Core->LogicOp(opcode);
+    d_1_0_Core->f.LogicOp(opcode);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBlendFunc(GLenum sfactor, GLenum dfactor)
 {
-    d_1_0_Core->BlendFunc(sfactor, dfactor);
+    d_1_0_Core->f.BlendFunc(sfactor, dfactor);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glFlush()
 {
-    d_1_0_Core->Flush();
+    d_1_0_Core->f.Flush();
 }
 
 inline void QOpenGLFunctions_4_5_Core::glFinish()
 {
-    d_1_0_Core->Finish();
+    d_1_0_Core->f.Finish();
 }
 
 inline void QOpenGLFunctions_4_5_Core::glEnable(GLenum cap)
 {
-    d_1_0_Core->Enable(cap);
+    d_1_0_Core->f.Enable(cap);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDisable(GLenum cap)
 {
-    d_1_0_Core->Disable(cap);
+    d_1_0_Core->f.Disable(cap);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDepthMask(GLboolean flag)
 {
-    d_1_0_Core->DepthMask(flag);
+    d_1_0_Core->f.DepthMask(flag);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-    d_1_0_Core->ColorMask(red, green, blue, alpha);
+    d_1_0_Core->f.ColorMask(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glStencilMask(GLuint mask)
 {
-    d_1_0_Core->StencilMask(mask);
+    d_1_0_Core->f.StencilMask(mask);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearDepth(GLdouble depth)
 {
-    d_1_0_Core->ClearDepth(depth);
+    d_1_0_Core->f.ClearDepth(depth);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearStencil(GLint s)
 {
-    d_1_0_Core->ClearStencil(s);
+    d_1_0_Core->f.ClearStencil(s);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_0_Core->ClearColor(red, green, blue, alpha);
+    d_1_0_Core->f.ClearColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClear(GLbitfield mask)
 {
-    d_1_0_Core->Clear(mask);
+    d_1_0_Core->f.Clear(mask);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawBuffer(GLenum buf)
 {
-    d_1_0_Core->DrawBuffer(buf);
+    d_1_0_Core->f.DrawBuffer(buf);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_0_Core->TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
+    d_1_0_Core->f.TexImage2D(target, level, internalformat, width, height, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_0_Core->TexImage1D(target, level, internalformat, width, border, format, type, pixels);
+    d_1_0_Core->f.TexImage1D(target, level, internalformat, width, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_1_0_Core->TexParameteriv(target, pname, params);
+    d_1_0_Core->f.TexParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_1_0_Core->TexParameteri(target, pname, param);
+    d_1_0_Core->f.TexParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
-    d_1_0_Core->TexParameterfv(target, pname, params);
+    d_1_0_Core->f.TexParameterfv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 {
-    d_1_0_Core->TexParameterf(target, pname, param);
+    d_1_0_Core->f.TexParameterf(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_0_Core->Scissor(x, y, width, height);
+    d_1_0_Core->f.Scissor(x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glPolygonMode(GLenum face, GLenum mode)
 {
-    d_1_0_Core->PolygonMode(face, mode);
+    d_1_0_Core->f.PolygonMode(face, mode);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glPointSize(GLfloat size)
 {
-    d_1_0_Core->PointSize(size);
+    d_1_0_Core->f.PointSize(size);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glLineWidth(GLfloat width)
 {
-    d_1_0_Core->LineWidth(width);
+    d_1_0_Core->f.LineWidth(width);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glHint(GLenum target, GLenum mode)
 {
-    d_1_0_Core->Hint(target, mode);
+    d_1_0_Core->f.Hint(target, mode);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glFrontFace(GLenum mode)
 {
-    d_1_0_Core->FrontFace(mode);
+    d_1_0_Core->f.FrontFace(mode);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCullFace(GLenum mode)
 {
-    d_1_0_Core->CullFace(mode);
+    d_1_0_Core->f.CullFace(mode);
 }
 
 
 // OpenGL 1.1 core functions
 inline GLboolean QOpenGLFunctions_4_5_Core::glIsTexture(GLuint texture)
 {
-    return d_1_1_Core->IsTexture(texture);
+    return d_1_1_Core->f.IsTexture(texture);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGenTextures(GLsizei n, GLuint *textures)
 {
-    d_1_1_Core->GenTextures(n, textures);
+    d_1_1_Core->f.GenTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDeleteTextures(GLsizei n, const GLuint *textures)
 {
-    d_1_1_Core->DeleteTextures(n, textures);
+    d_1_1_Core->f.DeleteTextures(n, textures);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindTexture(GLenum target, GLuint texture)
 {
-    d_1_1_Core->BindTexture(target, texture);
+    d_1_1_Core->f.BindTexture(target, texture);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_1_Core->TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_1_1_Core->f.TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_1_Core->TexSubImage1D(target, level, xoffset, width, format, type, pixels);
+    d_1_1_Core->f.TexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_1_Core->CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+    d_1_1_Core->f.CopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_1_1_Core->CopyTexSubImage1D(target, level, xoffset, x, y, width);
+    d_1_1_Core->f.CopyTexSubImage1D(target, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-    d_1_1_Core->CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+    d_1_1_Core->f.CopyTexImage2D(target, level, internalformat, x, y, width, height, border);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-    d_1_1_Core->CopyTexImage1D(target, level, internalformat, x, y, width, border);
+    d_1_1_Core->f.CopyTexImage1D(target, level, internalformat, x, y, width, border);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glPolygonOffset(GLfloat factor, GLfloat units)
 {
-    d_1_1_Core->PolygonOffset(factor, units);
+    d_1_1_Core->f.PolygonOffset(factor, units);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawElements(GLenum mode, GLsizei count, GLenum type, const void *indices)
 {
-    d_1_1_Core->DrawElements(mode, count, type, indices);
+    d_1_1_Core->f.DrawElements(mode, count, type, indices);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawArrays(GLenum mode, GLint first, GLsizei count)
 {
-    d_1_1_Core->DrawArrays(mode, first, count);
+    d_1_1_Core->f.DrawArrays(mode, first, count);
 }
 
 
 // OpenGL 1.2 core functions
 inline void QOpenGLFunctions_4_5_Core::glBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-    d_1_2_Core->BlendColor(red, green, blue, alpha);
+    d_1_2_Core->f.BlendColor(red, green, blue, alpha);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBlendEquation(GLenum mode)
 {
-    d_1_2_Core->BlendEquation(mode);
+    d_1_2_Core->f.BlendEquation(mode);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_1_2_Core->CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_1_2_Core->f.CopyTexSubImage3D(target, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_2_Core->TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_1_2_Core->f.TexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels)
 {
-    d_1_2_Core->TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
+    d_1_2_Core->f.TexImage3D(target, level, internalformat, width, height, depth, border, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices)
 {
-    d_1_2_Core->DrawRangeElements(mode, start, end, count, type, indices);
+    d_1_2_Core->f.DrawRangeElements(mode, start, end, count, type, indices);
 }
 
 
 // OpenGL 1.3 core functions
 inline void QOpenGLFunctions_4_5_Core::glGetCompressedTexImage(GLenum target, GLint level, void *img)
 {
-    d_1_3_Core->GetCompressedTexImage(target, level, img);
+    d_1_3_Core->f.GetCompressedTexImage(target, level, img);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_1_3_Core->f.CompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage1D(target, level, internalformat, width, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data)
 {
-    d_1_3_Core->CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
+    d_1_3_Core->f.CompressedTexImage3D(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glSampleCoverage(GLfloat value, GLboolean invert)
 {
-    d_1_3_Core->SampleCoverage(value, invert);
+    d_1_3_Core->f.SampleCoverage(value, invert);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glActiveTexture(GLenum texture)
 {
-    d_1_3_Core->ActiveTexture(texture);
+    d_1_3_Core->f.ActiveTexture(texture);
 }
 
 
 // OpenGL 1.4 core functions
 inline void QOpenGLFunctions_4_5_Core::glPointParameteriv(GLenum pname, const GLint *params)
 {
-    d_1_4_Core->PointParameteriv(pname, params);
+    d_1_4_Core->f.PointParameteriv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glPointParameteri(GLenum pname, GLint param)
 {
-    d_1_4_Core->PointParameteri(pname, param);
+    d_1_4_Core->f.PointParameteri(pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glPointParameterfv(GLenum pname, const GLfloat *params)
 {
-    d_1_4_Core->PointParameterfv(pname, params);
+    d_1_4_Core->f.PointParameterfv(pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glPointParameterf(GLenum pname, GLfloat param)
 {
-    d_1_4_Core->PointParameterf(pname, param);
+    d_1_4_Core->f.PointParameterf(pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glMultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawElements(mode, count, type, indices, drawcount);
+    d_1_4_Core->f.MultiDrawElements(mode, count, type, indices, drawcount);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glMultiDrawArrays(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)
 {
-    d_1_4_Core->MultiDrawArrays(mode, first, count, drawcount);
+    d_1_4_Core->f.MultiDrawArrays(mode, first, count, drawcount);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBlendFuncSeparate(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-    d_1_4_Core->BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+    d_1_4_Core->f.BlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 
 // OpenGL 1.5 core functions
 inline void QOpenGLFunctions_4_5_Core::glGetBufferPointerv(GLenum target, GLenum pname, void * *params)
 {
-    d_1_5_Core->GetBufferPointerv(target, pname, params);
+    d_1_5_Core->f.GetBufferPointerv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetBufferParameteriv(target, pname, params);
+    d_1_5_Core->f.GetBufferParameteriv(target, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Core::glUnmapBuffer(GLenum target)
 {
-    return d_1_5_Core->UnmapBuffer(target);
+    return d_1_5_Core->f.UnmapBuffer(target);
 }
 
 inline void * QOpenGLFunctions_4_5_Core::glMapBuffer(GLenum target, GLenum access)
 {
-    return d_1_5_Core->MapBuffer(target, access);
+    return d_1_5_Core->f.MapBuffer(target, access);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, void *data)
 {
-    d_1_5_Core->GetBufferSubData(target, offset, size, data);
+    d_1_5_Core->f.GetBufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void *data)
 {
-    d_1_5_Core->BufferSubData(target, offset, size, data);
+    d_1_5_Core->f.BufferSubData(target, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBufferData(GLenum target, GLsizeiptr size, const void *data, GLenum usage)
 {
-    d_1_5_Core->BufferData(target, size, data, usage);
+    d_1_5_Core->f.BufferData(target, size, data, usage);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Core::glIsBuffer(GLuint buffer)
 {
-    return d_1_5_Core->IsBuffer(buffer);
+    return d_1_5_Core->f.IsBuffer(buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGenBuffers(GLsizei n, GLuint *buffers)
 {
-    d_1_5_Core->GenBuffers(n, buffers);
+    d_1_5_Core->f.GenBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDeleteBuffers(GLsizei n, const GLuint *buffers)
 {
-    d_1_5_Core->DeleteBuffers(n, buffers);
+    d_1_5_Core->f.DeleteBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindBuffer(GLenum target, GLuint buffer)
 {
-    d_1_5_Core->BindBuffer(target, buffer);
+    d_1_5_Core->f.BindBuffer(target, buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
 {
-    d_1_5_Core->GetQueryObjectuiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectuiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryObjectiv(id, pname, params);
+    d_1_5_Core->f.GetQueryObjectiv(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetQueryiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_1_5_Core->GetQueryiv(target, pname, params);
+    d_1_5_Core->f.GetQueryiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glEndQuery(GLenum target)
 {
-    d_1_5_Core->EndQuery(target);
+    d_1_5_Core->f.EndQuery(target);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBeginQuery(GLenum target, GLuint id)
 {
-    d_1_5_Core->BeginQuery(target, id);
+    d_1_5_Core->f.BeginQuery(target, id);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Core::glIsQuery(GLuint id)
 {
-    return d_1_5_Core->IsQuery(id);
+    return d_1_5_Core->f.IsQuery(id);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDeleteQueries(GLsizei n, const GLuint *ids)
 {
-    d_1_5_Core->DeleteQueries(n, ids);
+    d_1_5_Core->f.DeleteQueries(n, ids);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGenQueries(GLsizei n, GLuint *ids)
 {
-    d_1_5_Core->GenQueries(n, ids);
+    d_1_5_Core->f.GenQueries(n, ids);
 }
 
 
 // OpenGL 2.0 core functions
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer)
 {
-    d_2_0_Core->VertexAttribPointer(index, size, type, normalized, stride, pointer);
+    d_2_0_Core->f.VertexAttribPointer(index, size, type, normalized, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4usv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4usv(index, v);
+    d_2_0_Core->f.VertexAttrib4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4uiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4uiv(index, v);
+    d_2_0_Core->f.VertexAttrib4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4ubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4ubv(index, v);
+    d_2_0_Core->f.VertexAttrib4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4sv(index, v);
+    d_2_0_Core->f.VertexAttrib4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-    d_2_0_Core->VertexAttrib4s(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4s(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4iv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4iv(index, v);
+    d_2_0_Core->f.VertexAttrib4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib4fv(index, v);
+    d_2_0_Core->f.VertexAttrib4fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-    d_2_0_Core->VertexAttrib4f(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4f(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib4dv(index, v);
+    d_2_0_Core->f.VertexAttrib4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_2_0_Core->VertexAttrib4d(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4bv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4bv(index, v);
+    d_2_0_Core->f.VertexAttrib4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4Nusv(GLuint index, const GLushort *v)
 {
-    d_2_0_Core->VertexAttrib4Nusv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nusv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4Nuiv(GLuint index, const GLuint *v)
 {
-    d_2_0_Core->VertexAttrib4Nuiv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nuiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4Nubv(GLuint index, const GLubyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nubv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-    d_2_0_Core->VertexAttrib4Nub(index, x, y, z, w);
+    d_2_0_Core->f.VertexAttrib4Nub(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4Nsv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib4Nsv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nsv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4Niv(GLuint index, const GLint *v)
 {
-    d_2_0_Core->VertexAttrib4Niv(index, v);
+    d_2_0_Core->f.VertexAttrib4Niv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib4Nbv(GLuint index, const GLbyte *v)
 {
-    d_2_0_Core->VertexAttrib4Nbv(index, v);
+    d_2_0_Core->f.VertexAttrib4Nbv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib3sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib3sv(index, v);
+    d_2_0_Core->f.VertexAttrib3sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-    d_2_0_Core->VertexAttrib3s(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3s(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib3fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib3fv(index, v);
+    d_2_0_Core->f.VertexAttrib3fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-    d_2_0_Core->VertexAttrib3f(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3f(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib3dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib3dv(index, v);
+    d_2_0_Core->f.VertexAttrib3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_2_0_Core->VertexAttrib3d(index, x, y, z);
+    d_2_0_Core->f.VertexAttrib3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib2sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib2sv(index, v);
+    d_2_0_Core->f.VertexAttrib2sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib2s(GLuint index, GLshort x, GLshort y)
 {
-    d_2_0_Core->VertexAttrib2s(index, x, y);
+    d_2_0_Core->f.VertexAttrib2s(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib2fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib2fv(index, v);
+    d_2_0_Core->f.VertexAttrib2fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 {
-    d_2_0_Core->VertexAttrib2f(index, x, y);
+    d_2_0_Core->f.VertexAttrib2f(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib2dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib2dv(index, v);
+    d_2_0_Core->f.VertexAttrib2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_2_0_Core->VertexAttrib2d(index, x, y);
+    d_2_0_Core->f.VertexAttrib2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib1sv(GLuint index, const GLshort *v)
 {
-    d_2_0_Core->VertexAttrib1sv(index, v);
+    d_2_0_Core->f.VertexAttrib1sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib1s(GLuint index, GLshort x)
 {
-    d_2_0_Core->VertexAttrib1s(index, x);
+    d_2_0_Core->f.VertexAttrib1s(index, x);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib1fv(GLuint index, const GLfloat *v)
 {
-    d_2_0_Core->VertexAttrib1fv(index, v);
+    d_2_0_Core->f.VertexAttrib1fv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib1f(GLuint index, GLfloat x)
 {
-    d_2_0_Core->VertexAttrib1f(index, x);
+    d_2_0_Core->f.VertexAttrib1f(index, x);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib1dv(GLuint index, const GLdouble *v)
 {
-    d_2_0_Core->VertexAttrib1dv(index, v);
+    d_2_0_Core->f.VertexAttrib1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttrib1d(GLuint index, GLdouble x)
 {
-    d_2_0_Core->VertexAttrib1d(index, x);
+    d_2_0_Core->f.VertexAttrib1d(index, x);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glValidateProgram(GLuint program)
 {
-    d_2_0_Core->ValidateProgram(program);
+    d_2_0_Core->f.ValidateProgram(program);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix4fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix3fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_0_Core->UniformMatrix2fv(location, count, transpose, value);
+    d_2_0_Core->f.UniformMatrix2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform4iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform4iv(location, count, value);
+    d_2_0_Core->f.Uniform4iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform3iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform3iv(location, count, value);
+    d_2_0_Core->f.Uniform3iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform2iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform2iv(location, count, value);
+    d_2_0_Core->f.Uniform2iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform1iv(GLint location, GLsizei count, const GLint *value)
 {
-    d_2_0_Core->Uniform1iv(location, count, value);
+    d_2_0_Core->f.Uniform1iv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform4fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform4fv(location, count, value);
+    d_2_0_Core->f.Uniform4fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform3fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform3fv(location, count, value);
+    d_2_0_Core->f.Uniform3fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform2fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform2fv(location, count, value);
+    d_2_0_Core->f.Uniform2fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform1fv(GLint location, GLsizei count, const GLfloat *value)
 {
-    d_2_0_Core->Uniform1fv(location, count, value);
+    d_2_0_Core->f.Uniform1fv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_2_0_Core->Uniform4i(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4i(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform3i(GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_2_0_Core->Uniform3i(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3i(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform2i(GLint location, GLint v0, GLint v1)
 {
-    d_2_0_Core->Uniform2i(location, v0, v1);
+    d_2_0_Core->f.Uniform2i(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform1i(GLint location, GLint v0)
 {
-    d_2_0_Core->Uniform1i(location, v0);
+    d_2_0_Core->f.Uniform1i(location, v0);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_2_0_Core->Uniform4f(location, v0, v1, v2, v3);
+    d_2_0_Core->f.Uniform4f(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_2_0_Core->Uniform3f(location, v0, v1, v2);
+    d_2_0_Core->f.Uniform3f(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform2f(GLint location, GLfloat v0, GLfloat v1)
 {
-    d_2_0_Core->Uniform2f(location, v0, v1);
+    d_2_0_Core->f.Uniform2f(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform1f(GLint location, GLfloat v0)
 {
-    d_2_0_Core->Uniform1f(location, v0);
+    d_2_0_Core->f.Uniform1f(location, v0);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUseProgram(GLuint program)
 {
-    d_2_0_Core->UseProgram(program);
+    d_2_0_Core->f.UseProgram(program);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glShaderSource(GLuint shader, GLsizei count, const GLchar *const *string, const GLint *length)
 {
-    d_2_0_Core->ShaderSource(shader, count, string, length);
+    d_2_0_Core->f.ShaderSource(shader, count, string, length);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glLinkProgram(GLuint program)
 {
-    d_2_0_Core->LinkProgram(program);
+    d_2_0_Core->f.LinkProgram(program);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Core::glIsShader(GLuint shader)
 {
-    return d_2_0_Core->IsShader(shader);
+    return d_2_0_Core->f.IsShader(shader);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Core::glIsProgram(GLuint program)
 {
-    return d_2_0_Core->IsProgram(program);
+    return d_2_0_Core->f.IsProgram(program);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetVertexAttribPointerv(GLuint index, GLenum pname, void * *pointer)
 {
-    d_2_0_Core->GetVertexAttribPointerv(index, pname, pointer);
+    d_2_0_Core->f.GetVertexAttribPointerv(index, pname, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetVertexAttribiv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
 {
-    d_2_0_Core->GetVertexAttribfv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribfv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_2_0_Core->GetVertexAttribdv(index, pname, params);
+    d_2_0_Core->f.GetVertexAttribdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetUniformiv(GLuint program, GLint location, GLint *params)
 {
-    d_2_0_Core->GetUniformiv(program, location, params);
+    d_2_0_Core->f.GetUniformiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetUniformfv(GLuint program, GLint location, GLfloat *params)
 {
-    d_2_0_Core->GetUniformfv(program, location, params);
+    d_2_0_Core->f.GetUniformfv(program, location, params);
 }
 
 inline GLint QOpenGLFunctions_4_5_Core::glGetUniformLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetUniformLocation(program, name);
+    return d_2_0_Core->f.GetUniformLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetShaderSource(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
-    d_2_0_Core->GetShaderSource(shader, bufSize, length, source);
+    d_2_0_Core->f.GetShaderSource(shader, bufSize, length, source);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetShaderInfoLog(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetShaderInfoLog(shader, bufSize, length, infoLog);
+    d_2_0_Core->f.GetShaderInfoLog(shader, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetShaderiv(shader, pname, params);
+    d_2_0_Core->f.GetShaderiv(shader, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetProgramInfoLog(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_2_0_Core->GetProgramInfoLog(program, bufSize, length, infoLog);
+    d_2_0_Core->f.GetProgramInfoLog(program, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetProgramiv(GLuint program, GLenum pname, GLint *params)
 {
-    d_2_0_Core->GetProgramiv(program, pname, params);
+    d_2_0_Core->f.GetProgramiv(program, pname, params);
 }
 
 inline GLint QOpenGLFunctions_4_5_Core::glGetAttribLocation(GLuint program, const GLchar *name)
 {
-    return d_2_0_Core->GetAttribLocation(program, name);
+    return d_2_0_Core->f.GetAttribLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetAttachedShaders(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders)
 {
-    d_2_0_Core->GetAttachedShaders(program, maxCount, count, shaders);
+    d_2_0_Core->f.GetAttachedShaders(program, maxCount, count, shaders);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveUniform(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveUniform(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
-    d_2_0_Core->GetActiveAttrib(program, index, bufSize, length, size, type, name);
+    d_2_0_Core->f.GetActiveAttrib(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glEnableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->EnableVertexAttribArray(index);
+    d_2_0_Core->f.EnableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDisableVertexAttribArray(GLuint index)
 {
-    d_2_0_Core->DisableVertexAttribArray(index);
+    d_2_0_Core->f.DisableVertexAttribArray(index);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDetachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->DetachShader(program, shader);
+    d_2_0_Core->f.DetachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDeleteShader(GLuint shader)
 {
-    d_2_0_Core->DeleteShader(shader);
+    d_2_0_Core->f.DeleteShader(shader);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDeleteProgram(GLuint program)
 {
-    d_2_0_Core->DeleteProgram(program);
+    d_2_0_Core->f.DeleteProgram(program);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Core::glCreateShader(GLenum type)
 {
-    return d_2_0_Core->CreateShader(type);
+    return d_2_0_Core->f.CreateShader(type);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Core::glCreateProgram()
 {
-    return d_2_0_Core->CreateProgram();
+    return d_2_0_Core->f.CreateProgram();
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCompileShader(GLuint shader)
 {
-    d_2_0_Core->CompileShader(shader);
+    d_2_0_Core->f.CompileShader(shader);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
 {
-    d_2_0_Core->BindAttribLocation(program, index, name);
+    d_2_0_Core->f.BindAttribLocation(program, index, name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glAttachShader(GLuint program, GLuint shader)
 {
-    d_2_0_Core->AttachShader(program, shader);
+    d_2_0_Core->f.AttachShader(program, shader);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glStencilMaskSeparate(GLenum face, GLuint mask)
 {
-    d_2_0_Core->StencilMaskSeparate(face, mask);
+    d_2_0_Core->f.StencilMaskSeparate(face, mask);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
 {
-    d_2_0_Core->StencilFuncSeparate(face, func, ref, mask);
+    d_2_0_Core->f.StencilFuncSeparate(face, func, ref, mask);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glStencilOpSeparate(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)
 {
-    d_2_0_Core->StencilOpSeparate(face, sfail, dpfail, dppass);
+    d_2_0_Core->f.StencilOpSeparate(face, sfail, dpfail, dppass);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawBuffers(GLsizei n, const GLenum *bufs)
 {
-    d_2_0_Core->DrawBuffers(n, bufs);
+    d_2_0_Core->f.DrawBuffers(n, bufs);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
 {
-    d_2_0_Core->BlendEquationSeparate(modeRGB, modeAlpha);
+    d_2_0_Core->f.BlendEquationSeparate(modeRGB, modeAlpha);
 }
 
 
 // OpenGL 2.1 core functions
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x3fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix4x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix4x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x4fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x4fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix3x2fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix3x2fv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_2_1_Core->UniformMatrix2x3fv(location, count, transpose, value);
+    d_2_1_Core->f.UniformMatrix2x3fv(location, count, transpose, value);
 }
 
 
 // OpenGL 3.0 core functions
 inline GLboolean QOpenGLFunctions_4_5_Core::glIsVertexArray(GLuint array)
 {
-    return d_3_0_Core->IsVertexArray(array);
+    return d_3_0_Core->f.IsVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGenVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_3_0_Core->GenVertexArrays(n, arrays);
+    d_3_0_Core->f.GenVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDeleteVertexArrays(GLsizei n, const GLuint *arrays)
 {
-    d_3_0_Core->DeleteVertexArrays(n, arrays);
+    d_3_0_Core->f.DeleteVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindVertexArray(GLuint array)
 {
-    d_3_0_Core->BindVertexArray(array);
+    d_3_0_Core->f.BindVertexArray(array);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 {
-    d_3_0_Core->FlushMappedBufferRange(target, offset, length);
+    d_3_0_Core->f.FlushMappedBufferRange(target, offset, length);
 }
 
 inline void * QOpenGLFunctions_4_5_Core::glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
-    return d_3_0_Core->MapBufferRange(target, offset, length, access);
+    return d_3_0_Core->f.MapBufferRange(target, offset, length, access);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_3_0_Core->FramebufferTextureLayer(target, attachment, texture, level, layer);
+    d_3_0_Core->f.FramebufferTextureLayer(target, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glRenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorageMultisample(target, samples, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorageMultisample(target, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_3_0_Core->BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_3_0_Core->f.BlitFramebuffer(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGenerateMipmap(GLenum target)
 {
-    d_3_0_Core->GenerateMipmap(target);
+    d_3_0_Core->f.GenerateMipmap(target);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
+    d_3_0_Core->f.GetFramebufferAttachmentParameteriv(target, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_3_0_Core->FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+    d_3_0_Core->f.FramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glFramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-    d_3_0_Core->FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
+    d_3_0_Core->f.FramebufferTexture3D(target, attachment, textarget, texture, level, zoffset);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture2D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture2D(target, attachment, textarget, texture, level);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glFramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
-    d_3_0_Core->FramebufferTexture1D(target, attachment, textarget, texture, level);
+    d_3_0_Core->f.FramebufferTexture1D(target, attachment, textarget, texture, level);
 }
 
 inline GLenum QOpenGLFunctions_4_5_Core::glCheckFramebufferStatus(GLenum target)
 {
-    return d_3_0_Core->CheckFramebufferStatus(target);
+    return d_3_0_Core->f.CheckFramebufferStatus(target);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGenFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_3_0_Core->GenFramebuffers(n, framebuffers);
+    d_3_0_Core->f.GenFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 {
-    d_3_0_Core->DeleteFramebuffers(n, framebuffers);
+    d_3_0_Core->f.DeleteFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindFramebuffer(GLenum target, GLuint framebuffer)
 {
-    d_3_0_Core->BindFramebuffer(target, framebuffer);
+    d_3_0_Core->f.BindFramebuffer(target, framebuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Core::glIsFramebuffer(GLuint framebuffer)
 {
-    return d_3_0_Core->IsFramebuffer(framebuffer);
+    return d_3_0_Core->f.IsFramebuffer(framebuffer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetRenderbufferParameteriv(target, pname, params);
+    d_3_0_Core->f.GetRenderbufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_3_0_Core->RenderbufferStorage(target, internalformat, width, height);
+    d_3_0_Core->f.RenderbufferStorage(target, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_3_0_Core->GenRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.GenRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 {
-    d_3_0_Core->DeleteRenderbuffers(n, renderbuffers);
+    d_3_0_Core->f.DeleteRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindRenderbuffer(GLenum target, GLuint renderbuffer)
 {
-    d_3_0_Core->BindRenderbuffer(target, renderbuffer);
+    d_3_0_Core->f.BindRenderbuffer(target, renderbuffer);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Core::glIsRenderbuffer(GLuint renderbuffer)
 {
-    return d_3_0_Core->IsRenderbuffer(renderbuffer);
+    return d_3_0_Core->f.IsRenderbuffer(renderbuffer);
 }
 
 inline const GLubyte * QOpenGLFunctions_4_5_Core::glGetStringi(GLenum name, GLuint index)
 {
-    return d_3_0_Core->GetStringi(name, index);
+    return d_3_0_Core->f.GetStringi(name, index);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
 {
-    d_3_0_Core->ClearBufferfi(buffer, drawbuffer, depth, stencil);
+    d_3_0_Core->f.ClearBufferfi(buffer, drawbuffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_3_0_Core->ClearBufferfv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferfv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_3_0_Core->ClearBufferuiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferuiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_3_0_Core->ClearBufferiv(buffer, drawbuffer, value);
+    d_3_0_Core->f.ClearBufferiv(buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetTexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTexParameterIiv(GLenum target, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetTexParameterIiv(target, pname, params);
+    d_3_0_Core->f.GetTexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexParameterIuiv(GLenum target, GLenum pname, const GLuint *params)
 {
-    d_3_0_Core->TexParameterIuiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIuiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexParameterIiv(GLenum target, GLenum pname, const GLint *params)
 {
-    d_3_0_Core->TexParameterIiv(target, pname, params);
+    d_3_0_Core->f.TexParameterIiv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform4uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform4uiv(location, count, value);
+    d_3_0_Core->f.Uniform4uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform3uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform3uiv(location, count, value);
+    d_3_0_Core->f.Uniform3uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform2uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform2uiv(location, count, value);
+    d_3_0_Core->f.Uniform2uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform1uiv(GLint location, GLsizei count, const GLuint *value)
 {
-    d_3_0_Core->Uniform1uiv(location, count, value);
+    d_3_0_Core->f.Uniform1uiv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_3_0_Core->Uniform4ui(location, v0, v1, v2, v3);
+    d_3_0_Core->f.Uniform4ui(location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_3_0_Core->Uniform3ui(location, v0, v1, v2);
+    d_3_0_Core->f.Uniform3ui(location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform2ui(GLint location, GLuint v0, GLuint v1)
 {
-    d_3_0_Core->Uniform2ui(location, v0, v1);
+    d_3_0_Core->f.Uniform2ui(location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform1ui(GLint location, GLuint v0)
 {
-    d_3_0_Core->Uniform1ui(location, v0);
+    d_3_0_Core->f.Uniform1ui(location, v0);
 }
 
 inline GLint QOpenGLFunctions_4_5_Core::glGetFragDataLocation(GLuint program, const GLchar *name)
 {
-    return d_3_0_Core->GetFragDataLocation(program, name);
+    return d_3_0_Core->f.GetFragDataLocation(program, name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindFragDataLocation(GLuint program, GLuint color, const GLchar *name)
 {
-    d_3_0_Core->BindFragDataLocation(program, color, name);
+    d_3_0_Core->f.BindFragDataLocation(program, color, name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetUniformuiv(GLuint program, GLint location, GLuint *params)
 {
-    d_3_0_Core->GetUniformuiv(program, location, params);
+    d_3_0_Core->f.GetUniformuiv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI4usv(GLuint index, const GLushort *v)
 {
-    d_3_0_Core->VertexAttribI4usv(index, v);
+    d_3_0_Core->f.VertexAttribI4usv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI4ubv(GLuint index, const GLubyte *v)
 {
-    d_3_0_Core->VertexAttribI4ubv(index, v);
+    d_3_0_Core->f.VertexAttribI4ubv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI4sv(GLuint index, const GLshort *v)
 {
-    d_3_0_Core->VertexAttribI4sv(index, v);
+    d_3_0_Core->f.VertexAttribI4sv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI4bv(GLuint index, const GLbyte *v)
 {
-    d_3_0_Core->VertexAttribI4bv(index, v);
+    d_3_0_Core->f.VertexAttribI4bv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI4uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI4uiv(index, v);
+    d_3_0_Core->f.VertexAttribI4uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI3uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI3uiv(index, v);
+    d_3_0_Core->f.VertexAttribI3uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI2uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI2uiv(index, v);
+    d_3_0_Core->f.VertexAttribI2uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI1uiv(GLuint index, const GLuint *v)
 {
-    d_3_0_Core->VertexAttribI1uiv(index, v);
+    d_3_0_Core->f.VertexAttribI1uiv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI4iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI4iv(index, v);
+    d_3_0_Core->f.VertexAttribI4iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI3iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI3iv(index, v);
+    d_3_0_Core->f.VertexAttribI3iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI2iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI2iv(index, v);
+    d_3_0_Core->f.VertexAttribI2iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI1iv(GLuint index, const GLint *v)
 {
-    d_3_0_Core->VertexAttribI1iv(index, v);
+    d_3_0_Core->f.VertexAttribI1iv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
-    d_3_0_Core->VertexAttribI4ui(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4ui(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI3ui(GLuint index, GLuint x, GLuint y, GLuint z)
 {
-    d_3_0_Core->VertexAttribI3ui(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3ui(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI2ui(GLuint index, GLuint x, GLuint y)
 {
-    d_3_0_Core->VertexAttribI2ui(index, x, y);
+    d_3_0_Core->f.VertexAttribI2ui(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI1ui(GLuint index, GLuint x)
 {
-    d_3_0_Core->VertexAttribI1ui(index, x);
+    d_3_0_Core->f.VertexAttribI1ui(index, x);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
-    d_3_0_Core->VertexAttribI4i(index, x, y, z, w);
+    d_3_0_Core->f.VertexAttribI4i(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI3i(GLuint index, GLint x, GLint y, GLint z)
 {
-    d_3_0_Core->VertexAttribI3i(index, x, y, z);
+    d_3_0_Core->f.VertexAttribI3i(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI2i(GLuint index, GLint x, GLint y)
 {
-    d_3_0_Core->VertexAttribI2i(index, x, y);
+    d_3_0_Core->f.VertexAttribI2i(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribI1i(GLuint index, GLint x)
 {
-    d_3_0_Core->VertexAttribI1i(index, x);
+    d_3_0_Core->f.VertexAttribI1i(index, x);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
 {
-    d_3_0_Core->GetVertexAttribIuiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIuiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)
 {
-    d_3_0_Core->GetVertexAttribIiv(index, pname, params);
+    d_3_0_Core->f.GetVertexAttribIiv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_3_0_Core->VertexAttribIPointer(index, size, type, stride, pointer);
+    d_3_0_Core->f.VertexAttribIPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glEndConditionalRender()
 {
-    d_3_0_Core->EndConditionalRender();
+    d_3_0_Core->f.EndConditionalRender();
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBeginConditionalRender(GLuint id, GLenum mode)
 {
-    d_3_0_Core->BeginConditionalRender(id, mode);
+    d_3_0_Core->f.BeginConditionalRender(id, mode);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClampColor(GLenum target, GLenum clamp)
 {
-    d_3_0_Core->ClampColor(target, clamp);
+    d_3_0_Core->f.ClampColor(target, clamp);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
-    d_3_0_Core->GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
+    d_3_0_Core->f.GetTransformFeedbackVarying(program, index, bufSize, length, size, type, name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar *const *varyings, GLenum bufferMode)
 {
-    d_3_0_Core->TransformFeedbackVaryings(program, count, varyings, bufferMode);
+    d_3_0_Core->f.TransformFeedbackVaryings(program, count, varyings, bufferMode);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
 {
-    d_3_0_Core->BindBufferBase(target, index, buffer);
+    d_3_0_Core->f.BindBufferBase(target, index, buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_3_0_Core->BindBufferRange(target, index, buffer, offset, size);
+    d_3_0_Core->f.BindBufferRange(target, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glEndTransformFeedback()
 {
-    d_3_0_Core->EndTransformFeedback();
+    d_3_0_Core->f.EndTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBeginTransformFeedback(GLenum primitiveMode)
 {
-    d_3_0_Core->BeginTransformFeedback(primitiveMode);
+    d_3_0_Core->f.BeginTransformFeedback(primitiveMode);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Core::glIsEnabledi(GLenum target, GLuint index)
 {
-    return d_3_0_Core->IsEnabledi(target, index);
+    return d_3_0_Core->f.IsEnabledi(target, index);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDisablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Disablei(target, index);
+    d_3_0_Core->f.Disablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glEnablei(GLenum target, GLuint index)
 {
-    d_3_0_Core->Enablei(target, index);
+    d_3_0_Core->f.Enablei(target, index);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetIntegeri_v(GLenum target, GLuint index, GLint *data)
 {
-    d_3_0_Core->GetIntegeri_v(target, index, data);
+    d_3_0_Core->f.GetIntegeri_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetBooleani_v(GLenum target, GLuint index, GLboolean *data)
 {
-    d_3_0_Core->GetBooleani_v(target, index, data);
+    d_3_0_Core->f.GetBooleani_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glColorMaski(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
-    d_3_0_Core->ColorMaski(index, r, g, b, a);
+    d_3_0_Core->f.ColorMaski(index, r, g, b, a);
 }
 
 
 // OpenGL 3.1 core functions
 inline void QOpenGLFunctions_4_5_Core::glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
 {
-    d_3_1_Core->UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
+    d_3_1_Core->f.UniformBlockBinding(program, uniformBlockIndex, uniformBlockBinding);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)
 {
-    d_3_1_Core->GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
+    d_3_1_Core->f.GetActiveUniformBlockName(program, uniformBlockIndex, bufSize, length, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
+    d_3_1_Core->f.GetActiveUniformBlockiv(program, uniformBlockIndex, pname, params);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Core::glGetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
 {
-    return d_3_1_Core->GetUniformBlockIndex(program, uniformBlockName);
+    return d_3_1_Core->f.GetUniformBlockIndex(program, uniformBlockName);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)
 {
-    d_3_1_Core->GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
+    d_3_1_Core->f.GetActiveUniformName(program, uniformIndex, bufSize, length, uniformName);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)
 {
-    d_3_1_Core->GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
+    d_3_1_Core->f.GetActiveUniformsiv(program, uniformCount, uniformIndices, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar *const *uniformNames, GLuint *uniformIndices)
 {
-    d_3_1_Core->GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
+    d_3_1_Core->f.GetUniformIndices(program, uniformCount, uniformNames, uniformIndices);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
-    d_3_1_Core->CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
+    d_3_1_Core->f.CopyBufferSubData(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glPrimitiveRestartIndex(GLuint index)
 {
-    d_3_1_Core->PrimitiveRestartIndex(index);
+    d_3_1_Core->f.PrimitiveRestartIndex(index);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
 {
-    d_3_1_Core->TexBuffer(target, internalformat, buffer);
+    d_3_1_Core->f.TexBuffer(target, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount)
 {
-    d_3_1_Core->DrawElementsInstanced(mode, count, type, indices, instancecount);
+    d_3_1_Core->f.DrawElementsInstanced(mode, count, type, indices, instancecount);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
 {
-    d_3_1_Core->DrawArraysInstanced(mode, first, count, instancecount);
+    d_3_1_Core->f.DrawArraysInstanced(mode, first, count, instancecount);
 }
 
 
 // OpenGL 3.2 core functions
 inline void QOpenGLFunctions_4_5_Core::glSampleMaski(GLuint maskNumber, GLbitfield mask)
 {
-    d_3_2_Core->SampleMaski(maskNumber, mask);
+    d_3_2_Core->f.SampleMaski(maskNumber, mask);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetMultisamplefv(GLenum pname, GLuint index, GLfloat *val)
 {
-    d_3_2_Core->GetMultisamplefv(pname, index, val);
+    d_3_2_Core->f.GetMultisamplefv(pname, index, val);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexImage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_3_2_Core->f.TexImage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexImage2DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_3_2_Core->TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_3_2_Core->f.TexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glFramebufferTexture(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
-    d_3_2_Core->FramebufferTexture(target, attachment, texture, level);
+    d_3_2_Core->f.FramebufferTexture(target, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
 {
-    d_3_2_Core->GetBufferParameteri64v(target, pname, params);
+    d_3_2_Core->f.GetBufferParameteri64v(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetInteger64i_v(GLenum target, GLuint index, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64i_v(target, index, data);
+    d_3_2_Core->f.GetInteger64i_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
-    d_3_2_Core->GetSynciv(sync, pname, bufSize, length, values);
+    d_3_2_Core->f.GetSynciv(sync, pname, bufSize, length, values);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetInteger64v(GLenum pname, GLint64 *data)
 {
-    d_3_2_Core->GetInteger64v(pname, data);
+    d_3_2_Core->f.GetInteger64v(pname, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    d_3_2_Core->WaitSync(sync, flags, timeout);
+    d_3_2_Core->f.WaitSync(sync, flags, timeout);
 }
 
 inline GLenum QOpenGLFunctions_4_5_Core::glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
-    return d_3_2_Core->ClientWaitSync(sync, flags, timeout);
+    return d_3_2_Core->f.ClientWaitSync(sync, flags, timeout);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDeleteSync(GLsync sync)
 {
-    d_3_2_Core->DeleteSync(sync);
+    d_3_2_Core->f.DeleteSync(sync);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Core::glIsSync(GLsync sync)
 {
-    return d_3_2_Core->IsSync(sync);
+    return d_3_2_Core->f.IsSync(sync);
 }
 
 inline GLsync QOpenGLFunctions_4_5_Core::glFenceSync(GLenum condition, GLbitfield flags)
 {
-    return d_3_2_Core->FenceSync(condition, flags);
+    return d_3_2_Core->f.FenceSync(condition, flags);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProvokingVertex(GLenum mode)
 {
-    d_3_2_Core->ProvokingVertex(mode);
+    d_3_2_Core->f.ProvokingVertex(mode);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glMultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei drawcount, const GLint *basevertex)
 {
-    d_3_2_Core->MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
+    d_3_2_Core->f.MultiDrawElementsBaseVertex(mode, count, type, indices, drawcount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
+    d_3_2_Core->f.DrawElementsInstancedBaseVertex(mode, count, type, indices, instancecount, basevertex);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawRangeElementsBaseVertex(mode, start, end, count, type, indices, basevertex);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex)
 {
-    d_3_2_Core->DrawElementsBaseVertex(mode, count, type, indices, basevertex);
+    d_3_2_Core->f.DrawElementsBaseVertex(mode, count, type, indices, basevertex);
 }
 
 
 // OpenGL 3.3 core functions
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribP4uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP4uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribP4ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP4ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP4ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribP3uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP3uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribP3ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP3ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP3ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribP2uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP2uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribP2ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP2ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP2ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribP1uiv(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
-    d_3_3_Core->VertexAttribP1uiv(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1uiv(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribP1ui(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
-    d_3_3_Core->VertexAttribP1ui(index, type, normalized, value);
+    d_3_3_Core->f.VertexAttribP1ui(index, type, normalized, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribDivisor(GLuint index, GLuint divisor)
 {
-    d_3_3_Core->VertexAttribDivisor(index, divisor);
+    d_3_3_Core->f.VertexAttribDivisor(index, divisor);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
 {
-    d_3_3_Core->GetQueryObjectui64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjectui64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
 {
-    d_3_3_Core->GetQueryObjecti64v(id, pname, params);
+    d_3_3_Core->f.GetQueryObjecti64v(id, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glQueryCounter(GLuint id, GLenum target)
 {
-    d_3_3_Core->QueryCounter(id, target);
+    d_3_3_Core->f.QueryCounter(id, target);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetSamplerParameterIuiv(GLuint sampler, GLenum pname, GLuint *params)
 {
-    d_3_3_Core->GetSamplerParameterIuiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIuiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat *params)
 {
-    d_3_3_Core->GetSamplerParameterfv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterfv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetSamplerParameterIiv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameterIiv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameterIiv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params)
 {
-    d_3_3_Core->GetSamplerParameteriv(sampler, pname, params);
+    d_3_3_Core->f.GetSamplerParameteriv(sampler, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glSamplerParameterIuiv(GLuint sampler, GLenum pname, const GLuint *param)
 {
-    d_3_3_Core->SamplerParameterIuiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIuiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glSamplerParameterIiv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameterIiv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterIiv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glSamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat *param)
 {
-    d_3_3_Core->SamplerParameterfv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterfv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
 {
-    d_3_3_Core->SamplerParameterf(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameterf(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glSamplerParameteriv(GLuint sampler, GLenum pname, const GLint *param)
 {
-    d_3_3_Core->SamplerParameteriv(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteriv(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
 {
-    d_3_3_Core->SamplerParameteri(sampler, pname, param);
+    d_3_3_Core->f.SamplerParameteri(sampler, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindSampler(GLuint unit, GLuint sampler)
 {
-    d_3_3_Core->BindSampler(unit, sampler);
+    d_3_3_Core->f.BindSampler(unit, sampler);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Core::glIsSampler(GLuint sampler)
 {
-    return d_3_3_Core->IsSampler(sampler);
+    return d_3_3_Core->f.IsSampler(sampler);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDeleteSamplers(GLsizei count, const GLuint *samplers)
 {
-    d_3_3_Core->DeleteSamplers(count, samplers);
+    d_3_3_Core->f.DeleteSamplers(count, samplers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGenSamplers(GLsizei count, GLuint *samplers)
 {
-    d_3_3_Core->GenSamplers(count, samplers);
+    d_3_3_Core->f.GenSamplers(count, samplers);
 }
 
 inline GLint QOpenGLFunctions_4_5_Core::glGetFragDataIndex(GLuint program, const GLchar *name)
 {
-    return d_3_3_Core->GetFragDataIndex(program, name);
+    return d_3_3_Core->f.GetFragDataIndex(program, name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
-    d_3_3_Core->BindFragDataLocationIndexed(program, colorNumber, index, name);
+    d_3_3_Core->f.BindFragDataLocationIndexed(program, colorNumber, index, name);
 }
 
 
 // OpenGL 4.0 core functions
 inline void QOpenGLFunctions_4_5_Core::glGetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params)
 {
-    d_4_0_Core->GetQueryIndexediv(target, index, pname, params);
+    d_4_0_Core->f.GetQueryIndexediv(target, index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glEndQueryIndexed(GLenum target, GLuint index)
 {
-    d_4_0_Core->EndQueryIndexed(target, index);
+    d_4_0_Core->f.EndQueryIndexed(target, index);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBeginQueryIndexed(GLenum target, GLuint index, GLuint id)
 {
-    d_4_0_Core->BeginQueryIndexed(target, index, id);
+    d_4_0_Core->f.BeginQueryIndexed(target, index, id);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawTransformFeedbackStream(GLenum mode, GLuint id, GLuint stream)
 {
-    d_4_0_Core->DrawTransformFeedbackStream(mode, id, stream);
+    d_4_0_Core->f.DrawTransformFeedbackStream(mode, id, stream);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawTransformFeedback(GLenum mode, GLuint id)
 {
-    d_4_0_Core->DrawTransformFeedback(mode, id);
+    d_4_0_Core->f.DrawTransformFeedback(mode, id);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glResumeTransformFeedback()
 {
-    d_4_0_Core->ResumeTransformFeedback();
+    d_4_0_Core->f.ResumeTransformFeedback();
 }
 
 inline void QOpenGLFunctions_4_5_Core::glPauseTransformFeedback()
 {
-    d_4_0_Core->PauseTransformFeedback();
+    d_4_0_Core->f.PauseTransformFeedback();
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Core::glIsTransformFeedback(GLuint id)
 {
-    return d_4_0_Core->IsTransformFeedback(id);
+    return d_4_0_Core->f.IsTransformFeedback(id);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGenTransformFeedbacks(GLsizei n, GLuint *ids)
 {
-    d_4_0_Core->GenTransformFeedbacks(n, ids);
+    d_4_0_Core->f.GenTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDeleteTransformFeedbacks(GLsizei n, const GLuint *ids)
 {
-    d_4_0_Core->DeleteTransformFeedbacks(n, ids);
+    d_4_0_Core->f.DeleteTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindTransformFeedback(GLenum target, GLuint id)
 {
-    d_4_0_Core->BindTransformFeedback(target, id);
+    d_4_0_Core->f.BindTransformFeedback(target, id);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glPatchParameterfv(GLenum pname, const GLfloat *values)
 {
-    d_4_0_Core->PatchParameterfv(pname, values);
+    d_4_0_Core->f.PatchParameterfv(pname, values);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glPatchParameteri(GLenum pname, GLint value)
 {
-    d_4_0_Core->PatchParameteri(pname, value);
+    d_4_0_Core->f.PatchParameteri(pname, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetProgramStageiv(GLuint program, GLenum shadertype, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetProgramStageiv(program, shadertype, pname, values);
+    d_4_0_Core->f.GetProgramStageiv(program, shadertype, pname, values);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetUniformSubroutineuiv(GLenum shadertype, GLint location, GLuint *params)
 {
-    d_4_0_Core->GetUniformSubroutineuiv(shadertype, location, params);
+    d_4_0_Core->f.GetUniformSubroutineuiv(shadertype, location, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformSubroutinesuiv(GLenum shadertype, GLsizei count, const GLuint *indices)
 {
-    d_4_0_Core->UniformSubroutinesuiv(shadertype, count, indices);
+    d_4_0_Core->f.UniformSubroutinesuiv(shadertype, count, indices);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetActiveSubroutineName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetActiveSubroutineUniformName(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)
 {
-    d_4_0_Core->GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
+    d_4_0_Core->f.GetActiveSubroutineUniformName(program, shadertype, index, bufsize, length, name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetActiveSubroutineUniformiv(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values)
 {
-    d_4_0_Core->GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
+    d_4_0_Core->f.GetActiveSubroutineUniformiv(program, shadertype, index, pname, values);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Core::glGetSubroutineIndex(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineIndex(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineIndex(program, shadertype, name);
 }
 
 inline GLint QOpenGLFunctions_4_5_Core::glGetSubroutineUniformLocation(GLuint program, GLenum shadertype, const GLchar *name)
 {
-    return d_4_0_Core->GetSubroutineUniformLocation(program, shadertype, name);
+    return d_4_0_Core->f.GetSubroutineUniformLocation(program, shadertype, name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetUniformdv(GLuint program, GLint location, GLdouble *params)
 {
-    d_4_0_Core->GetUniformdv(program, location, params);
+    d_4_0_Core->f.GetUniformdv(program, location, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix4x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix4x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix3x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix3x2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3x2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3x2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix2x4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix2x3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2x3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2x3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix4dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix4dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix4dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix3dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix3dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix3dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniformMatrix2dv(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_0_Core->UniformMatrix2dv(location, count, transpose, value);
+    d_4_0_Core->f.UniformMatrix2dv(location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform4dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform4dv(location, count, value);
+    d_4_0_Core->f.Uniform4dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform3dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform3dv(location, count, value);
+    d_4_0_Core->f.Uniform3dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform2dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform2dv(location, count, value);
+    d_4_0_Core->f.Uniform2dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform1dv(GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_0_Core->Uniform1dv(location, count, value);
+    d_4_0_Core->f.Uniform1dv(location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform4d(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_0_Core->Uniform4d(location, x, y, z, w);
+    d_4_0_Core->f.Uniform4d(location, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform3d(GLint location, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_0_Core->Uniform3d(location, x, y, z);
+    d_4_0_Core->f.Uniform3d(location, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform2d(GLint location, GLdouble x, GLdouble y)
 {
-    d_4_0_Core->Uniform2d(location, x, y);
+    d_4_0_Core->f.Uniform2d(location, x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUniform1d(GLint location, GLdouble x)
 {
-    d_4_0_Core->Uniform1d(location, x);
+    d_4_0_Core->f.Uniform1d(location, x);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect)
 {
-    d_4_0_Core->DrawElementsIndirect(mode, type, indirect);
+    d_4_0_Core->f.DrawElementsIndirect(mode, type, indirect);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawArraysIndirect(GLenum mode, const void *indirect)
 {
-    d_4_0_Core->DrawArraysIndirect(mode, indirect);
+    d_4_0_Core->f.DrawArraysIndirect(mode, indirect);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBlendFuncSeparatei(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
 {
-    d_4_0_Core->BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
+    d_4_0_Core->f.BlendFuncSeparatei(buf, srcRGB, dstRGB, srcAlpha, dstAlpha);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBlendFunci(GLuint buf, GLenum src, GLenum dst)
 {
-    d_4_0_Core->BlendFunci(buf, src, dst);
+    d_4_0_Core->f.BlendFunci(buf, src, dst);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeAlpha)
 {
-    d_4_0_Core->BlendEquationSeparatei(buf, modeRGB, modeAlpha);
+    d_4_0_Core->f.BlendEquationSeparatei(buf, modeRGB, modeAlpha);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBlendEquationi(GLuint buf, GLenum mode)
 {
-    d_4_0_Core->BlendEquationi(buf, mode);
+    d_4_0_Core->f.BlendEquationi(buf, mode);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glMinSampleShading(GLfloat value)
 {
-    d_4_0_Core->MinSampleShading(value);
+    d_4_0_Core->f.MinSampleShading(value);
 }
 
 
 // OpenGL 4.1 core functions
 inline void QOpenGLFunctions_4_5_Core::glGetDoublei_v(GLenum target, GLuint index, GLdouble *data)
 {
-    d_4_1_Core->GetDoublei_v(target, index, data);
+    d_4_1_Core->f.GetDoublei_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetFloati_v(GLenum target, GLuint index, GLfloat *data)
 {
-    d_4_1_Core->GetFloati_v(target, index, data);
+    d_4_1_Core->f.GetFloati_v(target, index, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDepthRangeIndexed(GLuint index, GLdouble n, GLdouble f)
 {
-    d_4_1_Core->DepthRangeIndexed(index, n, f);
+    d_4_1_Core->f.DepthRangeIndexed(index, n, f);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDepthRangeArrayv(GLuint first, GLsizei count, const GLdouble *v)
 {
-    d_4_1_Core->DepthRangeArrayv(first, count, v);
+    d_4_1_Core->f.DepthRangeArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glScissorIndexedv(GLuint index, const GLint *v)
 {
-    d_4_1_Core->ScissorIndexedv(index, v);
+    d_4_1_Core->f.ScissorIndexedv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glScissorIndexed(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height)
 {
-    d_4_1_Core->ScissorIndexed(index, left, bottom, width, height);
+    d_4_1_Core->f.ScissorIndexed(index, left, bottom, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glScissorArrayv(GLuint first, GLsizei count, const GLint *v)
 {
-    d_4_1_Core->ScissorArrayv(first, count, v);
+    d_4_1_Core->f.ScissorArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glViewportIndexedfv(GLuint index, const GLfloat *v)
 {
-    d_4_1_Core->ViewportIndexedfv(index, v);
+    d_4_1_Core->f.ViewportIndexedfv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glViewportIndexedf(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h)
 {
-    d_4_1_Core->ViewportIndexedf(index, x, y, w, h);
+    d_4_1_Core->f.ViewportIndexedf(index, x, y, w, h);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glViewportArrayv(GLuint first, GLsizei count, const GLfloat *v)
 {
-    d_4_1_Core->ViewportArrayv(first, count, v);
+    d_4_1_Core->f.ViewportArrayv(first, count, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetVertexAttribLdv(GLuint index, GLenum pname, GLdouble *params)
 {
-    d_4_1_Core->GetVertexAttribLdv(index, pname, params);
+    d_4_1_Core->f.GetVertexAttribLdv(index, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribLPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer)
 {
-    d_4_1_Core->VertexAttribLPointer(index, size, type, stride, pointer);
+    d_4_1_Core->f.VertexAttribLPointer(index, size, type, stride, pointer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribL4dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL4dv(index, v);
+    d_4_1_Core->f.VertexAttribL4dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribL3dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL3dv(index, v);
+    d_4_1_Core->f.VertexAttribL3dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribL2dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL2dv(index, v);
+    d_4_1_Core->f.VertexAttribL2dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribL1dv(GLuint index, const GLdouble *v)
 {
-    d_4_1_Core->VertexAttribL1dv(index, v);
+    d_4_1_Core->f.VertexAttribL1dv(index, v);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribL4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-    d_4_1_Core->VertexAttribL4d(index, x, y, z, w);
+    d_4_1_Core->f.VertexAttribL4d(index, x, y, z, w);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribL3d(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-    d_4_1_Core->VertexAttribL3d(index, x, y, z);
+    d_4_1_Core->f.VertexAttribL3d(index, x, y, z);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribL2d(GLuint index, GLdouble x, GLdouble y)
 {
-    d_4_1_Core->VertexAttribL2d(index, x, y);
+    d_4_1_Core->f.VertexAttribL2d(index, x, y);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribL1d(GLuint index, GLdouble x)
 {
-    d_4_1_Core->VertexAttribL1d(index, x);
+    d_4_1_Core->f.VertexAttribL1d(index, x);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetProgramPipelineInfoLog(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog)
 {
-    d_4_1_Core->GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
+    d_4_1_Core->f.GetProgramPipelineInfoLog(pipeline, bufSize, length, infoLog);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glValidateProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->ValidateProgramPipeline(pipeline);
+    d_4_1_Core->f.ValidateProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix4x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix3x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix4x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix2x4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix3x2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix2x3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix4x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix3x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix4x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix2x4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix3x2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3x2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix2x3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2x3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix4dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix3dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix2dv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2dv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2dv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix4fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix4fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix4fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix3fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix3fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix3fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniformMatrix2fv(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniformMatrix2fv(program, location, count, transpose, value);
+    d_4_1_Core->f.ProgramUniformMatrix2fv(program, location, count, transpose, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform4uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform4uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
 {
-    d_4_1_Core->ProgramUniform4ui(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4ui(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform4dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform4dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform4d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3)
 {
-    d_4_1_Core->ProgramUniform4d(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4d(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform4fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform4fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
-    d_4_1_Core->ProgramUniform4f(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4f(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform4iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform4iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform4iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
-    d_4_1_Core->ProgramUniform4i(program, location, v0, v1, v2, v3);
+    d_4_1_Core->f.ProgramUniform4i(program, location, v0, v1, v2, v3);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform3uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform3uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)
 {
-    d_4_1_Core->ProgramUniform3ui(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3ui(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform3dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform3dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform3d(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2)
 {
-    d_4_1_Core->ProgramUniform3d(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3d(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform3fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform3fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
-    d_4_1_Core->ProgramUniform3f(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3f(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform3iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform3iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform3iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, GLint v2)
 {
-    d_4_1_Core->ProgramUniform3i(program, location, v0, v1, v2);
+    d_4_1_Core->f.ProgramUniform3i(program, location, v0, v1, v2);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform2uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform2uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1)
 {
-    d_4_1_Core->ProgramUniform2ui(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2ui(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform2dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform2dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform2d(GLuint program, GLint location, GLdouble v0, GLdouble v1)
 {
-    d_4_1_Core->ProgramUniform2d(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2d(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform2fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform2fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1)
 {
-    d_4_1_Core->ProgramUniform2f(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2f(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform2iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform2iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform2iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1)
 {
-    d_4_1_Core->ProgramUniform2i(program, location, v0, v1);
+    d_4_1_Core->f.ProgramUniform2i(program, location, v0, v1);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform1uiv(GLuint program, GLint location, GLsizei count, const GLuint *value)
 {
-    d_4_1_Core->ProgramUniform1uiv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1uiv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform1ui(GLuint program, GLint location, GLuint v0)
 {
-    d_4_1_Core->ProgramUniform1ui(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1ui(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform1dv(GLuint program, GLint location, GLsizei count, const GLdouble *value)
 {
-    d_4_1_Core->ProgramUniform1dv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1dv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform1d(GLuint program, GLint location, GLdouble v0)
 {
-    d_4_1_Core->ProgramUniform1d(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1d(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform1fv(GLuint program, GLint location, GLsizei count, const GLfloat *value)
 {
-    d_4_1_Core->ProgramUniform1fv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1fv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform1f(GLuint program, GLint location, GLfloat v0)
 {
-    d_4_1_Core->ProgramUniform1f(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1f(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform1iv(GLuint program, GLint location, GLsizei count, const GLint *value)
 {
-    d_4_1_Core->ProgramUniform1iv(program, location, count, value);
+    d_4_1_Core->f.ProgramUniform1iv(program, location, count, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramUniform1i(GLuint program, GLint location, GLint v0)
 {
-    d_4_1_Core->ProgramUniform1i(program, location, v0);
+    d_4_1_Core->f.ProgramUniform1i(program, location, v0);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
 {
-    d_4_1_Core->GetProgramPipelineiv(pipeline, pname, params);
+    d_4_1_Core->f.GetProgramPipelineiv(pipeline, pname, params);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Core::glIsProgramPipeline(GLuint pipeline)
 {
-    return d_4_1_Core->IsProgramPipeline(pipeline);
+    return d_4_1_Core->f.IsProgramPipeline(pipeline);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGenProgramPipelines(GLsizei n, GLuint *pipelines)
 {
-    d_4_1_Core->GenProgramPipelines(n, pipelines);
+    d_4_1_Core->f.GenProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDeleteProgramPipelines(GLsizei n, const GLuint *pipelines)
 {
-    d_4_1_Core->DeleteProgramPipelines(n, pipelines);
+    d_4_1_Core->f.DeleteProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindProgramPipeline(GLuint pipeline)
 {
-    d_4_1_Core->BindProgramPipeline(pipeline);
+    d_4_1_Core->f.BindProgramPipeline(pipeline);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Core::glCreateShaderProgramv(GLenum type, GLsizei count, const GLchar *const *strings)
 {
-    return d_4_1_Core->CreateShaderProgramv(type, count, strings);
+    return d_4_1_Core->f.CreateShaderProgramv(type, count, strings);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glActiveShaderProgram(GLuint pipeline, GLuint program)
 {
-    d_4_1_Core->ActiveShaderProgram(pipeline, program);
+    d_4_1_Core->f.ActiveShaderProgram(pipeline, program);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glUseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
 {
-    d_4_1_Core->UseProgramStages(pipeline, stages, program);
+    d_4_1_Core->f.UseProgramStages(pipeline, stages, program);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramParameteri(GLuint program, GLenum pname, GLint value)
 {
-    d_4_1_Core->ProgramParameteri(program, pname, value);
+    d_4_1_Core->f.ProgramParameteri(program, pname, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glProgramBinary(GLuint program, GLenum binaryFormat, const void *binary, GLsizei length)
 {
-    d_4_1_Core->ProgramBinary(program, binaryFormat, binary, length);
+    d_4_1_Core->f.ProgramBinary(program, binaryFormat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary)
 {
-    d_4_1_Core->GetProgramBinary(program, bufSize, length, binaryFormat, binary);
+    d_4_1_Core->f.GetProgramBinary(program, bufSize, length, binaryFormat, binary);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearDepthf(GLfloat dd)
 {
-    d_4_1_Core->ClearDepthf(dd);
+    d_4_1_Core->f.ClearDepthf(dd);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDepthRangef(GLfloat n, GLfloat f)
 {
-    d_4_1_Core->DepthRangef(n, f);
+    d_4_1_Core->f.DepthRangef(n, f);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)
 {
-    d_4_1_Core->GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
+    d_4_1_Core->f.GetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glShaderBinary(GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length)
 {
-    d_4_1_Core->ShaderBinary(count, shaders, binaryformat, binary, length);
+    d_4_1_Core->f.ShaderBinary(count, shaders, binaryformat, binary, length);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glReleaseShaderCompiler()
 {
-    d_4_1_Core->ReleaseShaderCompiler();
+    d_4_1_Core->f.ReleaseShaderCompiler();
 }
 
 
 // OpenGL 4.2 core functions
 inline void QOpenGLFunctions_4_5_Core::glDrawTransformFeedbackStreamInstanced(GLenum mode, GLuint id, GLuint stream, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackStreamInstanced(mode, id, stream, instancecount);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawTransformFeedbackInstanced(GLenum mode, GLuint id, GLsizei instancecount)
 {
-    d_4_2_Core->DrawTransformFeedbackInstanced(mode, id, instancecount);
+    d_4_2_Core->f.DrawTransformFeedbackInstanced(mode, id, instancecount);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_2_Core->TexStorage3D(target, levels, internalformat, width, height, depth);
+    d_4_2_Core->f.TexStorage3D(target, levels, internalformat, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_4_2_Core->TexStorage2D(target, levels, internalformat, width, height);
+    d_4_2_Core->f.TexStorage2D(target, levels, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)
 {
-    d_4_2_Core->TexStorage1D(target, levels, internalformat, width);
+    d_4_2_Core->f.TexStorage1D(target, levels, internalformat, width);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glMemoryBarrier(GLbitfield barriers)
 {
-    d_4_2_Core->MemoryBarrier(barriers);
+    d_4_2_Core->f.MemoryBarrier(barriers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindImageTexture(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format)
 {
-    d_4_2_Core->BindImageTexture(unit, texture, level, layered, layer, access, format);
+    d_4_2_Core->f.BindImageTexture(unit, texture, level, layered, layer, access, format);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetActiveAtomicCounterBufferiv(GLuint program, GLuint bufferIndex, GLenum pname, GLint *params)
 {
-    d_4_2_Core->GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
+    d_4_2_Core->f.GetActiveAtomicCounterBufferiv(program, bufferIndex, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params)
 {
-    d_4_2_Core->GetInternalformativ(target, internalformat, pname, bufSize, params);
+    d_4_2_Core->f.GetInternalformativ(target, internalformat, pname, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseVertexBaseInstance(mode, count, type, indices, instancecount, basevertex, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawElementsInstancedBaseInstance(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
+    d_4_2_Core->f.DrawElementsInstancedBaseInstance(mode, count, type, indices, instancecount, baseinstance);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDrawArraysInstancedBaseInstance(GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance)
 {
-    d_4_2_Core->DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
+    d_4_2_Core->f.DrawArraysInstancedBaseInstance(mode, first, count, instancecount, baseinstance);
 }
 
 
 // OpenGL 4.3 core functions
 inline void QOpenGLFunctions_4_5_Core::glGetObjectPtrLabel(const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label)
 {
-    d_4_3_Core->GetObjectPtrLabel(ptr, bufSize, length, label);
+    d_4_3_Core->f.GetObjectPtrLabel(ptr, bufSize, length, label);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glObjectPtrLabel(const void *ptr, GLsizei length, const GLchar *label)
 {
-    d_4_3_Core->ObjectPtrLabel(ptr, length, label);
+    d_4_3_Core->f.ObjectPtrLabel(ptr, length, label);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetObjectLabel(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label)
 {
-    d_4_3_Core->GetObjectLabel(identifier, name, bufSize, length, label);
+    d_4_3_Core->f.GetObjectLabel(identifier, name, bufSize, length, label);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glObjectLabel(GLenum identifier, GLuint name, GLsizei length, const GLchar *label)
 {
-    d_4_3_Core->ObjectLabel(identifier, name, length, label);
+    d_4_3_Core->f.ObjectLabel(identifier, name, length, label);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glPopDebugGroup()
 {
-    d_4_3_Core->PopDebugGroup();
+    d_4_3_Core->f.PopDebugGroup();
 }
 
 inline void QOpenGLFunctions_4_5_Core::glPushDebugGroup(GLenum source, GLuint id, GLsizei length, const GLchar *message)
 {
-    d_4_3_Core->PushDebugGroup(source, id, length, message);
+    d_4_3_Core->f.PushDebugGroup(source, id, length, message);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Core::glGetDebugMessageLog(GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog)
 {
-    return d_4_3_Core->GetDebugMessageLog(count, bufSize, sources, types, ids, severities, lengths, messageLog);
+    return d_4_3_Core->f.GetDebugMessageLog(count, bufSize, sources, types, ids, severities, lengths, messageLog);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDebugMessageCallback(GLDEBUGPROC callback, const void *userParam)
 {
-    d_4_3_Core->DebugMessageCallback(callback, userParam);
+    d_4_3_Core->f.DebugMessageCallback(callback, userParam);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDebugMessageInsert(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf)
 {
-    d_4_3_Core->DebugMessageInsert(source, type, id, severity, length, buf);
+    d_4_3_Core->f.DebugMessageInsert(source, type, id, severity, length, buf);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDebugMessageControl(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled)
 {
-    d_4_3_Core->DebugMessageControl(source, type, severity, count, ids, enabled);
+    d_4_3_Core->f.DebugMessageControl(source, type, severity, count, ids, enabled);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexBindingDivisor(GLuint bindingindex, GLuint divisor)
 {
-    d_4_3_Core->VertexBindingDivisor(bindingindex, divisor);
+    d_4_3_Core->f.VertexBindingDivisor(bindingindex, divisor);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribBinding(GLuint attribindex, GLuint bindingindex)
 {
-    d_4_3_Core->VertexAttribBinding(attribindex, bindingindex);
+    d_4_3_Core->f.VertexAttribBinding(attribindex, bindingindex);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribLFormat(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribLFormat(attribindex, size, type, relativeoffset);
+    d_4_3_Core->f.VertexAttribLFormat(attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribIFormat(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribIFormat(attribindex, size, type, relativeoffset);
+    d_4_3_Core->f.VertexAttribIFormat(attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexAttribFormat(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset)
 {
-    d_4_3_Core->VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
+    d_4_3_Core->f.VertexAttribFormat(attribindex, size, type, normalized, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindVertexBuffer(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride)
 {
-    d_4_3_Core->BindVertexBuffer(bindingindex, buffer, offset, stride);
+    d_4_3_Core->f.BindVertexBuffer(bindingindex, buffer, offset, stride);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureView(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers)
 {
-    d_4_3_Core->TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers);
+    d_4_3_Core->f.TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexStorage3DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_4_3_Core->TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_4_3_Core->f.TexStorage3DMultisample(target, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexStorage2DMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_4_3_Core->TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
+    d_4_3_Core->f.TexStorage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTexBufferRange(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
-    d_4_3_Core->TexBufferRange(target, internalformat, buffer, offset, size);
+    d_4_3_Core->f.TexBufferRange(target, internalformat, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glShaderStorageBlockBinding(GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding)
 {
-    d_4_3_Core->ShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
+    d_4_3_Core->f.ShaderStorageBlockBinding(program, storageBlockIndex, storageBlockBinding);
 }
 
 inline GLint QOpenGLFunctions_4_5_Core::glGetProgramResourceLocationIndex(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceLocationIndex(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceLocationIndex(program, programInterface, name);
 }
 
 inline GLint QOpenGLFunctions_4_5_Core::glGetProgramResourceLocation(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceLocation(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceLocation(program, programInterface, name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetProgramResourceiv(GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params)
 {
-    d_4_3_Core->GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
+    d_4_3_Core->f.GetProgramResourceiv(program, programInterface, index, propCount, props, bufSize, length, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetProgramResourceName(GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name)
 {
-    d_4_3_Core->GetProgramResourceName(program, programInterface, index, bufSize, length, name);
+    d_4_3_Core->f.GetProgramResourceName(program, programInterface, index, bufSize, length, name);
 }
 
 inline GLuint QOpenGLFunctions_4_5_Core::glGetProgramResourceIndex(GLuint program, GLenum programInterface, const GLchar *name)
 {
-    return d_4_3_Core->GetProgramResourceIndex(program, programInterface, name);
+    return d_4_3_Core->f.GetProgramResourceIndex(program, programInterface, name);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetProgramInterfaceiv(GLuint program, GLenum programInterface, GLenum pname, GLint *params)
 {
-    d_4_3_Core->GetProgramInterfaceiv(program, programInterface, pname, params);
+    d_4_3_Core->f.GetProgramInterfaceiv(program, programInterface, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glMultiDrawElementsIndirect(GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride)
 {
-    d_4_3_Core->MultiDrawElementsIndirect(mode, type, indirect, drawcount, stride);
+    d_4_3_Core->f.MultiDrawElementsIndirect(mode, type, indirect, drawcount, stride);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glMultiDrawArraysIndirect(GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride)
 {
-    d_4_3_Core->MultiDrawArraysIndirect(mode, indirect, drawcount, stride);
+    d_4_3_Core->f.MultiDrawArraysIndirect(mode, indirect, drawcount, stride);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_4_3_Core->InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
+    d_4_3_Core->f.InvalidateSubFramebuffer(target, numAttachments, attachments, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glInvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum *attachments)
 {
-    d_4_3_Core->InvalidateFramebuffer(target, numAttachments, attachments);
+    d_4_3_Core->f.InvalidateFramebuffer(target, numAttachments, attachments);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glInvalidateBufferData(GLuint buffer)
 {
-    d_4_3_Core->InvalidateBufferData(buffer);
+    d_4_3_Core->f.InvalidateBufferData(buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glInvalidateBufferSubData(GLuint buffer, GLintptr offset, GLsizeiptr length)
 {
-    d_4_3_Core->InvalidateBufferSubData(buffer, offset, length);
+    d_4_3_Core->f.InvalidateBufferSubData(buffer, offset, length);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glInvalidateTexImage(GLuint texture, GLint level)
 {
-    d_4_3_Core->InvalidateTexImage(texture, level);
+    d_4_3_Core->f.InvalidateTexImage(texture, level);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glInvalidateTexSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_3_Core->InvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
+    d_4_3_Core->f.InvalidateTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetInternalformati64v(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params)
 {
-    d_4_3_Core->GetInternalformati64v(target, internalformat, pname, bufSize, params);
+    d_4_3_Core->f.GetInternalformati64v(target, internalformat, pname, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetFramebufferParameteriv(GLenum target, GLenum pname, GLint *params)
 {
-    d_4_3_Core->GetFramebufferParameteriv(target, pname, params);
+    d_4_3_Core->f.GetFramebufferParameteriv(target, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glFramebufferParameteri(GLenum target, GLenum pname, GLint param)
 {
-    d_4_3_Core->FramebufferParameteri(target, pname, param);
+    d_4_3_Core->f.FramebufferParameteri(target, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCopyImageSubData(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth)
 {
-    d_4_3_Core->CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth);
+    d_4_3_Core->f.CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTarget, dstLevel, dstX, dstY, dstZ, srcWidth, srcHeight, srcDepth);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDispatchComputeIndirect(GLintptr indirect)
 {
-    d_4_3_Core->DispatchComputeIndirect(indirect);
+    d_4_3_Core->f.DispatchComputeIndirect(indirect);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDispatchCompute(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z)
 {
-    d_4_3_Core->DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
+    d_4_3_Core->f.DispatchCompute(num_groups_x, num_groups_y, num_groups_z);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearBufferSubData(GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data)
 {
-    d_4_3_Core->ClearBufferSubData(target, internalformat, offset, size, format, type, data);
+    d_4_3_Core->f.ClearBufferSubData(target, internalformat, offset, size, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearBufferData(GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data)
 {
-    d_4_3_Core->ClearBufferData(target, internalformat, format, type, data);
+    d_4_3_Core->f.ClearBufferData(target, internalformat, format, type, data);
 }
 
 
 // OpenGL 4.4 core functions
 inline void QOpenGLFunctions_4_5_Core::glBindVertexBuffers(GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides)
 {
-    d_4_4_Core->BindVertexBuffers(first, count, buffers, offsets, strides);
+    d_4_4_Core->f.BindVertexBuffers(first, count, buffers, offsets, strides);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindImageTextures(GLuint first, GLsizei count, const GLuint *textures)
 {
-    d_4_4_Core->BindImageTextures(first, count, textures);
+    d_4_4_Core->f.BindImageTextures(first, count, textures);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindSamplers(GLuint first, GLsizei count, const GLuint *samplers)
 {
-    d_4_4_Core->BindSamplers(first, count, samplers);
+    d_4_4_Core->f.BindSamplers(first, count, samplers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindTextures(GLuint first, GLsizei count, const GLuint *textures)
 {
-    d_4_4_Core->BindTextures(first, count, textures);
+    d_4_4_Core->f.BindTextures(first, count, textures);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindBuffersRange(GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes)
 {
-    d_4_4_Core->BindBuffersRange(target, first, count, buffers, offsets, sizes);
+    d_4_4_Core->f.BindBuffersRange(target, first, count, buffers, offsets, sizes);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindBuffersBase(GLenum target, GLuint first, GLsizei count, const GLuint *buffers)
 {
-    d_4_4_Core->BindBuffersBase(target, first, count, buffers);
+    d_4_4_Core->f.BindBuffersBase(target, first, count, buffers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearTexSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data)
 {
-    d_4_4_Core->ClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data);
+    d_4_4_Core->f.ClearTexSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearTexImage(GLuint texture, GLint level, GLenum format, GLenum type, const void *data)
 {
-    d_4_4_Core->ClearTexImage(texture, level, format, type, data);
+    d_4_4_Core->f.ClearTexImage(texture, level, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBufferStorage(GLenum target, GLsizeiptr size, const void *data, GLbitfield flags)
 {
-    d_4_4_Core->BufferStorage(target, size, data, flags);
+    d_4_4_Core->f.BufferStorage(target, size, data, flags);
 }
 
 
 // OpenGL 4.5 core functions
 inline void QOpenGLFunctions_4_5_Core::glTextureBarrier()
 {
-    d_4_5_Core->TextureBarrier();
+    d_4_5_Core->f.TextureBarrier();
 }
 
 inline void QOpenGLFunctions_4_5_Core::glReadnPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data)
 {
-    d_4_5_Core->ReadnPixels(x, y, width, height, format, type, bufSize, data);
+    d_4_5_Core->f.ReadnPixels(x, y, width, height, format, type, bufSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetnUniformuiv(GLuint program, GLint location, GLsizei bufSize, GLuint *params)
 {
-    d_4_5_Core->GetnUniformuiv(program, location, bufSize, params);
+    d_4_5_Core->f.GetnUniformuiv(program, location, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetnUniformiv(GLuint program, GLint location, GLsizei bufSize, GLint *params)
 {
-    d_4_5_Core->GetnUniformiv(program, location, bufSize, params);
+    d_4_5_Core->f.GetnUniformiv(program, location, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetnUniformfv(GLuint program, GLint location, GLsizei bufSize, GLfloat *params)
 {
-    d_4_5_Core->GetnUniformfv(program, location, bufSize, params);
+    d_4_5_Core->f.GetnUniformfv(program, location, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetnUniformdv(GLuint program, GLint location, GLsizei bufSize, GLdouble *params)
 {
-    d_4_5_Core->GetnUniformdv(program, location, bufSize, params);
+    d_4_5_Core->f.GetnUniformdv(program, location, bufSize, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetnTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels)
 {
-    d_4_5_Core->GetnTexImage(target, level, format, type, bufSize, pixels);
+    d_4_5_Core->f.GetnTexImage(target, level, format, type, bufSize, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetnCompressedTexImage(GLenum target, GLint lod, GLsizei bufSize, void *pixels)
 {
-    d_4_5_Core->GetnCompressedTexImage(target, lod, bufSize, pixels);
+    d_4_5_Core->f.GetnCompressedTexImage(target, lod, bufSize, pixels);
 }
 
 inline GLenum QOpenGLFunctions_4_5_Core::glGetGraphicsResetStatus()
 {
-    return d_4_5_Core->GetGraphicsResetStatus();
+    return d_4_5_Core->f.GetGraphicsResetStatus();
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetCompressedTextureSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void *pixels)
 {
-    d_4_5_Core->GetCompressedTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, bufSize, pixels);
+    d_4_5_Core->f.GetCompressedTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, bufSize, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTextureSubImage(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels)
 {
-    d_4_5_Core->GetTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, bufSize, pixels);
+    d_4_5_Core->f.GetTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, bufSize, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glMemoryBarrierByRegion(GLbitfield barriers)
 {
-    d_4_5_Core->MemoryBarrierByRegion(barriers);
+    d_4_5_Core->f.MemoryBarrierByRegion(barriers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCreateQueries(GLenum target, GLsizei n, GLuint *ids)
 {
-    d_4_5_Core->CreateQueries(target, n, ids);
+    d_4_5_Core->f.CreateQueries(target, n, ids);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCreateProgramPipelines(GLsizei n, GLuint *pipelines)
 {
-    d_4_5_Core->CreateProgramPipelines(n, pipelines);
+    d_4_5_Core->f.CreateProgramPipelines(n, pipelines);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCreateSamplers(GLsizei n, GLuint *samplers)
 {
-    d_4_5_Core->CreateSamplers(n, samplers);
+    d_4_5_Core->f.CreateSamplers(n, samplers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetVertexArrayIndexed64iv(GLuint vaobj, GLuint index, GLenum pname, GLint64 *param)
 {
-    d_4_5_Core->GetVertexArrayIndexed64iv(vaobj, index, pname, param);
+    d_4_5_Core->f.GetVertexArrayIndexed64iv(vaobj, index, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetVertexArrayIndexediv(GLuint vaobj, GLuint index, GLenum pname, GLint *param)
 {
-    d_4_5_Core->GetVertexArrayIndexediv(vaobj, index, pname, param);
+    d_4_5_Core->f.GetVertexArrayIndexediv(vaobj, index, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetVertexArrayiv(GLuint vaobj, GLenum pname, GLint *param)
 {
-    d_4_5_Core->GetVertexArrayiv(vaobj, pname, param);
+    d_4_5_Core->f.GetVertexArrayiv(vaobj, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexArrayBindingDivisor(GLuint vaobj, GLuint bindingindex, GLuint divisor)
 {
-    d_4_5_Core->VertexArrayBindingDivisor(vaobj, bindingindex, divisor);
+    d_4_5_Core->f.VertexArrayBindingDivisor(vaobj, bindingindex, divisor);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexArrayAttribLFormat(GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_5_Core->VertexArrayAttribLFormat(vaobj, attribindex, size, type, relativeoffset);
+    d_4_5_Core->f.VertexArrayAttribLFormat(vaobj, attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexArrayAttribIFormat(GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)
 {
-    d_4_5_Core->VertexArrayAttribIFormat(vaobj, attribindex, size, type, relativeoffset);
+    d_4_5_Core->f.VertexArrayAttribIFormat(vaobj, attribindex, size, type, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexArrayAttribFormat(GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset)
 {
-    d_4_5_Core->VertexArrayAttribFormat(vaobj, attribindex, size, type, normalized, relativeoffset);
+    d_4_5_Core->f.VertexArrayAttribFormat(vaobj, attribindex, size, type, normalized, relativeoffset);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexArrayAttribBinding(GLuint vaobj, GLuint attribindex, GLuint bindingindex)
 {
-    d_4_5_Core->VertexArrayAttribBinding(vaobj, attribindex, bindingindex);
+    d_4_5_Core->f.VertexArrayAttribBinding(vaobj, attribindex, bindingindex);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexArrayVertexBuffers(GLuint vaobj, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides)
 {
-    d_4_5_Core->VertexArrayVertexBuffers(vaobj, first, count, buffers, offsets, strides);
+    d_4_5_Core->f.VertexArrayVertexBuffers(vaobj, first, count, buffers, offsets, strides);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexArrayVertexBuffer(GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride)
 {
-    d_4_5_Core->VertexArrayVertexBuffer(vaobj, bindingindex, buffer, offset, stride);
+    d_4_5_Core->f.VertexArrayVertexBuffer(vaobj, bindingindex, buffer, offset, stride);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glVertexArrayElementBuffer(GLuint vaobj, GLuint buffer)
 {
-    d_4_5_Core->VertexArrayElementBuffer(vaobj, buffer);
+    d_4_5_Core->f.VertexArrayElementBuffer(vaobj, buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glEnableVertexArrayAttrib(GLuint vaobj, GLuint index)
 {
-    d_4_5_Core->EnableVertexArrayAttrib(vaobj, index);
+    d_4_5_Core->f.EnableVertexArrayAttrib(vaobj, index);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glDisableVertexArrayAttrib(GLuint vaobj, GLuint index)
 {
-    d_4_5_Core->DisableVertexArrayAttrib(vaobj, index);
+    d_4_5_Core->f.DisableVertexArrayAttrib(vaobj, index);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCreateVertexArrays(GLsizei n, GLuint *arrays)
 {
-    d_4_5_Core->CreateVertexArrays(n, arrays);
+    d_4_5_Core->f.CreateVertexArrays(n, arrays);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTextureParameteriv(GLuint texture, GLenum pname, GLint *params)
 {
-    d_4_5_Core->GetTextureParameteriv(texture, pname, params);
+    d_4_5_Core->f.GetTextureParameteriv(texture, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTextureParameterIuiv(GLuint texture, GLenum pname, GLuint *params)
 {
-    d_4_5_Core->GetTextureParameterIuiv(texture, pname, params);
+    d_4_5_Core->f.GetTextureParameterIuiv(texture, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTextureParameterIiv(GLuint texture, GLenum pname, GLint *params)
 {
-    d_4_5_Core->GetTextureParameterIiv(texture, pname, params);
+    d_4_5_Core->f.GetTextureParameterIiv(texture, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTextureParameterfv(GLuint texture, GLenum pname, GLfloat *params)
 {
-    d_4_5_Core->GetTextureParameterfv(texture, pname, params);
+    d_4_5_Core->f.GetTextureParameterfv(texture, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTextureLevelParameteriv(GLuint texture, GLint level, GLenum pname, GLint *params)
 {
-    d_4_5_Core->GetTextureLevelParameteriv(texture, level, pname, params);
+    d_4_5_Core->f.GetTextureLevelParameteriv(texture, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTextureLevelParameterfv(GLuint texture, GLint level, GLenum pname, GLfloat *params)
 {
-    d_4_5_Core->GetTextureLevelParameterfv(texture, level, pname, params);
+    d_4_5_Core->f.GetTextureLevelParameterfv(texture, level, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetCompressedTextureImage(GLuint texture, GLint level, GLsizei bufSize, void *pixels)
 {
-    d_4_5_Core->GetCompressedTextureImage(texture, level, bufSize, pixels);
+    d_4_5_Core->f.GetCompressedTextureImage(texture, level, bufSize, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTextureImage(GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels)
 {
-    d_4_5_Core->GetTextureImage(texture, level, format, type, bufSize, pixels);
+    d_4_5_Core->f.GetTextureImage(texture, level, format, type, bufSize, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBindTextureUnit(GLuint unit, GLuint texture)
 {
-    d_4_5_Core->BindTextureUnit(unit, texture);
+    d_4_5_Core->f.BindTextureUnit(unit, texture);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGenerateTextureMipmap(GLuint texture)
 {
-    d_4_5_Core->GenerateTextureMipmap(texture);
+    d_4_5_Core->f.GenerateTextureMipmap(texture);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureParameteriv(GLuint texture, GLenum pname, const GLint *param)
 {
-    d_4_5_Core->TextureParameteriv(texture, pname, param);
+    d_4_5_Core->f.TextureParameteriv(texture, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureParameterIuiv(GLuint texture, GLenum pname, const GLuint *params)
 {
-    d_4_5_Core->TextureParameterIuiv(texture, pname, params);
+    d_4_5_Core->f.TextureParameterIuiv(texture, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureParameterIiv(GLuint texture, GLenum pname, const GLint *params)
 {
-    d_4_5_Core->TextureParameterIiv(texture, pname, params);
+    d_4_5_Core->f.TextureParameterIiv(texture, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureParameteri(GLuint texture, GLenum pname, GLint param)
 {
-    d_4_5_Core->TextureParameteri(texture, pname, param);
+    d_4_5_Core->f.TextureParameteri(texture, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureParameterfv(GLuint texture, GLenum pname, const GLfloat *param)
 {
-    d_4_5_Core->TextureParameterfv(texture, pname, param);
+    d_4_5_Core->f.TextureParameterfv(texture, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureParameterf(GLuint texture, GLenum pname, GLfloat param)
 {
-    d_4_5_Core->TextureParameterf(texture, pname, param);
+    d_4_5_Core->f.TextureParameterf(texture, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCopyTextureSubImage3D(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_4_5_Core->CopyTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, x, y, width, height);
+    d_4_5_Core->f.CopyTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCopyTextureSubImage2D(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_4_5_Core->CopyTextureSubImage2D(texture, level, xoffset, yoffset, x, y, width, height);
+    d_4_5_Core->f.CopyTextureSubImage2D(texture, level, xoffset, yoffset, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCopyTextureSubImage1D(GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-    d_4_5_Core->CopyTextureSubImage1D(texture, level, xoffset, x, y, width);
+    d_4_5_Core->f.CopyTextureSubImage1D(texture, level, xoffset, x, y, width);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCompressedTextureSubImage3D(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_4_5_Core->CompressedTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
+    d_4_5_Core->f.CompressedTextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCompressedTextureSubImage2D(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_4_5_Core->CompressedTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, imageSize, data);
+    d_4_5_Core->f.CompressedTextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCompressedTextureSubImage1D(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data)
 {
-    d_4_5_Core->CompressedTextureSubImage1D(texture, level, xoffset, width, format, imageSize, data);
+    d_4_5_Core->f.CompressedTextureSubImage1D(texture, level, xoffset, width, format, imageSize, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureSubImage3D(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)
 {
-    d_4_5_Core->TextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
+    d_4_5_Core->f.TextureSubImage3D(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureSubImage2D(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels)
 {
-    d_4_5_Core->TextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
+    d_4_5_Core->f.TextureSubImage2D(texture, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureSubImage1D(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels)
 {
-    d_4_5_Core->TextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
+    d_4_5_Core->f.TextureSubImage1D(texture, level, xoffset, width, format, type, pixels);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureStorage3DMultisample(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)
 {
-    d_4_5_Core->TextureStorage3DMultisample(texture, samples, internalformat, width, height, depth, fixedsamplelocations);
+    d_4_5_Core->f.TextureStorage3DMultisample(texture, samples, internalformat, width, height, depth, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureStorage2DMultisample(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)
 {
-    d_4_5_Core->TextureStorage2DMultisample(texture, samples, internalformat, width, height, fixedsamplelocations);
+    d_4_5_Core->f.TextureStorage2DMultisample(texture, samples, internalformat, width, height, fixedsamplelocations);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureStorage3D(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
 {
-    d_4_5_Core->TextureStorage3D(texture, levels, internalformat, width, height, depth);
+    d_4_5_Core->f.TextureStorage3D(texture, levels, internalformat, width, height, depth);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureStorage2D(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_4_5_Core->TextureStorage2D(texture, levels, internalformat, width, height);
+    d_4_5_Core->f.TextureStorage2D(texture, levels, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureStorage1D(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width)
 {
-    d_4_5_Core->TextureStorage1D(texture, levels, internalformat, width);
+    d_4_5_Core->f.TextureStorage1D(texture, levels, internalformat, width);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureBufferRange(GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizei size)
 {
-    d_4_5_Core->TextureBufferRange(texture, internalformat, buffer, offset, size);
+    d_4_5_Core->f.TextureBufferRange(texture, internalformat, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTextureBuffer(GLuint texture, GLenum internalformat, GLuint buffer)
 {
-    d_4_5_Core->TextureBuffer(texture, internalformat, buffer);
+    d_4_5_Core->f.TextureBuffer(texture, internalformat, buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCreateTextures(GLenum target, GLsizei n, GLuint *textures)
 {
-    d_4_5_Core->CreateTextures(target, n, textures);
+    d_4_5_Core->f.CreateTextures(target, n, textures);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetNamedRenderbufferParameteriv(GLuint renderbuffer, GLenum pname, GLint *params)
 {
-    d_4_5_Core->GetNamedRenderbufferParameteriv(renderbuffer, pname, params);
+    d_4_5_Core->f.GetNamedRenderbufferParameteriv(renderbuffer, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glNamedRenderbufferStorageMultisample(GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_4_5_Core->NamedRenderbufferStorageMultisample(renderbuffer, samples, internalformat, width, height);
+    d_4_5_Core->f.NamedRenderbufferStorageMultisample(renderbuffer, samples, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glNamedRenderbufferStorage(GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height)
 {
-    d_4_5_Core->NamedRenderbufferStorage(renderbuffer, internalformat, width, height);
+    d_4_5_Core->f.NamedRenderbufferStorage(renderbuffer, internalformat, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCreateRenderbuffers(GLsizei n, GLuint *renderbuffers)
 {
-    d_4_5_Core->CreateRenderbuffers(n, renderbuffers);
+    d_4_5_Core->f.CreateRenderbuffers(n, renderbuffers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetNamedFramebufferAttachmentParameteriv(GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params)
 {
-    d_4_5_Core->GetNamedFramebufferAttachmentParameteriv(framebuffer, attachment, pname, params);
+    d_4_5_Core->f.GetNamedFramebufferAttachmentParameteriv(framebuffer, attachment, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetNamedFramebufferParameteriv(GLuint framebuffer, GLenum pname, GLint *param)
 {
-    d_4_5_Core->GetNamedFramebufferParameteriv(framebuffer, pname, param);
+    d_4_5_Core->f.GetNamedFramebufferParameteriv(framebuffer, pname, param);
 }
 
 inline GLenum QOpenGLFunctions_4_5_Core::glCheckNamedFramebufferStatus(GLuint framebuffer, GLenum target)
 {
-    return d_4_5_Core->CheckNamedFramebufferStatus(framebuffer, target);
+    return d_4_5_Core->f.CheckNamedFramebufferStatus(framebuffer, target);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glBlitNamedFramebuffer(GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
-    d_4_5_Core->BlitNamedFramebuffer(readFramebuffer, drawFramebuffer, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
+    d_4_5_Core->f.BlitNamedFramebuffer(readFramebuffer, drawFramebuffer, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearNamedFramebufferfi(GLuint framebuffer, GLenum buffer, GLfloat depth, GLint stencil)
 {
-    d_4_5_Core->ClearNamedFramebufferfi(framebuffer, buffer, depth, stencil);
+    d_4_5_Core->f.ClearNamedFramebufferfi(framebuffer, buffer, depth, stencil);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearNamedFramebufferfv(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value)
 {
-    d_4_5_Core->ClearNamedFramebufferfv(framebuffer, buffer, drawbuffer, value);
+    d_4_5_Core->f.ClearNamedFramebufferfv(framebuffer, buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearNamedFramebufferuiv(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value)
 {
-    d_4_5_Core->ClearNamedFramebufferuiv(framebuffer, buffer, drawbuffer, value);
+    d_4_5_Core->f.ClearNamedFramebufferuiv(framebuffer, buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearNamedFramebufferiv(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value)
 {
-    d_4_5_Core->ClearNamedFramebufferiv(framebuffer, buffer, drawbuffer, value);
+    d_4_5_Core->f.ClearNamedFramebufferiv(framebuffer, buffer, drawbuffer, value);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glInvalidateNamedFramebufferSubData(GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-    d_4_5_Core->InvalidateNamedFramebufferSubData(framebuffer, numAttachments, attachments, x, y, width, height);
+    d_4_5_Core->f.InvalidateNamedFramebufferSubData(framebuffer, numAttachments, attachments, x, y, width, height);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glInvalidateNamedFramebufferData(GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments)
 {
-    d_4_5_Core->InvalidateNamedFramebufferData(framebuffer, numAttachments, attachments);
+    d_4_5_Core->f.InvalidateNamedFramebufferData(framebuffer, numAttachments, attachments);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glNamedFramebufferReadBuffer(GLuint framebuffer, GLenum src)
 {
-    d_4_5_Core->NamedFramebufferReadBuffer(framebuffer, src);
+    d_4_5_Core->f.NamedFramebufferReadBuffer(framebuffer, src);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glNamedFramebufferDrawBuffers(GLuint framebuffer, GLsizei n, const GLenum *bufs)
 {
-    d_4_5_Core->NamedFramebufferDrawBuffers(framebuffer, n, bufs);
+    d_4_5_Core->f.NamedFramebufferDrawBuffers(framebuffer, n, bufs);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glNamedFramebufferDrawBuffer(GLuint framebuffer, GLenum buf)
 {
-    d_4_5_Core->NamedFramebufferDrawBuffer(framebuffer, buf);
+    d_4_5_Core->f.NamedFramebufferDrawBuffer(framebuffer, buf);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glNamedFramebufferTextureLayer(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
-    d_4_5_Core->NamedFramebufferTextureLayer(framebuffer, attachment, texture, level, layer);
+    d_4_5_Core->f.NamedFramebufferTextureLayer(framebuffer, attachment, texture, level, layer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glNamedFramebufferTexture(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level)
 {
-    d_4_5_Core->NamedFramebufferTexture(framebuffer, attachment, texture, level);
+    d_4_5_Core->f.NamedFramebufferTexture(framebuffer, attachment, texture, level);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glNamedFramebufferParameteri(GLuint framebuffer, GLenum pname, GLint param)
 {
-    d_4_5_Core->NamedFramebufferParameteri(framebuffer, pname, param);
+    d_4_5_Core->f.NamedFramebufferParameteri(framebuffer, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glNamedFramebufferRenderbuffer(GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
-    d_4_5_Core->NamedFramebufferRenderbuffer(framebuffer, attachment, renderbuffertarget, renderbuffer);
+    d_4_5_Core->f.NamedFramebufferRenderbuffer(framebuffer, attachment, renderbuffertarget, renderbuffer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCreateFramebuffers(GLsizei n, GLuint *framebuffers)
 {
-    d_4_5_Core->CreateFramebuffers(n, framebuffers);
+    d_4_5_Core->f.CreateFramebuffers(n, framebuffers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetNamedBufferSubData(GLuint buffer, GLintptr offset, GLsizei size, void *data)
 {
-    d_4_5_Core->GetNamedBufferSubData(buffer, offset, size, data);
+    d_4_5_Core->f.GetNamedBufferSubData(buffer, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetNamedBufferPointerv(GLuint buffer, GLenum pname, void * *params)
 {
-    d_4_5_Core->GetNamedBufferPointerv(buffer, pname, params);
+    d_4_5_Core->f.GetNamedBufferPointerv(buffer, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetNamedBufferParameteri64v(GLuint buffer, GLenum pname, GLint64 *params)
 {
-    d_4_5_Core->GetNamedBufferParameteri64v(buffer, pname, params);
+    d_4_5_Core->f.GetNamedBufferParameteri64v(buffer, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetNamedBufferParameteriv(GLuint buffer, GLenum pname, GLint *params)
 {
-    d_4_5_Core->GetNamedBufferParameteriv(buffer, pname, params);
+    d_4_5_Core->f.GetNamedBufferParameteriv(buffer, pname, params);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glFlushMappedNamedBufferRange(GLuint buffer, GLintptr offset, GLsizei length)
 {
-    d_4_5_Core->FlushMappedNamedBufferRange(buffer, offset, length);
+    d_4_5_Core->f.FlushMappedNamedBufferRange(buffer, offset, length);
 }
 
 inline GLboolean QOpenGLFunctions_4_5_Core::glUnmapNamedBuffer(GLuint buffer)
 {
-    return d_4_5_Core->UnmapNamedBuffer(buffer);
+    return d_4_5_Core->f.UnmapNamedBuffer(buffer);
 }
 
 inline void * QOpenGLFunctions_4_5_Core::glMapNamedBufferRange(GLuint buffer, GLintptr offset, GLsizei length, GLbitfield access)
 {
-    return d_4_5_Core->MapNamedBufferRange(buffer, offset, length, access);
+    return d_4_5_Core->f.MapNamedBufferRange(buffer, offset, length, access);
 }
 
 inline void * QOpenGLFunctions_4_5_Core::glMapNamedBuffer(GLuint buffer, GLenum access)
 {
-    return d_4_5_Core->MapNamedBuffer(buffer, access);
+    return d_4_5_Core->f.MapNamedBuffer(buffer, access);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearNamedBufferSubData(GLuint buffer, GLenum internalformat, GLintptr offset, GLsizei size, GLenum format, GLenum type, const void *data)
 {
-    d_4_5_Core->ClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
+    d_4_5_Core->f.ClearNamedBufferSubData(buffer, internalformat, offset, size, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClearNamedBufferData(GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data)
 {
-    d_4_5_Core->ClearNamedBufferData(buffer, internalformat, format, type, data);
+    d_4_5_Core->f.ClearNamedBufferData(buffer, internalformat, format, type, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCopyNamedBufferSubData(GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizei size)
 {
-    d_4_5_Core->CopyNamedBufferSubData(readBuffer, writeBuffer, readOffset, writeOffset, size);
+    d_4_5_Core->f.CopyNamedBufferSubData(readBuffer, writeBuffer, readOffset, writeOffset, size);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glNamedBufferSubData(GLuint buffer, GLintptr offset, GLsizei size, const void *data)
 {
-    d_4_5_Core->NamedBufferSubData(buffer, offset, size, data);
+    d_4_5_Core->f.NamedBufferSubData(buffer, offset, size, data);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glNamedBufferData(GLuint buffer, GLsizei size, const void *data, GLenum usage)
 {
-    d_4_5_Core->NamedBufferData(buffer, size, data, usage);
+    d_4_5_Core->f.NamedBufferData(buffer, size, data, usage);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glNamedBufferStorage(GLuint buffer, GLsizei size, const void *data, GLbitfield flags)
 {
-    d_4_5_Core->NamedBufferStorage(buffer, size, data, flags);
+    d_4_5_Core->f.NamedBufferStorage(buffer, size, data, flags);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCreateBuffers(GLsizei n, GLuint *buffers)
 {
-    d_4_5_Core->CreateBuffers(n, buffers);
+    d_4_5_Core->f.CreateBuffers(n, buffers);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTransformFeedbacki64_v(GLuint xfb, GLenum pname, GLuint index, GLint64 *param)
 {
-    d_4_5_Core->GetTransformFeedbacki64_v(xfb, pname, index, param);
+    d_4_5_Core->f.GetTransformFeedbacki64_v(xfb, pname, index, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTransformFeedbacki_v(GLuint xfb, GLenum pname, GLuint index, GLint *param)
 {
-    d_4_5_Core->GetTransformFeedbacki_v(xfb, pname, index, param);
+    d_4_5_Core->f.GetTransformFeedbacki_v(xfb, pname, index, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glGetTransformFeedbackiv(GLuint xfb, GLenum pname, GLint *param)
 {
-    d_4_5_Core->GetTransformFeedbackiv(xfb, pname, param);
+    d_4_5_Core->f.GetTransformFeedbackiv(xfb, pname, param);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTransformFeedbackBufferRange(GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizei size)
 {
-    d_4_5_Core->TransformFeedbackBufferRange(xfb, index, buffer, offset, size);
+    d_4_5_Core->f.TransformFeedbackBufferRange(xfb, index, buffer, offset, size);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glTransformFeedbackBufferBase(GLuint xfb, GLuint index, GLuint buffer)
 {
-    d_4_5_Core->TransformFeedbackBufferBase(xfb, index, buffer);
+    d_4_5_Core->f.TransformFeedbackBufferBase(xfb, index, buffer);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glCreateTransformFeedbacks(GLsizei n, GLuint *ids)
 {
-    d_4_5_Core->CreateTransformFeedbacks(n, ids);
+    d_4_5_Core->f.CreateTransformFeedbacks(n, ids);
 }
 
 inline void QOpenGLFunctions_4_5_Core::glClipControl(GLenum origin, GLenum depth)
 {
-    d_4_5_Core->ClipControl(origin, depth);
+    d_4_5_Core->f.ClipControl(origin, depth);
 }
 
 
diff --git a/src/gui/opengl/qopenglfunctions_es2.cpp b/src/gui/opengl/qopenglfunctions_es2.cpp
index 87feee59af..59e275dce1 100644
--- a/src/gui/opengl/qopenglfunctions_es2.cpp
+++ b/src/gui/opengl/qopenglfunctions_es2.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglfunctions_es2.h b/src/gui/opengl/qopenglfunctions_es2.h
index ad84a69f3f..45cb329a87 100644
--- a/src/gui/opengl/qopenglfunctions_es2.h
+++ b/src/gui/opengl/qopenglfunctions_es2.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglgradientcache.cpp b/src/gui/opengl/qopenglgradientcache.cpp
index 13bad9aabb..58dcbed50a 100644
--- a/src/gui/opengl/qopenglgradientcache.cpp
+++ b/src/gui/opengl/qopenglgradientcache.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -102,7 +108,7 @@ GLuint QOpenGL2GradientCache::getBuffer(const QGradient &gradient, qreal opacity
 {
     quint64 hash_val = 0;
 
-    QGradientStops stops = gradient.stops();
+    const QGradientStops stops = gradient.stops();
     for (int i = 0; i < stops.size() && i <= 2; i++)
         hash_val += stops[i].second.rgba();
 
@@ -164,16 +170,12 @@ GLuint QOpenGL2GradientCache::addCacheElement(quint64 hash_val, const QGradient
 void QOpenGL2GradientCache::generateGradientColorTable(const QGradient& gradient, QRgba64 *colorTable, int size, qreal opacity) const
 {
     int pos = 0;
-    QGradientStops s = gradient.stops();
-    QVector<QRgba64> colors(s.size());
-
-    for (int i = 0; i < s.size(); ++i)
-        colors[i] = s[i].second.rgba64();
+    const QGradientStops s = gradient.stops();
 
     bool colorInterpolation = (gradient.interpolationMode() == QGradient::ColorInterpolation);
 
     uint alpha = qRound(opacity * 256);
-    QRgba64 current_color = combineAlpha256(colors[0], alpha);
+    QRgba64 current_color = combineAlpha256(s[0].second.rgba64(), alpha);
     qreal incr = 1.0 / qreal(size);
     qreal fpos = 1.5 * incr;
     colorTable[pos++] = qPremultiply(current_color);
@@ -187,9 +189,10 @@ void QOpenGL2GradientCache::generateGradientColorTable(const QGradient& gradient
     if (colorInterpolation)
         current_color = qPremultiply(current_color);
 
-    for (int i = 0; i < s.size() - 1; ++i) {
+    const int sLast = s.size() - 1;
+    for (int i = 0; i < sLast; ++i) {
         qreal delta = 1/(s[i+1].first - s[i].first);
-        QRgba64 next_color = combineAlpha256(colors[i+1], alpha);
+        QRgba64 next_color = combineAlpha256(s[i + 1].second.rgba64(), alpha);
         if (colorInterpolation)
             next_color = qPremultiply(next_color);
 
@@ -208,7 +211,7 @@ void QOpenGL2GradientCache::generateGradientColorTable(const QGradient& gradient
 
     Q_ASSERT(s.size() > 0);
 
-    QRgba64 last_color = qPremultiply(combineAlpha256(colors[s.size() - 1], alpha));
+    QRgba64 last_color = qPremultiply(combineAlpha256(s[sLast].second.rgba64(), alpha));
     for (;pos < size; ++pos)
         colorTable[pos] = last_color;
 
@@ -219,16 +222,13 @@ void QOpenGL2GradientCache::generateGradientColorTable(const QGradient& gradient
 void QOpenGL2GradientCache::generateGradientColorTable(const QGradient& gradient, uint *colorTable, int size, qreal opacity) const
 {
     int pos = 0;
-    QGradientStops s = gradient.stops();
-    QVector<uint> colors(s.size());
-
-    for (int i = 0; i < s.size(); ++i)
-        colors[i] = s[i].second.rgba(); // Qt LIES! It returns ARGB (on little-endian AND on big-endian)
+    const QGradientStops s = gradient.stops();
 
     bool colorInterpolation = (gradient.interpolationMode() == QGradient::ColorInterpolation);
 
     uint alpha = qRound(opacity * 256);
-    uint current_color = ARGB_COMBINE_ALPHA(colors[0], alpha);
+    // Qt LIES! It returns ARGB (on little-endian AND on big-endian)
+    uint current_color = ARGB_COMBINE_ALPHA(s[0].second.rgba(), alpha);
     qreal incr = 1.0 / qreal(size);
     qreal fpos = 1.5 * incr;
     colorTable[pos++] = ARGB2RGBA(qPremultiply(current_color));
@@ -242,9 +242,10 @@ void QOpenGL2GradientCache::generateGradientColorTable(const QGradient& gradient
     if (colorInterpolation)
         current_color = qPremultiply(current_color);
 
-    for (int i = 0; i < s.size() - 1; ++i) {
+    const int sLast = s.size() - 1;
+    for (int i = 0; i < sLast; ++i) {
         qreal delta = 1/(s[i+1].first - s[i].first);
-        uint next_color = ARGB_COMBINE_ALPHA(colors[i+1], alpha);
+        uint next_color = ARGB_COMBINE_ALPHA(s[i + 1].second.rgba(), alpha);
         if (colorInterpolation)
             next_color = qPremultiply(next_color);
 
@@ -263,7 +264,7 @@ void QOpenGL2GradientCache::generateGradientColorTable(const QGradient& gradient
 
     Q_ASSERT(s.size() > 0);
 
-    uint last_color = ARGB2RGBA(qPremultiply(ARGB_COMBINE_ALPHA(colors[s.size() - 1], alpha)));
+    uint last_color = ARGB2RGBA(qPremultiply(ARGB_COMBINE_ALPHA(s[sLast].second.rgba(), alpha)));
     for (;pos < size; ++pos)
         colorTable[pos] = last_color;
 
diff --git a/src/gui/opengl/qopenglgradientcache_p.h b/src/gui/opengl/qopenglgradientcache_p.h
index f2cc082250..12423452f2 100644
--- a/src/gui/opengl/qopenglgradientcache_p.h
+++ b/src/gui/opengl/qopenglgradientcache_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
index 17a32774d8..75f09d6031 100644
--- a/src/gui/opengl/qopenglpaintdevice.cpp
+++ b/src/gui/opengl/qopenglpaintdevice.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h
index 804e4857e9..dffa68c29e 100644
--- a/src/gui/opengl/qopenglpaintdevice.h
+++ b/src/gui/opengl/qopenglpaintdevice.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglpaintdevice_p.h b/src/gui/opengl/qopenglpaintdevice_p.h
index 54ea09240d..78e6b7a464 100644
--- a/src/gui/opengl/qopenglpaintdevice_p.h
+++ b/src/gui/opengl/qopenglpaintdevice_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
index 0b92bf4b1d..d93871c99b 100644
--- a/src/gui/opengl/qopenglpaintengine.cpp
+++ b/src/gui/opengl/qopenglpaintengine.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
index f1ec669ca0..c9f328203c 100644
--- a/src/gui/opengl/qopenglpaintengine_p.h
+++ b/src/gui/opengl/qopenglpaintengine_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglpixeltransferoptions.cpp b/src/gui/opengl/qopenglpixeltransferoptions.cpp
index 25be0933f7..b0d953d76b 100644
--- a/src/gui/opengl/qopenglpixeltransferoptions.cpp
+++ b/src/gui/opengl/qopenglpixeltransferoptions.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglpixeltransferoptions.h b/src/gui/opengl/qopenglpixeltransferoptions.h
index cb4697ec7c..81aa588ae4 100644
--- a/src/gui/opengl/qopenglpixeltransferoptions.h
+++ b/src/gui/opengl/qopenglpixeltransferoptions.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglqueryhelper_p.h b/src/gui/opengl/qopenglqueryhelper_p.h
index 98ac6b3915..be36c32217 100644
--- a/src/gui/opengl/qopenglqueryhelper_p.h
+++ b/src/gui/opengl/qopenglqueryhelper_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglshadercache_meego_p.h b/src/gui/opengl/qopenglshadercache_meego_p.h
index ad00717fd3..0892e1a2a1 100644
--- a/src/gui/opengl/qopenglshadercache_meego_p.h
+++ b/src/gui/opengl/qopenglshadercache_meego_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglshadercache_p.h b/src/gui/opengl/qopenglshadercache_p.h
index d6f1c8eb23..5070874d83 100644
--- a/src/gui/opengl/qopenglshadercache_p.h
+++ b/src/gui/opengl/qopenglshadercache_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp
index 824831ab29..a7c8aae989 100644
--- a/src/gui/opengl/qopenglshaderprogram.cpp
+++ b/src/gui/opengl/qopenglshaderprogram.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -244,7 +250,7 @@ bool QOpenGLShaderPrivate::create()
         shader = glfuncs->glCreateShader(GL_FRAGMENT_SHADER);
     }
     if (!shader) {
-        qWarning() << "QOpenGLShader: could not create shader";
+        qWarning("QOpenGLShader: could not create shader");
         return false;
     }
     shaderGuard = new QOpenGLSharedResourceGuard(context, shader, freeShaderFunc);
@@ -732,7 +738,7 @@ QOpenGLShaderProgramPrivate::~QOpenGLShaderProgramPrivate()
 
 bool QOpenGLShaderProgramPrivate::hasShader(QOpenGLShader::ShaderType type) const
 {
-    foreach (QOpenGLShader *shader, shaders) {
+    for (QOpenGLShader *shader : shaders) {
         if (shader->shaderType() == type)
             return true;
     }
@@ -802,7 +808,7 @@ bool QOpenGLShaderProgram::init()
 
     GLuint program = d->glfuncs->glCreateProgram();
     if (!program) {
-        qWarning() << "QOpenGLShaderProgram: could not create shader program";
+        qWarning("QOpenGLShaderProgram: could not create shader program");
         return false;
     }
     if (d->programGuard)
@@ -990,17 +996,15 @@ void QOpenGLShaderProgram::removeAllShaders()
 {
     Q_D(QOpenGLShaderProgram);
     d->removingShaders = true;
-    foreach (QOpenGLShader *shader, d->shaders) {
+    for (QOpenGLShader *shader : qAsConst(d->shaders)) {
         if (d->programGuard && d->programGuard->id()
             && shader && shader->d_func()->shaderGuard)
         {
             d->glfuncs->glDetachShader(d->programGuard->id(), shader->d_func()->shaderGuard->id());
         }
     }
-    foreach (QOpenGLShader *shader, d->anonShaders) {
-        // Delete shader objects that were created anonymously.
-        delete shader;
-    }
+    // Delete shader objects that were created anonymously.
+    qDeleteAll(d->anonShaders);
     d->shaders.clear();
     d->anonShaders.clear();
     d->linked = false;  // Program needs to be relinked.
@@ -1056,9 +1060,9 @@ bool QOpenGLShaderProgram::link()
         if (!d->linked) {
             QString name = objectName();
             if (name.isEmpty())
-                qWarning() << "QOpenGLShader::link:" << d->log;
+                qWarning("QOpenGLShader::link: %ls", qUtf16Printable(d->log));
             else
-                qWarning() << "QOpenGLShader::link[" << name << "]:" << d->log;
+                qWarning("QOpenGLShader::link[%ls]: %ls", qUtf16Printable(name), qUtf16Printable(d->log));
         }
         delete [] logbuf;
     }
diff --git a/src/gui/opengl/qopenglshaderprogram.h b/src/gui/opengl/qopenglshaderprogram.h
index b959954718..da20228e51 100644
--- a/src/gui/opengl/qopenglshaderprogram.h
+++ b/src/gui/opengl/qopenglshaderprogram.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp
index 6b83c17fd4..1db61b7ca1 100644
--- a/src/gui/opengl/qopengltexture.cpp
+++ b/src/gui/opengl/qopengltexture.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -75,7 +81,8 @@ QOpenGLTexturePrivate::QOpenGLTexturePrivate(QOpenGLTexture::Target textureTarge
       textureView(false),
       autoGenerateMipMaps(true),
       storageAllocated(false),
-      texFuncs(0)
+      texFuncs(0),
+      functions(0)
 {
     dimensions[0] = dimensions[1] = dimensions[2] = 1;
 
@@ -159,6 +166,7 @@ bool QOpenGLTexturePrivate::create()
         return false;
     }
     context = ctx;
+    functions = ctx->functions();
 
     // Resolve any functions we will need based upon context version and create the texture
     initializeOpenGLFunctions();
@@ -171,7 +179,7 @@ bool QOpenGLTexturePrivate::create()
         feature = static_cast<QOpenGLTexture::Feature>(feature << 1);
     }
 
-    texFuncs->glGenTextures(1, &textureId);
+    functions->glGenTextures(1, &textureId);
     return textureId != 0;
 }
 
@@ -188,9 +196,10 @@ void QOpenGLTexturePrivate::destroy()
         return;
     }
 
-    texFuncs->glDeleteTextures(1, &textureId);
+    functions->glDeleteTextures(1, &textureId);
 
     context = 0;
+    functions = 0;
     textureId = 0;
     format = QOpenGLTexture::NoFormat;
     formatClass = QOpenGLTexture::NoFormatClass;
@@ -225,17 +234,17 @@ void QOpenGLTexturePrivate::destroy()
 
 void QOpenGLTexturePrivate::bind()
 {
-    texFuncs->glBindTexture(target, textureId);
+    functions->glBindTexture(target, textureId);
 }
 
 void QOpenGLTexturePrivate::bind(uint unit, QOpenGLTexture::TextureUnitReset reset)
 {
     GLint oldTextureUnit = 0;
     if (reset == QOpenGLTexture::ResetTextureUnit)
-        texFuncs->glGetIntegerv(GL_ACTIVE_TEXTURE, &oldTextureUnit);
+        functions->glGetIntegerv(GL_ACTIVE_TEXTURE, &oldTextureUnit);
 
     texFuncs->glActiveTexture(GL_TEXTURE0 + unit);
-    texFuncs->glBindTexture(target, textureId);
+    functions->glBindTexture(target, textureId);
 
     if (reset == QOpenGLTexture::ResetTextureUnit)
         texFuncs->glActiveTexture(GL_TEXTURE0 + oldTextureUnit);
@@ -243,17 +252,17 @@ void QOpenGLTexturePrivate::bind(uint unit, QOpenGLTexture::TextureUnitReset res
 
 void QOpenGLTexturePrivate::release()
 {
-    texFuncs->glBindTexture(target, 0);
+    functions->glBindTexture(target, 0);
 }
 
 void QOpenGLTexturePrivate::release(uint unit, QOpenGLTexture::TextureUnitReset reset)
 {
     GLint oldTextureUnit = 0;
     if (reset == QOpenGLTexture::ResetTextureUnit)
-        texFuncs->glGetIntegerv(GL_ACTIVE_TEXTURE, &oldTextureUnit);
+        functions->glGetIntegerv(GL_ACTIVE_TEXTURE, &oldTextureUnit);
 
     texFuncs->glActiveTexture(GL_TEXTURE0 + unit);
-    texFuncs->glBindTexture(target, 0);
+    functions->glBindTexture(target, 0);
 
     if (reset == QOpenGLTexture::ResetTextureUnit)
         texFuncs->glActiveTexture(GL_TEXTURE0 + oldTextureUnit);
@@ -262,18 +271,18 @@ void QOpenGLTexturePrivate::release(uint unit, QOpenGLTexture::TextureUnitReset
 bool QOpenGLTexturePrivate::isBound() const
 {
     GLint boundTextureId = 0;
-    texFuncs->glGetIntegerv(bindingTarget, &boundTextureId);
+    functions->glGetIntegerv(bindingTarget, &boundTextureId);
     return (static_cast<GLuint>(boundTextureId) == textureId);
 }
 
 bool QOpenGLTexturePrivate::isBound(uint unit) const
 {
     GLint oldTextureUnit = 0;
-    texFuncs->glGetIntegerv(GL_ACTIVE_TEXTURE, &oldTextureUnit);
+    functions->glGetIntegerv(GL_ACTIVE_TEXTURE, &oldTextureUnit);
 
     GLint boundTextureId = 0;
     texFuncs->glActiveTexture(GL_TEXTURE0 + unit);
-    texFuncs->glGetIntegerv(bindingTarget, &boundTextureId);
+    functions->glGetIntegerv(bindingTarget, &boundTextureId);
     bool result = (static_cast<GLuint>(boundTextureId) == textureId);
 
     texFuncs->glActiveTexture(GL_TEXTURE0 + oldTextureUnit);
@@ -4101,27 +4110,8 @@ QOpenGLTexture::WrapMode QOpenGLTexture::wrapMode(QOpenGLTexture::CoordinateDire
 */
 void QOpenGLTexture::setBorderColor(QColor color)
 {
-#if !defined(QT_OPENGL_ES_2)
-    if (!QOpenGLContext::currentContext()->isOpenGLES()) {
-        Q_D(QOpenGLTexture);
-        d->create();
-        Q_ASSERT(d->texFuncs);
-        Q_ASSERT(d->textureId);
-        float values[4];
-        values[0] = color.redF();
-        values[1] = color.greenF();
-        values[2] = color.blueF();
-        values[3] = color.alphaF();
-        d->borderColor.clear();
-        for (int i = 0; i < 4; ++i)
-            d->borderColor.append(QVariant(values[i]));
-        d->texFuncs->glTextureParameterfv(d->textureId, d->target, d->bindingTarget, GL_TEXTURE_BORDER_COLOR, values);
-        return;
-    }
-#else
-    Q_UNUSED(color);
-#endif
-    qWarning("QOpenGLTexture: Border color is not supported");
+    setBorderColor(static_cast<float>(color.redF()), static_cast<float>(color.greenF()),
+                   static_cast<float>(color.blueF()), static_cast<float>(color.alphaF()));
 }
 
 /*!
diff --git a/src/gui/opengl/qopengltexture.h b/src/gui/opengl/qopengltexture.h
index ec52a192fa..8c32fcef26 100644
--- a/src/gui/opengl/qopengltexture.h
+++ b/src/gui/opengl/qopengltexture.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -49,6 +55,7 @@ class QOpenGLPixelTransferOptions;
 
 class Q_GUI_EXPORT QOpenGLTexture
 {
+    Q_GADGET
 public:
     enum Target {
         Target1D                   = 0x0DE0,    // GL_TEXTURE_1D
@@ -63,6 +70,7 @@ public:
         TargetRectangle            = 0x84F5,    // GL_TEXTURE_RECTANGLE
         TargetBuffer               = 0x8C2A     // GL_TEXTURE_BUFFER
     };
+    Q_ENUM(Target)
 
     enum BindingTarget {
         BindingTarget1D                    = 0x8068,   // GL_TEXTURE_BINDING_1D
@@ -77,16 +85,19 @@ public:
         BindingTargetRectangle             = 0x84F6,   // GL_TEXTURE_BINDING_RECTANGLE
         BindingTargetBuffer                = 0x8C2C    // GL_TEXTURE_BINDING_BUFFER
     };
+    Q_ENUM(BindingTarget)
 
     enum MipMapGeneration {
         GenerateMipMaps,
         DontGenerateMipMaps
     };
+    Q_ENUM(MipMapGeneration)
 
     enum TextureUnitReset {
         ResetTextureUnit,
         DontResetTextureUnit
     };
+    Q_ENUM(TextureUnitReset)
 
     enum TextureFormat {
         NoFormat               = 0,         // GL_NONE
@@ -216,6 +227,7 @@ public:
         LuminanceAlphaFormat   = 0x190A
 
     };
+    Q_ENUM(TextureFormat)
 
     // This is not used externally yet but is reserved to allow checking of
     // compatibility between texture formats
@@ -250,6 +262,7 @@ public:
         CubeMapPositiveZ = 0x8519,  // GL_TEXTURE_CUBE_MAP_POSITIVE_Z
         CubeMapNegativeZ = 0x851A   // GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
     };
+    Q_ENUM(CubeMapFace)
 
     enum PixelFormat {
         NoSourceFormat = 0,         // GL_NONE
@@ -272,6 +285,7 @@ public:
         Luminance      = 0x1909,    // GL_LUMINANCE
         LuminanceAlpha = 0x190A     // GL_LUMINANCE_ALPHA
     };
+    Q_ENUM(PixelFormat)
 
     enum PixelType {
         NoPixelType        = 0,         // GL_NONE
@@ -301,6 +315,7 @@ public:
         UInt32_D24S8       = 0x84FA,    // GL_UNSIGNED_INT_24_8
         Float32_D32_UInt32_S8_X24 = 0x8DAD // GL_FLOAT_32_UNSIGNED_INT_24_8_REV
     };
+    Q_ENUM(PixelType)
 
     enum SwizzleComponent {
         SwizzleRed   = 0x8E42,  // GL_TEXTURE_SWIZZLE_R
@@ -308,6 +323,7 @@ public:
         SwizzleBlue  = 0x8E44,  // GL_TEXTURE_SWIZZLE_B
         SwizzleAlpha = 0x8E45   // GL_TEXTURE_SWIZZLE_A
     };
+    Q_ENUM(SwizzleComponent)
 
     enum SwizzleValue {
         RedValue   = 0x1903, // GL_RED
@@ -317,6 +333,7 @@ public:
         ZeroValue  = 0,      // GL_ZERO
         OneValue   = 1       // GL_ONE
     };
+    Q_ENUM(SwizzleValue)
 
     enum WrapMode {
         Repeat         = 0x2901, // GL_REPEAT
@@ -324,12 +341,14 @@ public:
         ClampToEdge    = 0x812F, // GL_CLAMP_TO_EDGE
         ClampToBorder  = 0x812D  // GL_CLAMP_TO_BORDER
     };
+    Q_ENUM(WrapMode)
 
     enum CoordinateDirection {
         DirectionS = 0x2802, // GL_TEXTURE_WRAP_S
         DirectionT = 0x2803, // GL_TEXTURE_WRAP_T
         DirectionR = 0x8072  // GL_TEXTURE_WRAP_R
     };
+    Q_ENUM(CoordinateDirection)
 
     // Features
     enum Feature {
@@ -354,6 +373,7 @@ public:
 #endif
     };
     Q_DECLARE_FLAGS(Features, Feature)
+    Q_ENUM(Feature)
 
     explicit QOpenGLTexture(Target target);
     explicit QOpenGLTexture(const QImage& image, MipMapGeneration genMipMaps = GenerateMipMaps);
@@ -487,6 +507,7 @@ public:
         DepthMode   = 0x1902,   // GL_DEPTH_COMPONENT
         StencilMode = 0x1901    // GL_STENCIL_INDEX
     };
+    Q_ENUM(DepthStencilMode)
 
     void setDepthStencilMode(DepthStencilMode mode);
     DepthStencilMode depthStencilMode() const;
@@ -501,6 +522,7 @@ public:
         CompareAlways       = 0x0207,   // GL_ALWAYS
         CompareNever        = 0x0200    // GL_NEVER
     };
+    Q_ENUM(ComparisonFunction)
 
     void setComparisonFunction(ComparisonFunction function);
     ComparisonFunction comparisonFunction() const;
@@ -522,6 +544,7 @@ public:
         LinearMipMapNearest     = 0x2701,   // GL_LINEAR_MIPMAP_NEAREST
         LinearMipMapLinear      = 0x2703    // GL_LINEAR_MIPMAP_LINEAR
     };
+    Q_ENUM(Filter)
 
     void setMinificationFilter(Filter filter);
     Filter minificationFilter() const;
diff --git a/src/gui/opengl/qopengltexture_p.h b/src/gui/opengl/qopengltexture_p.h
index 40ceb1936c..e9ada026ed 100644
--- a/src/gui/opengl/qopengltexture_p.h
+++ b/src/gui/opengl/qopengltexture_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -64,6 +70,7 @@ QT_BEGIN_NAMESPACE
 
 class QOpenGLContext;
 class QOpenGLTextureHelper;
+class QOpenGLFunctions;
 
 class QOpenGLTexturePrivate
 {
@@ -157,6 +164,7 @@ public:
     bool storageAllocated;
 
     QOpenGLTextureHelper *texFuncs;
+    QOpenGLFunctions *functions;
 
     QOpenGLTexture::Features features;
 };
diff --git a/src/gui/opengl/qopengltextureblitter.cpp b/src/gui/opengl/qopengltextureblitter.cpp
index 9e611a160d..18ff0c4acf 100644
--- a/src/gui/opengl/qopengltextureblitter.cpp
+++ b/src/gui/opengl/qopengltextureblitter.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopengltextureblitter_p.h b/src/gui/opengl/qopengltextureblitter_p.h
index 65149d2cb0..5d39a3e8fa 100644
--- a/src/gui/opengl/qopengltextureblitter_p.h
+++ b/src/gui/opengl/qopengltextureblitter_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopengltexturecache.cpp b/src/gui/opengl/qopengltexturecache.cpp
index 72df636f5f..688226551d 100644
--- a/src/gui/opengl/qopengltexturecache.cpp
+++ b/src/gui/opengl/qopengltexturecache.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopengltexturecache_p.h b/src/gui/opengl/qopengltexturecache_p.h
index 40f033df43..aedc8e7e47 100644
--- a/src/gui/opengl/qopengltexturecache_p.h
+++ b/src/gui/opengl/qopengltexturecache_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
index c179143173..9a7b1eb21d 100644
--- a/src/gui/opengl/qopengltextureglyphcache.cpp
+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -175,6 +181,94 @@ void QOpenGLTextureGlyphCache::setupVertexAttribs()
     m_buffer.release();
 }
 
+static void load_glyph_image_to_texture(QOpenGLContext *ctx,
+                                        QImage &img,
+                                        GLuint texture,
+                                        int tx, int ty)
+{
+    QOpenGLFunctions *funcs = ctx->functions();
+
+    const int imgWidth = img.width();
+    const int imgHeight = img.height();
+
+    if (img.format() == QImage::Format_Mono) {
+        img = img.convertToFormat(QImage::Format_Grayscale8);
+    } else if (img.depth() == 32) {
+        if (img.format() == QImage::Format_RGB32
+            // We need to make the alpha component equal to the average of the RGB values.
+            // This is needed when drawing sub-pixel antialiased text on translucent targets.
+#if Q_BYTE_ORDER == Q_BIG_ENDIAN
+            || img.format() == QImage::Format_ARGB32_Premultiplied
+#else
+            || (img.format() == QImage::Format_ARGB32_Premultiplied
+                && ctx->isOpenGLES())
+#endif
+            ) {
+            for (int y = 0; y < imgHeight; ++y) {
+                QRgb *src = (QRgb *) img.scanLine(y);
+                for (int x = 0; x < imgWidth; ++x) {
+                    int r = qRed(src[x]);
+                    int g = qGreen(src[x]);
+                    int b = qBlue(src[x]);
+                    int avg;
+                    if (img.format() == QImage::Format_RGB32)
+                        avg = (r + g + b + 1) / 3; // "+1" for rounding.
+                    else // Format_ARGB_Premultiplied
+                        avg = qAlpha(src[x]);
+
+                    src[x] = qRgba(r, g, b, avg);
+                    // swizzle the bits to accommodate for the GL_RGBA upload.
+#if Q_BYTE_ORDER != Q_BIG_ENDIAN
+                    if (ctx->isOpenGLES())
+#endif
+                        src[x] = ARGB2RGBA(src[x]);
+                }
+            }
+        }
+    }
+
+    funcs->glBindTexture(GL_TEXTURE_2D, texture);
+    if (img.depth() == 32) {
+#ifdef QT_OPENGL_ES_2
+        GLenum fmt = GL_RGBA;
+#else
+        GLenum fmt = ctx->isOpenGLES() ? GL_RGBA : GL_BGRA;
+#endif // QT_OPENGL_ES_2
+
+#if Q_BYTE_ORDER == Q_BIG_ENDIAN
+        fmt = GL_RGBA;
+#endif
+        funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, tx, ty, imgWidth, imgHeight, fmt, GL_UNSIGNED_BYTE, img.constBits());
+    } else {
+        // The scanlines in image are 32-bit aligned, even for mono or 8-bit formats. This
+        // is good because it matches the default of 4 bytes for GL_UNPACK_ALIGNMENT.
+#if !defined(QT_OPENGL_ES_2)
+        const GLenum format = isCoreProfile() ? GL_RED : GL_ALPHA;
+#else
+        const GLenum format = GL_ALPHA;
+#endif
+        funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, tx, ty, imgWidth, imgHeight, format, GL_UNSIGNED_BYTE, img.constBits());
+    }
+}
+
+static void load_glyph_image_region_to_texture(QOpenGLContext *ctx,
+                                               const QImage &srcImg,
+                                               int x, int y,
+                                               int w, int h,
+                                               GLuint texture,
+                                               int tx, int ty)
+{
+    Q_ASSERT(x + w <= srcImg.width() && y + h <= srcImg.height());
+
+    QImage img;
+    if (x != 0 || y != 0 || w != srcImg.width() || h != srcImg.height())
+        img = srcImg.copy(x, y, w, h);
+    else
+        img = srcImg;
+
+    load_glyph_image_to_texture(ctx, img, texture, tx, ty);
+}
+
 void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
 {
     QOpenGLContext *ctx = QOpenGLContext::currentContext();
@@ -201,9 +295,8 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
 
     if (ctx->d_func()->workaround_brokenFBOReadBack) {
         QImageTextureGlyphCache::resizeTextureData(width, height);
-        Q_ASSERT(image().depth() == 8);
-        funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, oldHeight, GL_ALPHA, GL_UNSIGNED_BYTE, image().constBits());
-        funcs->glDeleteTextures(1, &oldTexture);
+        load_glyph_image_region_to_texture(ctx, image(), 0, 0, qMin(oldWidth, width), qMin(oldHeight, height),
+                                           m_textureResource->m_texture, 0, 0);
         return;
     }
 
@@ -330,88 +423,14 @@ void QOpenGLTextureGlyphCache::fillTexture(const Coord &c, glyph_t glyph, QFixed
         return;
     }
 
-    QOpenGLFunctions *funcs = ctx->functions();
     if (ctx->d_func()->workaround_brokenFBOReadBack) {
         QImageTextureGlyphCache::fillTexture(c, glyph, subPixelPosition);
-
-        funcs->glBindTexture(GL_TEXTURE_2D, m_textureResource->m_texture);
-        const QImage &texture = image();
-        const uchar *bits = texture.constBits();
-        bits += c.y * texture.bytesPerLine() + c.x;
-        for (int i=0; i<c.h; ++i) {
-            funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y + i, c.w, 1, GL_ALPHA, GL_UNSIGNED_BYTE, bits);
-            bits += texture.bytesPerLine();
-        }
+        load_glyph_image_region_to_texture(ctx, image(), c.x, c.y, c.w, c.h, m_textureResource->m_texture, c.x, c.y);
         return;
     }
 
     QImage mask = textureMapForGlyph(glyph, subPixelPosition);
-    const int maskWidth = mask.width();
-    const int maskHeight = mask.height();
-
-    if (mask.format() == QImage::Format_Mono) {
-        mask = mask.convertToFormat(QImage::Format_Indexed8);
-        for (int y = 0; y < maskHeight; ++y) {
-            uchar *src = (uchar *) mask.scanLine(y);
-            for (int x = 0; x < maskWidth; ++x)
-                src[x] = -src[x]; // convert 0 and 1 into 0 and 255
-        }
-    } else if (mask.depth() == 32) {
-        if (mask.format() == QImage::Format_RGB32
-            // We need to make the alpha component equal to the average of the RGB values.
-            // This is needed when drawing sub-pixel antialiased text on translucent targets.
-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
-            || mask.format() == QImage::Format_ARGB32_Premultiplied
-#else
-            || (mask.format() == QImage::Format_ARGB32_Premultiplied
-                && ctx->isOpenGLES())
-#endif
-            ) {
-            for (int y = 0; y < maskHeight; ++y) {
-                QRgb *src = (QRgb *) mask.scanLine(y);
-                for (int x = 0; x < maskWidth; ++x) {
-                    int r = qRed(src[x]);
-                    int g = qGreen(src[x]);
-                    int b = qBlue(src[x]);
-                    int avg;
-                    if (mask.format() == QImage::Format_RGB32)
-                        avg = (r + g + b + 1) / 3; // "+1" for rounding.
-                    else // Format_ARGB_Premultiplied
-                        avg = qAlpha(src[x]);
-
-                    src[x] = qRgba(r, g, b, avg);
-                    // swizzle the bits to accommodate for the GL_RGBA upload.
-#if Q_BYTE_ORDER != Q_BIG_ENDIAN
-                    if (ctx->isOpenGLES())
-#endif
-                        src[x] = ARGB2RGBA(src[x]);
-                }
-            }
-        }
-    }
-
-    funcs->glBindTexture(GL_TEXTURE_2D, m_textureResource->m_texture);
-    if (mask.depth() == 32) {
-#ifdef QT_OPENGL_ES_2
-        GLenum fmt = GL_RGBA;
-#else
-        GLenum fmt = ctx->isOpenGLES() ? GL_RGBA : GL_BGRA;
-#endif // QT_OPENGL_ES_2
-
-#if Q_BYTE_ORDER == Q_BIG_ENDIAN
-        fmt = GL_RGBA;
-#endif
-        funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y, maskWidth, maskHeight, fmt, GL_UNSIGNED_BYTE, mask.bits());
-    } else {
-        // The scanlines in mask are 32-bit aligned, even for mono or 8-bit formats. This
-        // is good because it matches the default of 4 bytes for GL_UNPACK_ALIGNMENT.
-#if !defined(QT_OPENGL_ES_2)
-        const GLenum format = isCoreProfile() ? GL_RED : GL_ALPHA;
-#else
-        const GLenum format = GL_ALPHA;
-#endif
-        funcs->glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y, maskWidth, maskHeight, format, GL_UNSIGNED_BYTE, mask.bits());
-    }
+    load_glyph_image_to_texture(ctx, mask, m_textureResource->m_texture, c.x, c.y);
 }
 
 int QOpenGLTextureGlyphCache::glyphPadding() const
diff --git a/src/gui/opengl/qopengltextureglyphcache_p.h b/src/gui/opengl/qopengltextureglyphcache_p.h
index 47fdd70203..6cd7667d78 100644
--- a/src/gui/opengl/qopengltextureglyphcache_p.h
+++ b/src/gui/opengl/qopengltextureglyphcache_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopengltexturehelper.cpp b/src/gui/opengl/qopengltexturehelper.cpp
index df2945a479..be88946e90 100644
--- a/src/gui/opengl/qopengltexturehelper.cpp
+++ b/src/gui/opengl/qopengltexturehelper.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -40,6 +46,7 @@ QT_BEGIN_NAMESPACE
 
 QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context)
 {
+    functions = context->functions();
     // Resolve EXT_direct_state_access entry points if present.
 
     // However, disable it on some systems where DSA is known to be unreliable.
@@ -51,28 +58,28 @@ QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context)
 
     if (allowDSA && !context->isOpenGLES()
         && context->hasExtension(QByteArrayLiteral("GL_EXT_direct_state_access"))) {
-        TextureParameteriEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , GLint )>(context->getProcAddress(QByteArrayLiteral("glTextureParameteriEXT")));
-        TextureParameterivEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , const GLint *)>(context->getProcAddress(QByteArrayLiteral("glTextureParameterivEXT")));
-        TextureParameterfEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , GLfloat )>(context->getProcAddress(QByteArrayLiteral("glTextureParameterfEXT")));
-        TextureParameterfvEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , const GLfloat *)>(context->getProcAddress(QByteArrayLiteral("glTextureParameterfvEXT")));
-        GenerateTextureMipmapEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress(QByteArrayLiteral("glGenerateTextureMipmapEXT")));
-        TextureStorage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei )>(context->getProcAddress(QByteArrayLiteral("glTextureStorage3DEXT")));
-        TextureStorage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei )>(context->getProcAddress(QByteArrayLiteral("glTextureStorage2DEXT")));
-        TextureStorage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei )>(context->getProcAddress(QByteArrayLiteral("glTextureStorage1DEXT")));
-        TextureStorage3DMultisampleEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress(QByteArrayLiteral("glTextureStorage3DMultisampleEXT")));
-        TextureStorage2DMultisampleEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLboolean )>(context->getProcAddress(QByteArrayLiteral("glTextureStorage2DMultisampleEXT")));
-        TextureImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glTextureImage3DEXT")));
-        TextureImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glTextureImage2DEXT")));
-        TextureImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glTextureImage1DEXT")));
-        TextureSubImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glTextureSubImage3DEXT")));
-        TextureSubImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glTextureSubImage2DEXT")));
-        TextureSubImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glTextureSubImage1DEXT")));
-        CompressedTextureSubImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glCompressedTextureSubImage1DEXT")));
-        CompressedTextureSubImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glCompressedTextureSubImage2DEXT")));
-        CompressedTextureSubImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glCompressedTextureSubImage3DEXT")));
-        CompressedTextureImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glCompressedTextureImage1DEXT")));
-        CompressedTextureImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glCompressedTextureImage2DEXT")));
-        CompressedTextureImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glCompressedTextureImage3DEXT")));
+        TextureParameteriEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , GLint )>(context->getProcAddress("glTextureParameteriEXT"));
+        TextureParameterivEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , const GLint *)>(context->getProcAddress("glTextureParameterivEXT"));
+        TextureParameterfEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , GLfloat )>(context->getProcAddress("glTextureParameterfEXT"));
+        TextureParameterfvEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , const GLfloat *)>(context->getProcAddress("glTextureParameterfvEXT"));
+        GenerateTextureMipmapEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress("glGenerateTextureMipmapEXT"));
+        TextureStorage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei )>(context->getProcAddress("glTextureStorage3DEXT"));
+        TextureStorage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei )>(context->getProcAddress("glTextureStorage2DEXT"));
+        TextureStorage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei )>(context->getProcAddress("glTextureStorage1DEXT"));
+        TextureStorage3DMultisampleEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTextureStorage3DMultisampleEXT"));
+        TextureStorage2DMultisampleEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTextureStorage2DMultisampleEXT"));
+        TextureImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureImage3DEXT"));
+        TextureImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureImage2DEXT"));
+        TextureImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureImage1DEXT"));
+        TextureSubImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureSubImage3DEXT"));
+        TextureSubImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureSubImage2DEXT"));
+        TextureSubImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTextureSubImage1DEXT"));
+        CompressedTextureSubImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureSubImage1DEXT"));
+        CompressedTextureSubImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureSubImage2DEXT"));
+        CompressedTextureSubImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureSubImage3DEXT"));
+        CompressedTextureImage1DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureImage1DEXT"));
+        CompressedTextureImage2DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureImage2DEXT"));
+        CompressedTextureImage3DEXT = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLenum , GLsizei , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTextureImage3DEXT"));
 
         // Use the real DSA functions
         TextureParameteri = &QOpenGLTextureHelper::dsa_TextureParameteri;
@@ -126,8 +133,8 @@ QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context)
     // Some DSA functions are part of NV_texture_multisample instead
     if (!context->isOpenGLES()
         && context->hasExtension(QByteArrayLiteral("GL_NV_texture_multisample"))) {
-        TextureImage3DMultisampleNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLint , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress(QByteArrayLiteral("glTextureImage3DMultisampleNV")));
-        TextureImage2DMultisampleNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLint , GLsizei , GLsizei , GLboolean )>(context->getProcAddress(QByteArrayLiteral("glTextureImage2DMultisampleNV")));
+        TextureImage3DMultisampleNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLint , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTextureImage3DMultisampleNV"));
+        TextureImage2DMultisampleNV = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLint , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTextureImage2DMultisampleNV"));
 
         TextureImage3DMultisample = &QOpenGLTextureHelper::dsa_TextureImage3DMultisample;
         TextureImage2DMultisample = &QOpenGLTextureHelper::dsa_TextureImage2DMultisample;
@@ -136,63 +143,15 @@ QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context)
         TextureImage2DMultisample = &QOpenGLTextureHelper::qt_TextureImage2DMultisample;
     }
 
-    // wglGetProcAddress should not be used to (and indeed will not) load OpenGL <= 1.1 functions.
-    // Hence, we resolve them "the hard way"
-
-#if defined(Q_OS_WIN) && !defined(QT_OPENGL_ES_2)
-    HMODULE handle = static_cast<HMODULE>(QOpenGLContext::openGLModuleHandle());
-    if (!handle)
-        handle = GetModuleHandleA("opengl32.dll");
-
-    // OpenGL 1.0
-    GetIntegerv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint *)>(GetProcAddress(handle, QByteArrayLiteral("glGetIntegerv")));
-    GetBooleanv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLboolean *)>(GetProcAddress(handle, QByteArrayLiteral("glGetBooleanv")));
-    PixelStorei = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint )>(GetProcAddress(handle, QByteArrayLiteral("glPixelStorei")));
-    GetTexLevelParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLint *)>(GetProcAddress(handle, QByteArrayLiteral("glGetTexLevelParameteriv")));
-    GetTexLevelParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLfloat *)>(GetProcAddress(handle, QByteArrayLiteral("glGetTexLevelParameterfv")));
-    GetTexParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(GetProcAddress(handle, QByteArrayLiteral("glGetTexParameteriv")));
-    GetTexParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(GetProcAddress(handle, QByteArrayLiteral("glGetTexParameterfv")));
-    GetTexImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLenum , GLvoid *)>(GetProcAddress(handle, QByteArrayLiteral("glGetTexImage")));
-    TexImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(GetProcAddress(handle, QByteArrayLiteral("glTexImage2D")));
-    TexImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(GetProcAddress(handle, QByteArrayLiteral("glTexImage1D")));
-    TexParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(GetProcAddress(handle, QByteArrayLiteral("glTexParameteriv")));
-    TexParameteri = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint )>(GetProcAddress(handle, QByteArrayLiteral("glTexParameteri")));
-    TexParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(GetProcAddress(handle, QByteArrayLiteral("glTexParameterfv")));
-    TexParameterf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat )>(GetProcAddress(handle, QByteArrayLiteral("glTexParameterf")));
-
-    // OpenGL 1.1
-    GenTextures = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(GetProcAddress(handle, QByteArrayLiteral("glGenTextures")));
-    DeleteTextures = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(GetProcAddress(handle, QByteArrayLiteral("glDeleteTextures")));
-    BindTexture = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(GetProcAddress(handle, QByteArrayLiteral("glBindTexture")));
-    TexSubImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(GetProcAddress(handle, QByteArrayLiteral("glTexSubImage2D")));
-    TexSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *)>(GetProcAddress(handle, QByteArrayLiteral("glTexSubImage1D")));
-
-#elif defined(QT_OPENGL_ES_2)
+#if defined(QT_OPENGL_ES_2)
     // Here we are targeting OpenGL ES 2.0+ only. This is likely using EGL, where,
     // similarly to WGL, non-extension functions (i.e. any function that is part of the
     // GLES spec) *may* not be queried via eglGetProcAddress.
 
     // OpenGL 1.0
-    GetIntegerv = ::glGetIntegerv;
-    GetBooleanv = ::glGetBooleanv;
-    PixelStorei = ::glPixelStorei;
-    GetTexLevelParameteriv = 0;
-    GetTexLevelParameterfv = 0;
-    GetTexParameteriv = ::glGetTexParameteriv;
-    GetTexParameterfv = ::glGetTexParameterfv;
-    GetTexImage = 0;
-    TexImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(::glTexImage2D);
     TexImage1D = 0;
-    TexParameteriv = ::glTexParameteriv;
-    TexParameteri = ::glTexParameteri;
-    TexParameterfv = ::glTexParameterfv;
-    TexParameterf = ::glTexParameterf;
 
     // OpenGL 1.1
-    GenTextures = ::glGenTextures;
-    DeleteTextures = ::glDeleteTextures;
-    BindTexture = ::glBindTexture;
-    TexSubImage2D = ::glTexSubImage2D;
     TexSubImage1D = 0;
 
     // OpenGL 1.3
@@ -214,9 +173,9 @@ QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context)
     QOpenGLContext *ctx = QOpenGLContext::currentContext();
     if (ctx->format().majorVersion() >= 3) {
         // OpenGL ES 3.0+ has immutable storage for 2D and 3D at least.
-        QOpenGLES3Helper *es3 = static_cast<QOpenGLExtensions *>(ctx->functions())->gles3Helper();
-        TexStorage3D = es3->TexStorage3D;
-        TexStorage2D = es3->TexStorage2D;
+        QOpenGLExtraFunctionsPrivate *extra = static_cast<QOpenGLExtensions *>(context->extraFunctions())->d();
+        TexStorage3D = extra->f.TexStorage3D;
+        TexStorage2D = extra->f.TexStorage2D;
     } else {
         TexStorage3D = 0;
         TexStorage2D = 0;
@@ -229,83 +188,63 @@ QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context)
     TexBufferRange = 0;
     TextureView = 0;
 
-#else
-
-    // OpenGL 1.0
-    GetIntegerv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint *)>(context->getProcAddress(QByteArrayLiteral("glGetIntegerv")));
-    GetBooleanv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLboolean *)>(context->getProcAddress(QByteArrayLiteral("glGetBooleanv")));
-    PixelStorei = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint )>(context->getProcAddress(QByteArrayLiteral("glPixelStorei")));
-    GetTexLevelParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLint *)>(context->getProcAddress(QByteArrayLiteral("glGetTexLevelParameteriv")));
-    GetTexLevelParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLfloat *)>(context->getProcAddress(QByteArrayLiteral("glGetTexLevelParameterfv")));
-    GetTexParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress(QByteArrayLiteral("glGetTexParameteriv")));
-    GetTexParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(context->getProcAddress(QByteArrayLiteral("glGetTexParameterfv")));
-    GetTexImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLenum , GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glGetTexImage")));
-    TexImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glTexImage2D")));
-    TexImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glTexImage1D")));
-    TexParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(context->getProcAddress(QByteArrayLiteral("glTexParameteriv")));
-    TexParameteri = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint )>(context->getProcAddress(QByteArrayLiteral("glTexParameteri")));
-    TexParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(context->getProcAddress(QByteArrayLiteral("glTexParameterfv")));
-    TexParameterf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat )>(context->getProcAddress(QByteArrayLiteral("glTexParameterf")));
-
-    // OpenGL 1.1
-    GenTextures = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress(QByteArrayLiteral("glGenTextures")));
-    DeleteTextures = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(context->getProcAddress(QByteArrayLiteral("glDeleteTextures")));
-    BindTexture = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress(QByteArrayLiteral("glBindTexture")));
-    TexSubImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glTexSubImage2D")));
-    TexSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glTexSubImage1D")));
 #endif
 
     if (context->isOpenGLES() && context->hasExtension(QByteArrayLiteral("GL_OES_texture_3D"))) {
-        TexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid*)>(context->getProcAddress(QByteArrayLiteral("glTexImage3DOES")));
-        TexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid*)>(context->getProcAddress(QByteArrayLiteral("glTexSubImage3DOES")));
-        CompressedTexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid*)>(context->getProcAddress(QByteArrayLiteral("glCompressedTexImage3DOES")));
-        CompressedTexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid*)>(context->getProcAddress(QByteArrayLiteral("glCompressedTexSubImage3DOES")));
+        TexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid*)>(context->getProcAddress("glTexImage3DOES"));
+        TexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid*)>(context->getProcAddress("glTexSubImage3DOES"));
+        CompressedTexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid*)>(context->getProcAddress("glCompressedTexImage3DOES"));
+        CompressedTexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid*)>(context->getProcAddress("glCompressedTexSubImage3DOES"));
     } else {
         QOpenGLContext *ctx = QOpenGLContext::currentContext();
         if (ctx->isOpenGLES() && ctx->format().majorVersion() >= 3) {
             // OpenGL ES 3.0+ has glTexImage3D.
-            QOpenGLES3Helper *es3 = static_cast<QOpenGLExtensions *>(ctx->functions())->gles3Helper();
-            TexImage3D = es3->TexImage3D;
-            TexSubImage3D = es3->TexSubImage3D;
-            CompressedTexImage3D = es3->CompressedTexImage3D;
-            CompressedTexSubImage3D = es3->CompressedTexSubImage3D;
+            QOpenGLExtraFunctionsPrivate *extra = static_cast<QOpenGLExtensions *>(context->extraFunctions())->d();
+            TexImage3D = extra->f.TexImage3D;
+            TexSubImage3D = extra->f.TexSubImage3D;
+            CompressedTexImage3D = extra->f.CompressedTexImage3D;
+            CompressedTexSubImage3D = extra->f.CompressedTexSubImage3D;
         } else {
             // OpenGL 1.2
-            TexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glTexImage3D")));
-            TexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glTexSubImage3D")));
+            TexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexImage3D"));
+            TexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexSubImage3D"));
 
             // OpenGL 1.3
-            CompressedTexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glCompressedTexImage3D")));
-            CompressedTexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glCompressedTexSubImage3D")));
+            CompressedTexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexImage3D"));
+            CompressedTexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexSubImage3D"));
         }
     }
 
 #ifndef QT_OPENGL_ES_2
+    // OpenGL 1.0 and 1.1
+    TexImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexImage1D"));
+    TexSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexSubImage1D"));\
+
     // OpenGL 1.3
-    GetCompressedTexImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glGetCompressedTexImage")));
-    CompressedTexSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glCompressedTexSubImage1D")));
-    CompressedTexSubImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glCompressedTexSubImage2D")));
-    CompressedTexImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glCompressedTexImage1D")));
-    CompressedTexImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress(QByteArrayLiteral("glCompressedTexImage2D")));
-    ActiveTexture = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress(QByteArrayLiteral("glActiveTexture")));
+    GetCompressedTexImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLvoid *)>(context->getProcAddress("glGetCompressedTexImage"));
+    CompressedTexSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexSubImage1D"));
+    CompressedTexSubImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexSubImage2D"));
+    CompressedTexImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexImage1D"));
+    CompressedTexImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexImage2D"));
+    ActiveTexture = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glActiveTexture"));
 
     // OpenGL 3.0
-    GenerateMipmap = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress(QByteArrayLiteral("glGenerateMipmap")));
+    GenerateMipmap = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glGenerateMipmap"));
 
     // OpenGL 3.2
-    TexImage3DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLint , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress(QByteArrayLiteral("glTexImage3DMultisample")));
-    TexImage2DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLint , GLsizei , GLsizei , GLboolean )>(context->getProcAddress(QByteArrayLiteral("glTexImage2DMultisample")));
+    TexImage3DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLint , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexImage3DMultisample"));
+    TexImage2DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLint , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexImage2DMultisample"));
 
     // OpenGL 4.2
-    TexStorage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei )>(context->getProcAddress(QByteArrayLiteral("glTexStorage3D")));
-    TexStorage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei )>(context->getProcAddress(QByteArrayLiteral("glTexStorage2D")));
-    TexStorage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei )>(context->getProcAddress(QByteArrayLiteral("glTexStorage1D")));
+    TexStorage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei )>(context->getProcAddress("glTexStorage3D"));
+    TexStorage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei )>(context->getProcAddress("glTexStorage2D"));
+    TexStorage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei )>(context->getProcAddress("glTexStorage1D"));
 
     // OpenGL 4.3
-    TexStorage3DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress(QByteArrayLiteral("glTexStorage3DMultisample")));
-    TexStorage2DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLboolean )>(context->getProcAddress(QByteArrayLiteral("glTexStorage2DMultisample")));
-    TexBufferRange = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint , GLintptr , GLsizeiptr )>(context->getProcAddress(QByteArrayLiteral("glTexBufferRange")));
-    TextureView = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLenum , GLuint , GLuint , GLuint , GLuint )>(context->getProcAddress(QByteArrayLiteral("glTextureView")));
+    TexStorage3DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexStorage3DMultisample"));
+    TexStorage2DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexStorage2DMultisample"));
+    TexBufferRange = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint , GLintptr , GLsizeiptr )>(context->getProcAddress("glTexBufferRange"));
+    TextureView = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLenum , GLuint , GLuint , GLuint , GLuint )>(context->getProcAddress("glTextureView"));
 #endif
 }
 
@@ -458,8 +397,8 @@ namespace {
 class TextureBinder
 {
 public:
-    TextureBinder(QOpenGLTextureHelper *textureFunctions, GLuint texture, GLenum target, GLenum bindingTarget)
-    : m_textureFunctions(textureFunctions)
+    TextureBinder(QOpenGLFunctions *functions, GLuint texture, GLenum target, GLenum bindingTarget)
+    : m_functions(functions)
     {
         // For cubemaps we can't use the standard DSA emulation as it is illegal to
         // try to bind a texture to one of the cubemap face targets. So we force the
@@ -480,17 +419,17 @@ public:
             break;
         }
 
-        m_textureFunctions->glGetIntegerv(bindingTarget, &m_oldTexture);
-        m_textureFunctions->glBindTexture(m_target, texture);
+        m_functions->glGetIntegerv(bindingTarget, &m_oldTexture);
+        m_functions->glBindTexture(m_target, texture);
     }
 
     ~TextureBinder()
     {
-        m_textureFunctions->glBindTexture(m_target, m_oldTexture);
+        m_functions->glBindTexture(m_target, m_oldTexture);
     }
 
 private:
-    QOpenGLTextureHelper *m_textureFunctions;
+    QOpenGLFunctions *m_functions;
     GLenum m_target;
     GLint m_oldTexture;
 };
@@ -499,145 +438,145 @@ private:
 
 void QOpenGLTextureHelper::qt_TextureParameteri(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLint param)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
-    glTexParameteri(target, pname, param);
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    functions->glTexParameteri(target, pname, param);
 }
 
 void QOpenGLTextureHelper::qt_TextureParameteriv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLint *params)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
-    glTexParameteriv(target, pname, params);
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    functions->glTexParameteriv(target, pname, params);
 }
 
 void QOpenGLTextureHelper::qt_TextureParameterf(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, GLfloat param)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
-    glTexParameterf(target, pname, param);
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    functions->glTexParameterf(target, pname, param);
 }
 
 void QOpenGLTextureHelper::qt_TextureParameterfv(GLuint texture, GLenum target, GLenum bindingTarget, GLenum pname, const GLfloat *params)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
-    glTexParameterfv(target, pname, params);
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    functions->glTexParameterfv(target, pname, params);
 }
 
 void QOpenGLTextureHelper::qt_GenerateTextureMipmap(GLuint texture, GLenum target, GLenum bindingTarget)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
-    glGenerateMipmap(target);
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    functions->glGenerateMipmap(target);
 }
 
 void QOpenGLTextureHelper::qt_TextureStorage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glTexStorage3D(target, levels, internalFormat, width, height, depth);
 }
 
 void QOpenGLTextureHelper::qt_TextureStorage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glTexStorage2D(target, levels, internalFormat, width, height);
 }
 
 void QOpenGLTextureHelper::qt_TextureStorage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei levels, GLenum internalFormat, GLsizei width)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glTexStorage1D(target, levels, internalFormat, width);
 }
 
 void QOpenGLTextureHelper::qt_TextureStorage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glTexStorage3DMultisample(target, samples, internalFormat, width, height, depth, fixedSampleLocations);
 }
 
 void QOpenGLTextureHelper::qt_TextureStorage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLenum internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glTexStorage2DMultisample(target, samples, internalFormat, width, height, fixedSampleLocations);
 }
 
 void QOpenGLTextureHelper::qt_TextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glTexImage3D(target, level, internalFormat, width, height, depth, border, format, type, pixels);
 }
 
 void QOpenGLTextureHelper::qt_TextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
-    glTexImage2D(target, level, internalFormat, width, height, border, format, type, pixels);
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    functions->glTexImage2D(target, level, internalFormat, width, height, border, format, type, pixels);
 }
 
 void QOpenGLTextureHelper::qt_TextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glTexImage1D(target, level, internalFormat, width, border, format, type, pixels);
 }
 
 void QOpenGLTextureHelper::qt_TextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
 }
 
 void QOpenGLTextureHelper::qt_TextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
-    glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
+    TextureBinder binder(functions, texture, target, bindingTarget);
+    functions->glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
 }
 
 void QOpenGLTextureHelper::qt_TextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glTexSubImage1D(target, level, xoffset, width, format, type, pixels);
 }
 
 void QOpenGLTextureHelper::qt_TextureImage3DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glTexImage3DMultisample(target, samples, internalFormat, width, height, depth, fixedSampleLocations);
 }
 
 void QOpenGLTextureHelper::qt_TextureImage2DMultisample(GLuint texture, GLenum target, GLenum bindingTarget, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glTexImage2DMultisample(target, samples, internalFormat, width, height, fixedSampleLocations);
 }
 
 void QOpenGLTextureHelper::qt_CompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glCompressedTexSubImage1D(target, level, xoffset, width, format, imageSize, bits);
 }
 
 void QOpenGLTextureHelper::qt_CompressedTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, bits);
 }
 
 void QOpenGLTextureHelper::qt_CompressedTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glCompressedTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, bits);
 }
 
 void QOpenGLTextureHelper::qt_CompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glCompressedTexImage1D(target, level, internalFormat, width, border, imageSize, bits);
 }
 
 void QOpenGLTextureHelper::qt_CompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glCompressedTexImage2D(target, level, internalFormat, width, height, border, imageSize, bits);
 }
 
 void QOpenGLTextureHelper::qt_CompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits)
 {
-    TextureBinder binder(this, texture, target, bindingTarget);
+    TextureBinder binder(functions, texture, target, bindingTarget);
     glCompressedTexImage3D(target, level, internalFormat, width, height, depth, border, imageSize, bits);
 }
 
diff --git a/src/gui/opengl/qopengltexturehelper_p.h b/src/gui/opengl/qopengltexturehelper_p.h
index fa055cd28a..6b26527269 100644
--- a/src/gui/opengl/qopengltexturehelper_p.h
+++ b/src/gui/opengl/qopengltexturehelper_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -52,6 +58,7 @@
 #include "qopengl.h"
 #include "qopenglpixeltransferoptions.h"
 #include "qopengltexture.h"
+#include "qopenglfunctions.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -474,54 +481,8 @@ private:
 
 public:
     // Raw OpenGL functions, resolved and used by our DSA-like static functions if no EXT_direct_state_access is available
-    // OpenGL 1.0
-    inline void glGetIntegerv(GLenum pname, GLint *params)
-    {
-        GetIntegerv(pname, params);
-    }
-
-    inline void glGetBooleanv(GLenum pname, GLboolean *params)
-    {
-        GetBooleanv(pname, params);
-    }
-
-    inline void glPixelStorei(GLenum pname, GLint param)
-    {
-        PixelStorei(pname, param);
-    }
-
-    inline void glGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
-    {
-        GetTexLevelParameteriv(target, level, pname, params);
-    }
-
-    inline void glGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params)
-    {
-        GetTexLevelParameterfv(target, level, pname, params);
-    }
-
-    inline void glGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
-    {
-        GetTexParameteriv(target, pname, params);
-    }
-
-    inline void glGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
-    {
-        GetTexParameterfv(target, pname, params);
-    }
-
-    inline void glGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
-    {
-        GetTexImage(target, level, format, type, pixels);
-    }
-
-    inline void glTexImage2D(GLenum target, GLint level, GLint internalFormat,
-                             GLsizei width, GLsizei height, GLint border,
-                             GLenum format, GLenum type, const GLvoid *pixels)
-    {
-        TexImage2D(target, level, internalFormat, width, height, border, format, type, pixels);
-    }
 
+    // OpenGL 1.0
     inline void glTexImage1D(GLenum target, GLint level, GLint internalFormat,
                              GLsizei width, GLint border,
                              GLenum format, GLenum type, const GLvoid *pixels)
@@ -529,48 +490,7 @@ public:
         TexImage1D(target, level, internalFormat, width, border, format, type, pixels);
     }
 
-    inline void glTexParameteriv(GLenum target, GLenum pname, const GLint *params)
-    {
-        TexParameteriv(target, pname, params);
-    }
-
-    inline void glTexParameteri(GLenum target, GLenum pname, GLint param)
-    {
-        TexParameteri(target, pname, param);
-    }
-
-    inline void glTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
-    {
-        TexParameterfv(target, pname, params);
-    }
-
-    inline void glTexParameterf(GLenum target, GLenum pname, GLfloat param)
-    {
-        TexParameterf(target, pname, param);
-    }
-
     // OpenGL 1.1
-    inline void glGenTextures(GLsizei n, GLuint *textures)
-    {
-        GenTextures(n, textures);
-    }
-
-    inline void glDeleteTextures(GLsizei n, const GLuint *textures)
-    {
-        DeleteTextures(n, textures);
-    }
-
-    inline void glBindTexture(GLenum target, GLuint texture)
-    {
-        BindTexture(target, texture);
-    }
-
-    inline void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
-                                GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
-    {
-        TexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels);
-    }
-
     inline void glTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width,
                                 GLenum format, GLenum type, const GLvoid *pixels)
     {
@@ -706,23 +626,23 @@ public:
     {
         QOpenGLPixelTransferOptions options;
         int val = 0;
-        glGetIntegerv(GL_UNPACK_ALIGNMENT, &val);
+        functions->glGetIntegerv(GL_UNPACK_ALIGNMENT, &val);
         options.setAlignment(val);
 #if !defined(QT_OPENGL_ES_2)
-        glGetIntegerv(GL_UNPACK_SKIP_IMAGES, &val);
+        functions->glGetIntegerv(GL_UNPACK_SKIP_IMAGES, &val);
         options.setSkipImages(val);
-        glGetIntegerv(GL_UNPACK_SKIP_ROWS, &val);
+        functions->glGetIntegerv(GL_UNPACK_SKIP_ROWS, &val);
         options.setSkipRows(val);
-        glGetIntegerv(GL_UNPACK_SKIP_PIXELS, &val);
+        functions->glGetIntegerv(GL_UNPACK_SKIP_PIXELS, &val);
         options.setSkipPixels(val);
-        glGetIntegerv(GL_UNPACK_IMAGE_HEIGHT, &val);
+        functions->glGetIntegerv(GL_UNPACK_IMAGE_HEIGHT, &val);
         options.setImageHeight(val);
-        glGetIntegerv(GL_UNPACK_ROW_LENGTH, &val);
+        functions->glGetIntegerv(GL_UNPACK_ROW_LENGTH, &val);
         options.setRowLength(val);
         GLboolean b = GL_FALSE;
-        glGetBooleanv(GL_UNPACK_LSB_FIRST, &b);
+        functions->glGetBooleanv(GL_UNPACK_LSB_FIRST, &b);
         options.setLeastSignificantByteFirst(b);
-        glGetBooleanv(GL_UNPACK_SWAP_BYTES, &b);
+        functions->glGetBooleanv(GL_UNPACK_SWAP_BYTES, &b);
         options.setSwapBytesEnabled(b);
 #endif
         return options;
@@ -730,18 +650,19 @@ public:
 
     inline void setPixelUploadOptions(const QOpenGLPixelTransferOptions &options)
     {
-        glPixelStorei(GL_UNPACK_ALIGNMENT, options.alignment());
+        functions->glPixelStorei(GL_UNPACK_ALIGNMENT, options.alignment());
 #if !defined(QT_OPENGL_ES_2)
-        glPixelStorei(GL_UNPACK_SKIP_IMAGES, options.skipImages());
-        glPixelStorei(GL_UNPACK_SKIP_ROWS, options.skipRows());
-        glPixelStorei(GL_UNPACK_SKIP_PIXELS, options.skipPixels());
-        glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, options.imageHeight());
-        glPixelStorei(GL_UNPACK_ROW_LENGTH, options.rowLength());
-        glPixelStorei(GL_UNPACK_LSB_FIRST, options.isLeastSignificantBitFirst());
-        glPixelStorei(GL_UNPACK_SWAP_BYTES, options.isSwapBytesEnabled());
+        functions->glPixelStorei(GL_UNPACK_SKIP_IMAGES, options.skipImages());
+        functions->glPixelStorei(GL_UNPACK_SKIP_ROWS, options.skipRows());
+        functions->glPixelStorei(GL_UNPACK_SKIP_PIXELS, options.skipPixels());
+        functions->glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, options.imageHeight());
+        functions->glPixelStorei(GL_UNPACK_ROW_LENGTH, options.rowLength());
+        functions->glPixelStorei(GL_UNPACK_LSB_FIRST, options.isLeastSignificantBitFirst());
+        functions->glPixelStorei(GL_UNPACK_SWAP_BYTES, options.isSwapBytesEnabled());
 #endif
     }
 
+    QOpenGLFunctions *functions;
 private:
     // Typedefs and pointers to member functions used to switch between EXT_direct_state_access and our own emulated DSA.
     // The argument match the corresponding GL function, but there's an extra "GLenum bindingTarget" which gets used with
@@ -829,26 +750,9 @@ private:
     void (QOPENGLF_APIENTRYP TextureImage2DMultisampleNV)(GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
 
     // OpenGL 1.0
-    GL_APICALL void (QOPENGLF_APIENTRYP GetIntegerv)(GLenum pname, GLint *params);
-    GL_APICALL void (QOPENGLF_APIENTRYP GetBooleanv)(GLenum pname, GLboolean *params);
-    GL_APICALL void (QOPENGLF_APIENTRYP PixelStorei)(GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP GetTexLevelParameteriv)(GLenum target, GLint level, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetTexLevelParameterfv)(GLenum target, GLint level, GLenum pname, GLfloat *params);
-    GL_APICALL void (QOPENGLF_APIENTRYP GetTexParameteriv)(GLenum target, GLenum pname, GLint *params);
-    GL_APICALL void (QOPENGLF_APIENTRYP GetTexParameterfv)(GLenum target, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetTexImage)(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP TexImage2D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
     void (QOPENGLF_APIENTRYP TexImage1D)(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-    GL_APICALL void (QOPENGLF_APIENTRYP TexParameteriv)(GLenum target, GLenum pname, const GLint *params);
-    GL_APICALL void (QOPENGLF_APIENTRYP TexParameteri)(GLenum target, GLenum pname, GLint param);
-    GL_APICALL void (QOPENGLF_APIENTRYP TexParameterfv)(GLenum target, GLenum pname, const GLfloat *params);
-    GL_APICALL void (QOPENGLF_APIENTRYP TexParameterf)(GLenum target, GLenum pname, GLfloat param);
 
     // OpenGL 1.1
-    GL_APICALL void (QOPENGLF_APIENTRYP GenTextures)(GLsizei n, GLuint *textures);
-    GL_APICALL void (QOPENGLF_APIENTRYP DeleteTextures)(GLsizei n, const GLuint *textures);
-    GL_APICALL void (QOPENGLF_APIENTRYP BindTexture)(GLenum target, GLuint texture);
-    GL_APICALL void (QOPENGLF_APIENTRYP TexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
     void (QOPENGLF_APIENTRYP TexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
 
     // OpenGL 1.2
diff --git a/src/gui/opengl/qopengltimerquery.cpp b/src/gui/opengl/qopengltimerquery.cpp
index ec7d4548c4..afd2e7887a 100644
--- a/src/gui/opengl/qopengltimerquery.cpp
+++ b/src/gui/opengl/qopengltimerquery.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopengltimerquery.h b/src/gui/opengl/qopengltimerquery.h
index ad111dc03c..80e52a4c99 100644
--- a/src/gui/opengl/qopengltimerquery.h
+++ b/src/gui/opengl/qopengltimerquery.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglversionfunctions.cpp b/src/gui/opengl/qopenglversionfunctions.cpp
index fda2f84b39..54df2e5734 100644
--- a/src/gui/opengl/qopenglversionfunctions.cpp
+++ b/src/gui/opengl/qopenglversionfunctions.cpp
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -46,25 +53,73 @@
 
 QT_BEGIN_NAMESPACE
 
-QOpenGLVersionFunctionsBackend *QAbstractOpenGLFunctionsPrivate::functionsBackend(QOpenGLContext *context,
-                                                                                  const QOpenGLVersionStatus &v)
+#define QT_OPENGL_COUNT_FUNCTIONS(ret, name, args) +1
+#define QT_OPENGL_FUNCTION_NAMES(ret, name, args) \
+    "gl"#name"\0"
+#define QT_OPENGL_IMPLEMENT(CLASS, FUNCTIONS) \
+void CLASS::init() \
+{ \
+    const char *names = FUNCTIONS(QT_OPENGL_FUNCTION_NAMES); \
+    const char *name = names; \
+    for (int i = 0; i < FUNCTIONS(QT_OPENGL_COUNT_FUNCTIONS); ++i) { \
+        functions[i] = context->getProcAddress(name); \
+        name += strlen(name) + 1; \
+    } \
+}
+
+QOpenGLVersionFunctionsStorage::QOpenGLVersionFunctionsStorage()
+    : backends(0)
 {
-    Q_ASSERT(context);
-    return context->functionsBackend(v);
 }
 
-void QAbstractOpenGLFunctionsPrivate::insertFunctionsBackend(QOpenGLContext *context,
-                                                             const QOpenGLVersionStatus &v,
-                                                             QOpenGLVersionFunctionsBackend *backend)
+QOpenGLVersionFunctionsStorage::~QOpenGLVersionFunctionsStorage()
 {
-    Q_ASSERT(context);
-    context->insertFunctionsBackend(v, backend);
+    if (backends) {
+        for (int i = 0; i < QOpenGLVersionFunctionsBackend::OpenGLVersionBackendCount; ++i) {
+            if (backends[i] && !--backends[i]->refs) {
+                // deleting the base class is ok, as the derived classes don't have a destructor
+                delete backends[i];
+            }
+        }
+        delete[] backends;
+    }
 }
 
-void QAbstractOpenGLFunctionsPrivate::removeFunctionsBackend(QOpenGLContext *context, const QOpenGLVersionStatus &v)
+QOpenGLVersionFunctionsBackend *QOpenGLVersionFunctionsStorage::backend(QOpenGLContext *context, QOpenGLVersionFunctionsBackend::Version v)
+{
+#ifdef QT_OPENGL_ES
+    Q_UNUSED(context);
+    Q_UNUSED(v);
+    return 0;
+#else
+    if (!backends) {
+        backends = new QOpenGLVersionFunctionsBackend *[QOpenGLVersionFunctionsBackend::OpenGLVersionBackendCount];
+        memset(backends, 0, sizeof(QOpenGLVersionFunctionsBackend *)*QOpenGLVersionFunctionsBackend::OpenGLVersionBackendCount);
+    }
+    if (backends[v])
+        return backends[v];
+
+    switch(v) {
+#define VERSION_ENUM(X) QOpenGLVersionFunctionsBackend::OpenGL_##X
+#define CREATE_BACKEND(X) \
+    case VERSION_ENUM(X): \
+        backends[VERSION_ENUM(X)] = new QOpenGLFunctions_##X##Backend(context); \
+        break;
+    QT_OPENGL_VERSIONS(CREATE_BACKEND)
+    case QOpenGLVersionFunctionsBackend::OpenGLVersionBackendCount:
+        Q_UNREACHABLE();
+    }
+    // the storage keeps one ref
+    ++backends[v]->refs;
+    return backends[v];
+#endif
+}
+
+QOpenGLVersionFunctionsBackend *QAbstractOpenGLFunctionsPrivate::functionsBackend(QOpenGLContext *context, QOpenGLVersionFunctionsBackend::Version v)
 {
     Q_ASSERT(context);
-    context->removeFunctionsBackend(v);
+    QOpenGLVersionFunctionsStorage *storage = context->functionsBackendStorage();
+    return storage->backend(context, v);
 }
 
 void QAbstractOpenGLFunctionsPrivate::insertExternalFunctions(QOpenGLContext *context, QAbstractOpenGLFunctions *f)
@@ -252,1853 +307,36 @@ QOpenGLContext *QAbstractOpenGLFunctions::owningContext() const
 
 #if !defined(QT_OPENGL_ES_2)
 
-QOpenGLFunctions_1_0_CoreBackend::QOpenGLFunctions_1_0_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 1.0 core functions
-#if defined(Q_OS_WIN)
-    HMODULE handle = static_cast<HMODULE>(QOpenGLContext::openGLModuleHandle());
-    if (!handle)
-        handle = GetModuleHandleA("opengl32.dll");
-    Viewport = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLsizei , GLsizei )>(GetProcAddress(handle, "glViewport"));
-    DepthRange = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble )>(GetProcAddress(handle, "glDepthRange"));
-    IsEnabled = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glIsEnabled"));
-    GetTexLevelParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLint *)>(GetProcAddress(handle, "glGetTexLevelParameteriv"));
-    GetTexLevelParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLfloat *)>(GetProcAddress(handle, "glGetTexLevelParameterfv"));
-    GetTexParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(GetProcAddress(handle, "glGetTexParameteriv"));
-    GetTexParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(GetProcAddress(handle, "glGetTexParameterfv"));
-    GetTexImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLenum , GLvoid *)>(GetProcAddress(handle, "glGetTexImage"));
-    GetString = reinterpret_cast<const GLubyte * (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glGetString"));
-    GetIntegerv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint *)>(GetProcAddress(handle, "glGetIntegerv"));
-    GetFloatv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat *)>(GetProcAddress(handle, "glGetFloatv"));
-    GetError = reinterpret_cast<GLenum (QOPENGLF_APIENTRYP)()>(GetProcAddress(handle, "glGetError"));
-    GetDoublev = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLdouble *)>(GetProcAddress(handle, "glGetDoublev"));
-    GetBooleanv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLboolean *)>(GetProcAddress(handle, "glGetBooleanv"));
-    ReadPixels = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLsizei , GLsizei , GLenum , GLenum , GLvoid *)>(GetProcAddress(handle, "glReadPixels"));
-    ReadBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glReadBuffer"));
-    PixelStorei = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint )>(GetProcAddress(handle, "glPixelStorei"));
-    PixelStoref = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat )>(GetProcAddress(handle, "glPixelStoref"));
-    DepthFunc = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glDepthFunc"));
-    StencilOp = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum )>(GetProcAddress(handle, "glStencilOp"));
-    StencilFunc = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLuint )>(GetProcAddress(handle, "glStencilFunc"));
-    LogicOp = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glLogicOp"));
-    BlendFunc = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum )>(GetProcAddress(handle, "glBlendFunc"));
-    Flush = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(GetProcAddress(handle, "glFlush"));
-    Finish = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(GetProcAddress(handle, "glFinish"));
-    Enable = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glEnable"));
-    Disable = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glDisable"));
-    DepthMask = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLboolean )>(GetProcAddress(handle, "glDepthMask"));
-    ColorMask = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLboolean , GLboolean , GLboolean , GLboolean )>(GetProcAddress(handle, "glColorMask"));
-    StencilMask = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(GetProcAddress(handle, "glStencilMask"));
-    ClearDepth = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble )>(GetProcAddress(handle, "glClearDepth"));
-    ClearStencil = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint )>(GetProcAddress(handle, "glClearStencil"));
-    ClearColor = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glClearColor"));
-    Clear = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbitfield )>(GetProcAddress(handle, "glClear"));
-    DrawBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glDrawBuffer"));
-    TexImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(GetProcAddress(handle, "glTexImage2D"));
-    TexImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(GetProcAddress(handle, "glTexImage1D"));
-    TexParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(GetProcAddress(handle, "glTexParameteriv"));
-    TexParameteri = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint )>(GetProcAddress(handle, "glTexParameteri"));
-    TexParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(GetProcAddress(handle, "glTexParameterfv"));
-    TexParameterf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat )>(GetProcAddress(handle, "glTexParameterf"));
-    Scissor = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLsizei , GLsizei )>(GetProcAddress(handle, "glScissor"));
-    PolygonMode = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum )>(GetProcAddress(handle, "glPolygonMode"));
-    PointSize = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(GetProcAddress(handle, "glPointSize"));
-    LineWidth = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(GetProcAddress(handle, "glLineWidth"));
-    Hint = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum )>(GetProcAddress(handle, "glHint"));
-    FrontFace = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glFrontFace"));
-    CullFace = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glCullFace"));
-#else
-    Viewport = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLsizei , GLsizei )>(context->getProcAddress("glViewport"));
-    DepthRange = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble )>(context->getProcAddress("glDepthRange"));
-    IsEnabled = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glIsEnabled"));
-    GetTexLevelParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLint *)>(context->getProcAddress("glGetTexLevelParameteriv"));
-    GetTexLevelParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLfloat *)>(context->getProcAddress("glGetTexLevelParameterfv"));
-    GetTexParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetTexParameteriv"));
-    GetTexParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(context->getProcAddress("glGetTexParameterfv"));
-    GetTexImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLenum , GLvoid *)>(context->getProcAddress("glGetTexImage"));
-    GetString = reinterpret_cast<const GLubyte * (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glGetString"));
-    GetIntegerv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint *)>(context->getProcAddress("glGetIntegerv"));
-    GetFloatv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat *)>(context->getProcAddress("glGetFloatv"));
-    GetError = reinterpret_cast<GLenum (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glGetError"));
-    GetDoublev = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLdouble *)>(context->getProcAddress("glGetDoublev"));
-    GetBooleanv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLboolean *)>(context->getProcAddress("glGetBooleanv"));
-    ReadPixels = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLsizei , GLsizei , GLenum , GLenum , GLvoid *)>(context->getProcAddress("glReadPixels"));
-    ReadBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glReadBuffer"));
-    PixelStorei = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint )>(context->getProcAddress("glPixelStorei"));
-    PixelStoref = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat )>(context->getProcAddress("glPixelStoref"));
-    DepthFunc = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glDepthFunc"));
-    StencilOp = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum )>(context->getProcAddress("glStencilOp"));
-    StencilFunc = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLuint )>(context->getProcAddress("glStencilFunc"));
-    LogicOp = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glLogicOp"));
-    BlendFunc = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum )>(context->getProcAddress("glBlendFunc"));
-    Flush = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glFlush"));
-    Finish = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glFinish"));
-    Enable = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glEnable"));
-    Disable = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glDisable"));
-    DepthMask = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLboolean )>(context->getProcAddress("glDepthMask"));
-    ColorMask = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLboolean , GLboolean , GLboolean , GLboolean )>(context->getProcAddress("glColorMask"));
-    StencilMask = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glStencilMask"));
-    ClearDepth = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble )>(context->getProcAddress("glClearDepth"));
-    ClearStencil = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint )>(context->getProcAddress("glClearStencil"));
-    ClearColor = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glClearColor"));
-    Clear = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbitfield )>(context->getProcAddress("glClear"));
-    DrawBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glDrawBuffer"));
-    TexImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexImage2D"));
-    TexImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexImage1D"));
-    TexParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(context->getProcAddress("glTexParameteriv"));
-    TexParameteri = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint )>(context->getProcAddress("glTexParameteri"));
-    TexParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(context->getProcAddress("glTexParameterfv"));
-    TexParameterf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat )>(context->getProcAddress("glTexParameterf"));
-    Scissor = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLsizei , GLsizei )>(context->getProcAddress("glScissor"));
-    PolygonMode = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum )>(context->getProcAddress("glPolygonMode"));
-    PointSize = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(context->getProcAddress("glPointSize"));
-    LineWidth = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(context->getProcAddress("glLineWidth"));
-    Hint = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum )>(context->getProcAddress("glHint"));
-    FrontFace = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glFrontFace"));
-    CullFace = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glCullFace"));
-#endif
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_1_0_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(1, 0, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_1_1_CoreBackend::QOpenGLFunctions_1_1_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 1.1 core functions
-#if defined(Q_OS_WIN)
-    HMODULE handle = static_cast<HMODULE>(QOpenGLContext::openGLModuleHandle());
-    if (!handle)
-        handle = GetModuleHandleA("opengl32.dll");
-    Indexubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLubyte *)>(GetProcAddress(handle, "glIndexubv"));
-    Indexub = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLubyte )>(GetProcAddress(handle, "glIndexub"));
-    IsTexture = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(GetProcAddress(handle, "glIsTexture"));
-    GenTextures = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(GetProcAddress(handle, "glGenTextures"));
-    DeleteTextures = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(GetProcAddress(handle, "glDeleteTextures"));
-    BindTexture = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(GetProcAddress(handle, "glBindTexture"));
-    TexSubImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(GetProcAddress(handle, "glTexSubImage2D"));
-    TexSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *)>(GetProcAddress(handle, "glTexSubImage1D"));
-    CopyTexSubImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLint , GLsizei , GLsizei )>(GetProcAddress(handle, "glCopyTexSubImage2D"));
-    CopyTexSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLsizei )>(GetProcAddress(handle, "glCopyTexSubImage1D"));
-    CopyTexImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLint , GLint , GLsizei , GLsizei , GLint )>(GetProcAddress(handle, "glCopyTexImage2D"));
-    CopyTexImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLint , GLint , GLsizei , GLint )>(GetProcAddress(handle, "glCopyTexImage1D"));
-    PolygonOffset = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat )>(GetProcAddress(handle, "glPolygonOffset"));
-    GetPointerv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLvoid * *)>(GetProcAddress(handle, "glGetPointerv"));
-    DrawElements = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , const GLvoid *)>(GetProcAddress(handle, "glDrawElements"));
-    DrawArrays = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLsizei )>(GetProcAddress(handle, "glDrawArrays"));
-#else
-    Indexubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLubyte *)>(context->getProcAddress("glIndexubv"));
-    Indexub = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLubyte )>(context->getProcAddress("glIndexub"));
-    IsTexture = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsTexture"));
-    GenTextures = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glGenTextures"));
-    DeleteTextures = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(context->getProcAddress("glDeleteTextures"));
-    BindTexture = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glBindTexture"));
-    TexSubImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexSubImage2D"));
-    TexSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexSubImage1D"));
-    CopyTexSubImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLint , GLsizei , GLsizei )>(context->getProcAddress("glCopyTexSubImage2D"));
-    CopyTexSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLsizei )>(context->getProcAddress("glCopyTexSubImage1D"));
-    CopyTexImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLint , GLint , GLsizei , GLsizei , GLint )>(context->getProcAddress("glCopyTexImage2D"));
-    CopyTexImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLint , GLint , GLsizei , GLint )>(context->getProcAddress("glCopyTexImage1D"));
-    PolygonOffset = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat )>(context->getProcAddress("glPolygonOffset"));
-    GetPointerv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLvoid * *)>(context->getProcAddress("glGetPointerv"));
-    DrawElements = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , const GLvoid *)>(context->getProcAddress("glDrawElements"));
-    DrawArrays = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLsizei )>(context->getProcAddress("glDrawArrays"));
-#endif
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_1_1_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(1, 1, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_1_2_CoreBackend::QOpenGLFunctions_1_2_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 1.2 core functions
-    CopyTexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLint , GLint , GLsizei , GLsizei )>(context->getProcAddress("glCopyTexSubImage3D"));
-    TexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexSubImage3D"));
-    TexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexImage3D"));
-    DrawRangeElements = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLuint , GLsizei , GLenum , const GLvoid *)>(context->getProcAddress("glDrawRangeElements"));
-    BlendEquation = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glBlendEquation"));
-    BlendColor = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glBlendColor"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_1_2_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(1, 2, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_1_3_CoreBackend::QOpenGLFunctions_1_3_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 1.3 core functions
-    GetCompressedTexImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLvoid *)>(context->getProcAddress("glGetCompressedTexImage"));
-    CompressedTexSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexSubImage1D"));
-    CompressedTexSubImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexSubImage2D"));
-    CompressedTexSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexSubImage3D"));
-    CompressedTexImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexImage1D"));
-    CompressedTexImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexImage2D"));
-    CompressedTexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLsizei , GLsizei , GLsizei , GLint , GLsizei , const GLvoid *)>(context->getProcAddress("glCompressedTexImage3D"));
-    SampleCoverage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLboolean )>(context->getProcAddress("glSampleCoverage"));
-    ActiveTexture = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glActiveTexture"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_1_3_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(1, 3, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_1_4_CoreBackend::QOpenGLFunctions_1_4_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 1.4 core functions
-    PointParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLint *)>(context->getProcAddress("glPointParameteriv"));
-    PointParameteri = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint )>(context->getProcAddress("glPointParameteri"));
-    PointParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLfloat *)>(context->getProcAddress("glPointParameterfv"));
-    PointParameterf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat )>(context->getProcAddress("glPointParameterf"));
-    MultiDrawElements = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLsizei *, GLenum , const GLvoid* const *, GLsizei )>(context->getProcAddress("glMultiDrawElements"));
-    MultiDrawArrays = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLint *, const GLsizei *, GLsizei )>(context->getProcAddress("glMultiDrawArrays"));
-    BlendFuncSeparate = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLenum )>(context->getProcAddress("glBlendFuncSeparate"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_1_4_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(1, 4, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_1_5_CoreBackend::QOpenGLFunctions_1_5_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 1.5 core functions
-    GetBufferPointerv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLvoid* *)>(context->getProcAddress("glGetBufferPointerv"));
-    GetBufferParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetBufferParameteriv"));
-    UnmapBuffer = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glUnmapBuffer"));
-    MapBuffer = reinterpret_cast<GLvoid* (QOPENGLF_APIENTRYP)(GLenum , GLenum )>(context->getProcAddress("glMapBuffer"));
-    GetBufferSubData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLintptr , GLsizeiptr , GLvoid *)>(context->getProcAddress("glGetBufferSubData"));
-    BufferSubData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLintptr , GLsizeiptr , const GLvoid *)>(context->getProcAddress("glBufferSubData"));
-    BufferData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizeiptr , const GLvoid *, GLenum )>(context->getProcAddress("glBufferData"));
-    IsBuffer = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsBuffer"));
-    GenBuffers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glGenBuffers"));
-    DeleteBuffers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(context->getProcAddress("glDeleteBuffers"));
-    BindBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glBindBuffer"));
-    GetQueryObjectuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint *)>(context->getProcAddress("glGetQueryObjectuiv"));
-    GetQueryObjectiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetQueryObjectiv"));
-    GetQueryiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetQueryiv"));
-    EndQuery = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glEndQuery"));
-    BeginQuery = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glBeginQuery"));
-    IsQuery = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsQuery"));
-    DeleteQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(context->getProcAddress("glDeleteQueries"));
-    GenQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glGenQueries"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_1_5_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(1, 5, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_2_0_CoreBackend::QOpenGLFunctions_2_0_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 2.0 core functions
-    VertexAttribPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLenum , GLboolean , GLsizei , const GLvoid *)>(context->getProcAddress("glVertexAttribPointer"));
-    VertexAttrib4usv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLushort *)>(context->getProcAddress("glVertexAttrib4usv"));
-    VertexAttrib4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLuint *)>(context->getProcAddress("glVertexAttrib4uiv"));
-    VertexAttrib4ubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLubyte *)>(context->getProcAddress("glVertexAttrib4ubv"));
-    VertexAttrib4sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLshort *)>(context->getProcAddress("glVertexAttrib4sv"));
-    VertexAttrib4s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLshort , GLshort , GLshort , GLshort )>(context->getProcAddress("glVertexAttrib4s"));
-    VertexAttrib4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLint *)>(context->getProcAddress("glVertexAttrib4iv"));
-    VertexAttrib4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLfloat *)>(context->getProcAddress("glVertexAttrib4fv"));
-    VertexAttrib4f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glVertexAttrib4f"));
-    VertexAttrib4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLdouble *)>(context->getProcAddress("glVertexAttrib4dv"));
-    VertexAttrib4d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLdouble , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glVertexAttrib4d"));
-    VertexAttrib4bv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLbyte *)>(context->getProcAddress("glVertexAttrib4bv"));
-    VertexAttrib4Nusv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLushort *)>(context->getProcAddress("glVertexAttrib4Nusv"));
-    VertexAttrib4Nuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLuint *)>(context->getProcAddress("glVertexAttrib4Nuiv"));
-    VertexAttrib4Nubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLubyte *)>(context->getProcAddress("glVertexAttrib4Nubv"));
-    VertexAttrib4Nub = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLubyte , GLubyte , GLubyte , GLubyte )>(context->getProcAddress("glVertexAttrib4Nub"));
-    VertexAttrib4Nsv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLshort *)>(context->getProcAddress("glVertexAttrib4Nsv"));
-    VertexAttrib4Niv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLint *)>(context->getProcAddress("glVertexAttrib4Niv"));
-    VertexAttrib4Nbv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLbyte *)>(context->getProcAddress("glVertexAttrib4Nbv"));
-    VertexAttrib3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLshort *)>(context->getProcAddress("glVertexAttrib3sv"));
-    VertexAttrib3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLshort , GLshort , GLshort )>(context->getProcAddress("glVertexAttrib3s"));
-    VertexAttrib3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLfloat *)>(context->getProcAddress("glVertexAttrib3fv"));
-    VertexAttrib3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glVertexAttrib3f"));
-    VertexAttrib3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLdouble *)>(context->getProcAddress("glVertexAttrib3dv"));
-    VertexAttrib3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glVertexAttrib3d"));
-    VertexAttrib2sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLshort *)>(context->getProcAddress("glVertexAttrib2sv"));
-    VertexAttrib2s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLshort , GLshort )>(context->getProcAddress("glVertexAttrib2s"));
-    VertexAttrib2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLfloat *)>(context->getProcAddress("glVertexAttrib2fv"));
-    VertexAttrib2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLfloat , GLfloat )>(context->getProcAddress("glVertexAttrib2f"));
-    VertexAttrib2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLdouble *)>(context->getProcAddress("glVertexAttrib2dv"));
-    VertexAttrib2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLdouble , GLdouble )>(context->getProcAddress("glVertexAttrib2d"));
-    VertexAttrib1sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLshort *)>(context->getProcAddress("glVertexAttrib1sv"));
-    VertexAttrib1s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLshort )>(context->getProcAddress("glVertexAttrib1s"));
-    VertexAttrib1fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLfloat *)>(context->getProcAddress("glVertexAttrib1fv"));
-    VertexAttrib1f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLfloat )>(context->getProcAddress("glVertexAttrib1f"));
-    VertexAttrib1dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLdouble *)>(context->getProcAddress("glVertexAttrib1dv"));
-    VertexAttrib1d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLdouble )>(context->getProcAddress("glVertexAttrib1d"));
-    ValidateProgram = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glValidateProgram"));
-    UniformMatrix4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glUniformMatrix4fv"));
-    UniformMatrix3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glUniformMatrix3fv"));
-    UniformMatrix2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glUniformMatrix2fv"));
-    Uniform4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLint *)>(context->getProcAddress("glUniform4iv"));
-    Uniform3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLint *)>(context->getProcAddress("glUniform3iv"));
-    Uniform2iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLint *)>(context->getProcAddress("glUniform2iv"));
-    Uniform1iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLint *)>(context->getProcAddress("glUniform1iv"));
-    Uniform4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLfloat *)>(context->getProcAddress("glUniform4fv"));
-    Uniform3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLfloat *)>(context->getProcAddress("glUniform3fv"));
-    Uniform2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLfloat *)>(context->getProcAddress("glUniform2fv"));
-    Uniform1fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLfloat *)>(context->getProcAddress("glUniform1fv"));
-    Uniform4i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint , GLint , GLint )>(context->getProcAddress("glUniform4i"));
-    Uniform3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint , GLint )>(context->getProcAddress("glUniform3i"));
-    Uniform2i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint )>(context->getProcAddress("glUniform2i"));
-    Uniform1i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint )>(context->getProcAddress("glUniform1i"));
-    Uniform4f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glUniform4f"));
-    Uniform3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glUniform3f"));
-    Uniform2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLfloat , GLfloat )>(context->getProcAddress("glUniform2f"));
-    Uniform1f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLfloat )>(context->getProcAddress("glUniform1f"));
-    UseProgram = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glUseProgram"));
-    ShaderSource = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const GLchar* const *, const GLint *)>(context->getProcAddress("glShaderSource"));
-    LinkProgram = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glLinkProgram"));
-    IsShader = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsShader"));
-    IsProgram = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsProgram"));
-    GetVertexAttribPointerv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLvoid* *)>(context->getProcAddress("glGetVertexAttribPointerv"));
-    GetVertexAttribiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetVertexAttribiv"));
-    GetVertexAttribfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLfloat *)>(context->getProcAddress("glGetVertexAttribfv"));
-    GetVertexAttribdv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLdouble *)>(context->getProcAddress("glGetVertexAttribdv"));
-    GetUniformiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint *)>(context->getProcAddress("glGetUniformiv"));
-    GetUniformfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLfloat *)>(context->getProcAddress("glGetUniformfv"));
-    GetUniformLocation = reinterpret_cast<GLint (QOPENGLF_APIENTRYP)(GLuint , const GLchar *)>(context->getProcAddress("glGetUniformLocation"));
-    GetShaderSource = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , GLsizei *, GLchar *)>(context->getProcAddress("glGetShaderSource"));
-    GetShaderInfoLog = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , GLsizei *, GLchar *)>(context->getProcAddress("glGetShaderInfoLog"));
-    GetShaderiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetShaderiv"));
-    GetProgramInfoLog = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , GLsizei *, GLchar *)>(context->getProcAddress("glGetProgramInfoLog"));
-    GetProgramiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetProgramiv"));
-    GetAttribLocation = reinterpret_cast<GLint (QOPENGLF_APIENTRYP)(GLuint , const GLchar *)>(context->getProcAddress("glGetAttribLocation"));
-    GetAttachedShaders = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , GLsizei *, GLuint *)>(context->getProcAddress("glGetAttachedShaders"));
-    GetActiveUniform = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLsizei , GLsizei *, GLint *, GLenum *, GLchar *)>(context->getProcAddress("glGetActiveUniform"));
-    GetActiveAttrib = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLsizei , GLsizei *, GLint *, GLenum *, GLchar *)>(context->getProcAddress("glGetActiveAttrib"));
-    EnableVertexAttribArray = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glEnableVertexAttribArray"));
-    DisableVertexAttribArray = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glDisableVertexAttribArray"));
-    DetachShader = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint )>(context->getProcAddress("glDetachShader"));
-    DeleteShader = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glDeleteShader"));
-    DeleteProgram = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glDeleteProgram"));
-    CreateShader = reinterpret_cast<GLuint (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glCreateShader"));
-    CreateProgram = reinterpret_cast<GLuint (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glCreateProgram"));
-    CompileShader = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glCompileShader"));
-    BindAttribLocation = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , const GLchar *)>(context->getProcAddress("glBindAttribLocation"));
-    AttachShader = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint )>(context->getProcAddress("glAttachShader"));
-    StencilMaskSeparate = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glStencilMaskSeparate"));
-    StencilFuncSeparate = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint , GLuint )>(context->getProcAddress("glStencilFuncSeparate"));
-    StencilOpSeparate = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLenum )>(context->getProcAddress("glStencilOpSeparate"));
-    DrawBuffers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLenum *)>(context->getProcAddress("glDrawBuffers"));
-    BlendEquationSeparate = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum )>(context->getProcAddress("glBlendEquationSeparate"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_2_0_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(2, 0, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_2_1_CoreBackend::QOpenGLFunctions_2_1_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 2.1 core functions
-    UniformMatrix4x3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glUniformMatrix4x3fv"));
-    UniformMatrix3x4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glUniformMatrix3x4fv"));
-    UniformMatrix4x2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glUniformMatrix4x2fv"));
-    UniformMatrix2x4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glUniformMatrix2x4fv"));
-    UniformMatrix3x2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glUniformMatrix3x2fv"));
-    UniformMatrix2x3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glUniformMatrix2x3fv"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_2_1_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(2, 1, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_3_0_CoreBackend::QOpenGLFunctions_3_0_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 3.0 core functions
-    IsVertexArray = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsVertexArray"));
-    GenVertexArrays = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glGenVertexArrays"));
-    DeleteVertexArrays = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(context->getProcAddress("glDeleteVertexArrays"));
-    BindVertexArray = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glBindVertexArray"));
-    FlushMappedBufferRange = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLintptr , GLsizeiptr )>(context->getProcAddress("glFlushMappedBufferRange"));
-    MapBufferRange = reinterpret_cast<GLvoid* (QOPENGLF_APIENTRYP)(GLenum , GLintptr , GLsizeiptr , GLbitfield )>(context->getProcAddress("glMapBufferRange"));
-    FramebufferTextureLayer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint , GLint , GLint )>(context->getProcAddress("glFramebufferTextureLayer"));
-    RenderbufferStorageMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei )>(context->getProcAddress("glRenderbufferStorageMultisample"));
-    BlitFramebuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint , GLint , GLint , GLint , GLint , GLint , GLbitfield , GLenum )>(context->getProcAddress("glBlitFramebuffer"));
-    GenerateMipmap = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glGenerateMipmap"));
-    GetFramebufferAttachmentParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLint *)>(context->getProcAddress("glGetFramebufferAttachmentParameteriv"));
-    FramebufferRenderbuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLuint )>(context->getProcAddress("glFramebufferRenderbuffer"));
-    FramebufferTexture3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLuint , GLint , GLint )>(context->getProcAddress("glFramebufferTexture3D"));
-    FramebufferTexture2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLuint , GLint )>(context->getProcAddress("glFramebufferTexture2D"));
-    FramebufferTexture1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLuint , GLint )>(context->getProcAddress("glFramebufferTexture1D"));
-    CheckFramebufferStatus = reinterpret_cast<GLenum (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glCheckFramebufferStatus"));
-    GenFramebuffers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glGenFramebuffers"));
-    DeleteFramebuffers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(context->getProcAddress("glDeleteFramebuffers"));
-    BindFramebuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glBindFramebuffer"));
-    IsFramebuffer = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsFramebuffer"));
-    GetRenderbufferParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetRenderbufferParameteriv"));
-    RenderbufferStorage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLsizei , GLsizei )>(context->getProcAddress("glRenderbufferStorage"));
-    GenRenderbuffers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glGenRenderbuffers"));
-    DeleteRenderbuffers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(context->getProcAddress("glDeleteRenderbuffers"));
-    BindRenderbuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glBindRenderbuffer"));
-    IsRenderbuffer = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsRenderbuffer"));
-    GetStringi = reinterpret_cast<const GLubyte * (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glGetStringi"));
-    ClearBufferfi = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLfloat , GLint )>(context->getProcAddress("glClearBufferfi"));
-    ClearBufferfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , const GLfloat *)>(context->getProcAddress("glClearBufferfv"));
-    ClearBufferuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , const GLuint *)>(context->getProcAddress("glClearBufferuiv"));
-    ClearBufferiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , const GLint *)>(context->getProcAddress("glClearBufferiv"));
-    GetTexParameterIuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint *)>(context->getProcAddress("glGetTexParameterIuiv"));
-    GetTexParameterIiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetTexParameterIiv"));
-    TexParameterIuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLuint *)>(context->getProcAddress("glTexParameterIuiv"));
-    TexParameterIiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(context->getProcAddress("glTexParameterIiv"));
-    Uniform4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLuint *)>(context->getProcAddress("glUniform4uiv"));
-    Uniform3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLuint *)>(context->getProcAddress("glUniform3uiv"));
-    Uniform2uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLuint *)>(context->getProcAddress("glUniform2uiv"));
-    Uniform1uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLuint *)>(context->getProcAddress("glUniform1uiv"));
-    Uniform4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLuint , GLuint , GLuint , GLuint )>(context->getProcAddress("glUniform4ui"));
-    Uniform3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLuint , GLuint , GLuint )>(context->getProcAddress("glUniform3ui"));
-    Uniform2ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLuint , GLuint )>(context->getProcAddress("glUniform2ui"));
-    Uniform1ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLuint )>(context->getProcAddress("glUniform1ui"));
-    GetFragDataLocation = reinterpret_cast<GLint (QOPENGLF_APIENTRYP)(GLuint , const GLchar *)>(context->getProcAddress("glGetFragDataLocation"));
-    BindFragDataLocation = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , const GLchar *)>(context->getProcAddress("glBindFragDataLocation"));
-    GetUniformuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLuint *)>(context->getProcAddress("glGetUniformuiv"));
-    VertexAttribI4usv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLushort *)>(context->getProcAddress("glVertexAttribI4usv"));
-    VertexAttribI4ubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLubyte *)>(context->getProcAddress("glVertexAttribI4ubv"));
-    VertexAttribI4sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLshort *)>(context->getProcAddress("glVertexAttribI4sv"));
-    VertexAttribI4bv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLbyte *)>(context->getProcAddress("glVertexAttribI4bv"));
-    VertexAttribI4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLuint *)>(context->getProcAddress("glVertexAttribI4uiv"));
-    VertexAttribI3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLuint *)>(context->getProcAddress("glVertexAttribI3uiv"));
-    VertexAttribI2uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLuint *)>(context->getProcAddress("glVertexAttribI2uiv"));
-    VertexAttribI1uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLuint *)>(context->getProcAddress("glVertexAttribI1uiv"));
-    VertexAttribI4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLint *)>(context->getProcAddress("glVertexAttribI4iv"));
-    VertexAttribI3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLint *)>(context->getProcAddress("glVertexAttribI3iv"));
-    VertexAttribI2iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLint *)>(context->getProcAddress("glVertexAttribI2iv"));
-    VertexAttribI1iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLint *)>(context->getProcAddress("glVertexAttribI1iv"));
-    VertexAttribI4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint , GLuint , GLuint )>(context->getProcAddress("glVertexAttribI4ui"));
-    VertexAttribI3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint , GLuint )>(context->getProcAddress("glVertexAttribI3ui"));
-    VertexAttribI2ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint )>(context->getProcAddress("glVertexAttribI2ui"));
-    VertexAttribI1ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint )>(context->getProcAddress("glVertexAttribI1ui"));
-    VertexAttribI4i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLint )>(context->getProcAddress("glVertexAttribI4i"));
-    VertexAttribI3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint )>(context->getProcAddress("glVertexAttribI3i"));
-    VertexAttribI2i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint )>(context->getProcAddress("glVertexAttribI2i"));
-    VertexAttribI1i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint )>(context->getProcAddress("glVertexAttribI1i"));
-    GetVertexAttribIuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint *)>(context->getProcAddress("glGetVertexAttribIuiv"));
-    GetVertexAttribIiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetVertexAttribIiv"));
-    VertexAttribIPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glVertexAttribIPointer"));
-    EndConditionalRender = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glEndConditionalRender"));
-    BeginConditionalRender = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress("glBeginConditionalRender"));
-    ClampColor = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum )>(context->getProcAddress("glClampColor"));
-    GetTransformFeedbackVarying = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLsizei , GLsizei *, GLsizei *, GLenum *, GLchar *)>(context->getProcAddress("glGetTransformFeedbackVarying"));
-    TransformFeedbackVaryings = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const GLchar* const *, GLenum )>(context->getProcAddress("glTransformFeedbackVaryings"));
-    BindBufferBase = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLuint )>(context->getProcAddress("glBindBufferBase"));
-    BindBufferRange = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLuint , GLintptr , GLsizeiptr )>(context->getProcAddress("glBindBufferRange"));
-    EndTransformFeedback = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glEndTransformFeedback"));
-    BeginTransformFeedback = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glBeginTransformFeedback"));
-    IsEnabledi = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glIsEnabledi"));
-    Disablei = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glDisablei"));
-    Enablei = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glEnablei"));
-    GetIntegeri_v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLint *)>(context->getProcAddress("glGetIntegeri_v"));
-    GetBooleani_v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLboolean *)>(context->getProcAddress("glGetBooleani_v"));
-    ColorMaski = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLboolean , GLboolean , GLboolean , GLboolean )>(context->getProcAddress("glColorMaski"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_3_0_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(3, 0, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_3_1_CoreBackend::QOpenGLFunctions_3_1_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 3.1 core functions
-    CopyBufferSubData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLintptr , GLintptr , GLsizeiptr )>(context->getProcAddress("glCopyBufferSubData"));
-    UniformBlockBinding = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint )>(context->getProcAddress("glUniformBlockBinding"));
-    GetActiveUniformBlockName = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLsizei , GLsizei *, GLchar *)>(context->getProcAddress("glGetActiveUniformBlockName"));
-    GetActiveUniformBlockiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLenum , GLint *)>(context->getProcAddress("glGetActiveUniformBlockiv"));
-    GetUniformBlockIndex = reinterpret_cast<GLuint (QOPENGLF_APIENTRYP)(GLuint , const GLchar *)>(context->getProcAddress("glGetUniformBlockIndex"));
-    GetActiveUniformName = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLsizei , GLsizei *, GLchar *)>(context->getProcAddress("glGetActiveUniformName"));
-    GetActiveUniformsiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const GLuint *, GLenum , GLint *)>(context->getProcAddress("glGetActiveUniformsiv"));
-    GetUniformIndices = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const GLchar* const *, GLuint *)>(context->getProcAddress("glGetUniformIndices"));
-    PrimitiveRestartIndex = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glPrimitiveRestartIndex"));
-    TexBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint )>(context->getProcAddress("glTexBuffer"));
-    DrawElementsInstanced = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , const GLvoid *, GLsizei )>(context->getProcAddress("glDrawElementsInstanced"));
-    DrawArraysInstanced = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLsizei , GLsizei )>(context->getProcAddress("glDrawArraysInstanced"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_3_1_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(3, 1, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_3_2_CoreBackend::QOpenGLFunctions_3_2_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 3.2 core functions
-    SampleMaski = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLbitfield )>(context->getProcAddress("glSampleMaski"));
-    GetMultisamplefv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLfloat *)>(context->getProcAddress("glGetMultisamplefv"));
-    TexImage3DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexImage3DMultisample"));
-    TexImage2DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexImage2DMultisample"));
-    GetSynciv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsync , GLenum , GLsizei , GLsizei *, GLint *)>(context->getProcAddress("glGetSynciv"));
-    GetInteger64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint64 *)>(context->getProcAddress("glGetInteger64v"));
-    WaitSync = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsync , GLbitfield , GLuint64 )>(context->getProcAddress("glWaitSync"));
-    ClientWaitSync = reinterpret_cast<GLenum (QOPENGLF_APIENTRYP)(GLsync , GLbitfield , GLuint64 )>(context->getProcAddress("glClientWaitSync"));
-    DeleteSync = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsync )>(context->getProcAddress("glDeleteSync"));
-    IsSync = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLsync )>(context->getProcAddress("glIsSync"));
-    FenceSync = reinterpret_cast<GLsync (QOPENGLF_APIENTRYP)(GLenum , GLbitfield )>(context->getProcAddress("glFenceSync"));
-    ProvokingVertex = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glProvokingVertex"));
-    MultiDrawElementsBaseVertex = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLsizei *, GLenum , const GLvoid* const *, GLsizei , const GLint *)>(context->getProcAddress("glMultiDrawElementsBaseVertex"));
-    DrawElementsInstancedBaseVertex = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , const GLvoid *, GLsizei , GLint )>(context->getProcAddress("glDrawElementsInstancedBaseVertex"));
-    DrawRangeElementsBaseVertex = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLuint , GLsizei , GLenum , const GLvoid *, GLint )>(context->getProcAddress("glDrawRangeElementsBaseVertex"));
-    DrawElementsBaseVertex = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , const GLvoid *, GLint )>(context->getProcAddress("glDrawElementsBaseVertex"));
-    FramebufferTexture = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint , GLint )>(context->getProcAddress("glFramebufferTexture"));
-    GetBufferParameteri64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint64 *)>(context->getProcAddress("glGetBufferParameteri64v"));
-    GetInteger64i_v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLint64 *)>(context->getProcAddress("glGetInteger64i_v"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_3_2_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(3, 2, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_3_3_CoreBackend::QOpenGLFunctions_3_3_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 3.3 core functions
-    VertexAttribP4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLboolean , const GLuint *)>(context->getProcAddress("glVertexAttribP4uiv"));
-    VertexAttribP4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLboolean , GLuint )>(context->getProcAddress("glVertexAttribP4ui"));
-    VertexAttribP3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLboolean , const GLuint *)>(context->getProcAddress("glVertexAttribP3uiv"));
-    VertexAttribP3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLboolean , GLuint )>(context->getProcAddress("glVertexAttribP3ui"));
-    VertexAttribP2uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLboolean , const GLuint *)>(context->getProcAddress("glVertexAttribP2uiv"));
-    VertexAttribP2ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLboolean , GLuint )>(context->getProcAddress("glVertexAttribP2ui"));
-    VertexAttribP1uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLboolean , const GLuint *)>(context->getProcAddress("glVertexAttribP1uiv"));
-    VertexAttribP1ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLboolean , GLuint )>(context->getProcAddress("glVertexAttribP1ui"));
-    SecondaryColorP3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glSecondaryColorP3uiv"));
-    SecondaryColorP3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glSecondaryColorP3ui"));
-    ColorP4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glColorP4uiv"));
-    ColorP4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glColorP4ui"));
-    ColorP3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glColorP3uiv"));
-    ColorP3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glColorP3ui"));
-    NormalP3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glNormalP3uiv"));
-    NormalP3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glNormalP3ui"));
-    MultiTexCoordP4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLuint *)>(context->getProcAddress("glMultiTexCoordP4uiv"));
-    MultiTexCoordP4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint )>(context->getProcAddress("glMultiTexCoordP4ui"));
-    MultiTexCoordP3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLuint *)>(context->getProcAddress("glMultiTexCoordP3uiv"));
-    MultiTexCoordP3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint )>(context->getProcAddress("glMultiTexCoordP3ui"));
-    MultiTexCoordP2uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLuint *)>(context->getProcAddress("glMultiTexCoordP2uiv"));
-    MultiTexCoordP2ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint )>(context->getProcAddress("glMultiTexCoordP2ui"));
-    MultiTexCoordP1uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLuint *)>(context->getProcAddress("glMultiTexCoordP1uiv"));
-    MultiTexCoordP1ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint )>(context->getProcAddress("glMultiTexCoordP1ui"));
-    TexCoordP4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glTexCoordP4uiv"));
-    TexCoordP4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glTexCoordP4ui"));
-    TexCoordP3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glTexCoordP3uiv"));
-    TexCoordP3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glTexCoordP3ui"));
-    TexCoordP2uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glTexCoordP2uiv"));
-    TexCoordP2ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glTexCoordP2ui"));
-    TexCoordP1uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glTexCoordP1uiv"));
-    TexCoordP1ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glTexCoordP1ui"));
-    VertexP4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glVertexP4uiv"));
-    VertexP4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glVertexP4ui"));
-    VertexP3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glVertexP3uiv"));
-    VertexP3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glVertexP3ui"));
-    VertexP2uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glVertexP2uiv"));
-    VertexP2ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glVertexP2ui"));
-    GetQueryObjectui64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint64 *)>(context->getProcAddress("glGetQueryObjectui64v"));
-    GetQueryObjecti64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint64 *)>(context->getProcAddress("glGetQueryObjecti64v"));
-    QueryCounter = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress("glQueryCounter"));
-    GetSamplerParameterIuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint *)>(context->getProcAddress("glGetSamplerParameterIuiv"));
-    GetSamplerParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLfloat *)>(context->getProcAddress("glGetSamplerParameterfv"));
-    GetSamplerParameterIiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetSamplerParameterIiv"));
-    GetSamplerParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetSamplerParameteriv"));
-    SamplerParameterIuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , const GLuint *)>(context->getProcAddress("glSamplerParameterIuiv"));
-    SamplerParameterIiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , const GLint *)>(context->getProcAddress("glSamplerParameterIiv"));
-    SamplerParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , const GLfloat *)>(context->getProcAddress("glSamplerParameterfv"));
-    SamplerParameterf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLfloat )>(context->getProcAddress("glSamplerParameterf"));
-    SamplerParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , const GLint *)>(context->getProcAddress("glSamplerParameteriv"));
-    SamplerParameteri = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint )>(context->getProcAddress("glSamplerParameteri"));
-    BindSampler = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint )>(context->getProcAddress("glBindSampler"));
-    IsSampler = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsSampler"));
-    DeleteSamplers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(context->getProcAddress("glDeleteSamplers"));
-    GenSamplers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glGenSamplers"));
-    GetFragDataIndex = reinterpret_cast<GLint (QOPENGLF_APIENTRYP)(GLuint , const GLchar *)>(context->getProcAddress("glGetFragDataIndex"));
-    BindFragDataLocationIndexed = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint , const GLchar *)>(context->getProcAddress("glBindFragDataLocationIndexed"));
-    VertexAttribDivisor = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint )>(context->getProcAddress("glVertexAttribDivisor"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_3_3_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(3, 3, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_4_0_CoreBackend::QOpenGLFunctions_4_0_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 4.0 core functions
-    GetQueryIndexediv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLenum , GLint *)>(context->getProcAddress("glGetQueryIndexediv"));
-    EndQueryIndexed = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glEndQueryIndexed"));
-    BeginQueryIndexed = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLuint )>(context->getProcAddress("glBeginQueryIndexed"));
-    DrawTransformFeedbackStream = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLuint )>(context->getProcAddress("glDrawTransformFeedbackStream"));
-    DrawTransformFeedback = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glDrawTransformFeedback"));
-    ResumeTransformFeedback = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glResumeTransformFeedback"));
-    PauseTransformFeedback = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glPauseTransformFeedback"));
-    IsTransformFeedback = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsTransformFeedback"));
-    GenTransformFeedbacks = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glGenTransformFeedbacks"));
-    DeleteTransformFeedbacks = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(context->getProcAddress("glDeleteTransformFeedbacks"));
-    BindTransformFeedback = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glBindTransformFeedback"));
-    PatchParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLfloat *)>(context->getProcAddress("glPatchParameterfv"));
-    PatchParameteri = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint )>(context->getProcAddress("glPatchParameteri"));
-    GetProgramStageiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , GLint *)>(context->getProcAddress("glGetProgramStageiv"));
-    GetUniformSubroutineuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLuint *)>(context->getProcAddress("glGetUniformSubroutineuiv"));
-    UniformSubroutinesuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLuint *)>(context->getProcAddress("glUniformSubroutinesuiv"));
-    GetActiveSubroutineName = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLsizei , GLsizei *, GLchar *)>(context->getProcAddress("glGetActiveSubroutineName"));
-    GetActiveSubroutineUniformName = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLsizei , GLsizei *, GLchar *)>(context->getProcAddress("glGetActiveSubroutineUniformName"));
-    GetActiveSubroutineUniformiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLenum , GLint *)>(context->getProcAddress("glGetActiveSubroutineUniformiv"));
-    GetSubroutineIndex = reinterpret_cast<GLuint (QOPENGLF_APIENTRYP)(GLuint , GLenum , const GLchar *)>(context->getProcAddress("glGetSubroutineIndex"));
-    GetSubroutineUniformLocation = reinterpret_cast<GLint (QOPENGLF_APIENTRYP)(GLuint , GLenum , const GLchar *)>(context->getProcAddress("glGetSubroutineUniformLocation"));
-    GetUniformdv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLdouble *)>(context->getProcAddress("glGetUniformdv"));
-    UniformMatrix4x3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glUniformMatrix4x3dv"));
-    UniformMatrix4x2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glUniformMatrix4x2dv"));
-    UniformMatrix3x4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glUniformMatrix3x4dv"));
-    UniformMatrix3x2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glUniformMatrix3x2dv"));
-    UniformMatrix2x4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glUniformMatrix2x4dv"));
-    UniformMatrix2x3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glUniformMatrix2x3dv"));
-    UniformMatrix4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glUniformMatrix4dv"));
-    UniformMatrix3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glUniformMatrix3dv"));
-    UniformMatrix2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glUniformMatrix2dv"));
-    Uniform4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLdouble *)>(context->getProcAddress("glUniform4dv"));
-    Uniform3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLdouble *)>(context->getProcAddress("glUniform3dv"));
-    Uniform2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLdouble *)>(context->getProcAddress("glUniform2dv"));
-    Uniform1dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLsizei , const GLdouble *)>(context->getProcAddress("glUniform1dv"));
-    Uniform4d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLdouble , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glUniform4d"));
-    Uniform3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glUniform3d"));
-    Uniform2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLdouble , GLdouble )>(context->getProcAddress("glUniform2d"));
-    Uniform1d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLdouble )>(context->getProcAddress("glUniform1d"));
-    DrawElementsIndirect = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glDrawElementsIndirect"));
-    DrawArraysIndirect = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLvoid *)>(context->getProcAddress("glDrawArraysIndirect"));
-    BlendFuncSeparatei = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , GLenum , GLenum )>(context->getProcAddress("glBlendFuncSeparatei"));
-    BlendFunci = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum )>(context->getProcAddress("glBlendFunci"));
-    BlendEquationSeparatei = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum )>(context->getProcAddress("glBlendEquationSeparatei"));
-    BlendEquationi = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress("glBlendEquationi"));
-    MinSampleShading = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(context->getProcAddress("glMinSampleShading"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_4_0_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(4, 0, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_4_1_CoreBackend::QOpenGLFunctions_4_1_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 4.1 core functions
-    GetDoublei_v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLdouble *)>(context->getProcAddress("glGetDoublei_v"));
-    GetFloati_v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLfloat *)>(context->getProcAddress("glGetFloati_v"));
-    DepthRangeIndexed = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLdouble , GLdouble )>(context->getProcAddress("glDepthRangeIndexed"));
-    DepthRangeArrayv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const GLdouble *)>(context->getProcAddress("glDepthRangeArrayv"));
-    ScissorIndexedv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLint *)>(context->getProcAddress("glScissorIndexedv"));
-    ScissorIndexed = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLsizei , GLsizei )>(context->getProcAddress("glScissorIndexed"));
-    ScissorArrayv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const GLint *)>(context->getProcAddress("glScissorArrayv"));
-    ViewportIndexedfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLfloat *)>(context->getProcAddress("glViewportIndexedfv"));
-    ViewportIndexedf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glViewportIndexedf"));
-    ViewportArrayv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const GLfloat *)>(context->getProcAddress("glViewportArrayv"));
-    GetVertexAttribLdv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLdouble *)>(context->getProcAddress("glGetVertexAttribLdv"));
-    VertexAttribLPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glVertexAttribLPointer"));
-    VertexAttribL4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLdouble *)>(context->getProcAddress("glVertexAttribL4dv"));
-    VertexAttribL3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLdouble *)>(context->getProcAddress("glVertexAttribL3dv"));
-    VertexAttribL2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLdouble *)>(context->getProcAddress("glVertexAttribL2dv"));
-    VertexAttribL1dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLdouble *)>(context->getProcAddress("glVertexAttribL1dv"));
-    VertexAttribL4d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLdouble , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glVertexAttribL4d"));
-    VertexAttribL3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glVertexAttribL3d"));
-    VertexAttribL2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLdouble , GLdouble )>(context->getProcAddress("glVertexAttribL2d"));
-    VertexAttribL1d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLdouble )>(context->getProcAddress("glVertexAttribL1d"));
-    GetProgramPipelineInfoLog = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , GLsizei *, GLchar *)>(context->getProcAddress("glGetProgramPipelineInfoLog"));
-    ValidateProgramPipeline = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glValidateProgramPipeline"));
-    ProgramUniformMatrix4x3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glProgramUniformMatrix4x3dv"));
-    ProgramUniformMatrix3x4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glProgramUniformMatrix3x4dv"));
-    ProgramUniformMatrix4x2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glProgramUniformMatrix4x2dv"));
-    ProgramUniformMatrix2x4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glProgramUniformMatrix2x4dv"));
-    ProgramUniformMatrix3x2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glProgramUniformMatrix3x2dv"));
-    ProgramUniformMatrix2x3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glProgramUniformMatrix2x3dv"));
-    ProgramUniformMatrix4x3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glProgramUniformMatrix4x3fv"));
-    ProgramUniformMatrix3x4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glProgramUniformMatrix3x4fv"));
-    ProgramUniformMatrix4x2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glProgramUniformMatrix4x2fv"));
-    ProgramUniformMatrix2x4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glProgramUniformMatrix2x4fv"));
-    ProgramUniformMatrix3x2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glProgramUniformMatrix3x2fv"));
-    ProgramUniformMatrix2x3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glProgramUniformMatrix2x3fv"));
-    ProgramUniformMatrix4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glProgramUniformMatrix4dv"));
-    ProgramUniformMatrix3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glProgramUniformMatrix3dv"));
-    ProgramUniformMatrix2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLdouble *)>(context->getProcAddress("glProgramUniformMatrix2dv"));
-    ProgramUniformMatrix4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glProgramUniformMatrix4fv"));
-    ProgramUniformMatrix3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glProgramUniformMatrix3fv"));
-    ProgramUniformMatrix2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLboolean , const GLfloat *)>(context->getProcAddress("glProgramUniformMatrix2fv"));
-    ProgramUniform4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLuint *)>(context->getProcAddress("glProgramUniform4uiv"));
-    ProgramUniform4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLuint , GLuint , GLuint , GLuint )>(context->getProcAddress("glProgramUniform4ui"));
-    ProgramUniform4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLdouble *)>(context->getProcAddress("glProgramUniform4dv"));
-    ProgramUniform4d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLdouble , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glProgramUniform4d"));
-    ProgramUniform4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLfloat *)>(context->getProcAddress("glProgramUniform4fv"));
-    ProgramUniform4f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glProgramUniform4f"));
-    ProgramUniform4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLint *)>(context->getProcAddress("glProgramUniform4iv"));
-    ProgramUniform4i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLint , GLint )>(context->getProcAddress("glProgramUniform4i"));
-    ProgramUniform3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLuint *)>(context->getProcAddress("glProgramUniform3uiv"));
-    ProgramUniform3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLuint , GLuint , GLuint )>(context->getProcAddress("glProgramUniform3ui"));
-    ProgramUniform3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLdouble *)>(context->getProcAddress("glProgramUniform3dv"));
-    ProgramUniform3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glProgramUniform3d"));
-    ProgramUniform3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLfloat *)>(context->getProcAddress("glProgramUniform3fv"));
-    ProgramUniform3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glProgramUniform3f"));
-    ProgramUniform3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLint *)>(context->getProcAddress("glProgramUniform3iv"));
-    ProgramUniform3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLint )>(context->getProcAddress("glProgramUniform3i"));
-    ProgramUniform2uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLuint *)>(context->getProcAddress("glProgramUniform2uiv"));
-    ProgramUniform2ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLuint , GLuint )>(context->getProcAddress("glProgramUniform2ui"));
-    ProgramUniform2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLdouble *)>(context->getProcAddress("glProgramUniform2dv"));
-    ProgramUniform2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLdouble , GLdouble )>(context->getProcAddress("glProgramUniform2d"));
-    ProgramUniform2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLfloat *)>(context->getProcAddress("glProgramUniform2fv"));
-    ProgramUniform2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLfloat , GLfloat )>(context->getProcAddress("glProgramUniform2f"));
-    ProgramUniform2iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLint *)>(context->getProcAddress("glProgramUniform2iv"));
-    ProgramUniform2i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint )>(context->getProcAddress("glProgramUniform2i"));
-    ProgramUniform1uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLuint *)>(context->getProcAddress("glProgramUniform1uiv"));
-    ProgramUniform1ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLuint )>(context->getProcAddress("glProgramUniform1ui"));
-    ProgramUniform1dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLdouble *)>(context->getProcAddress("glProgramUniform1dv"));
-    ProgramUniform1d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLdouble )>(context->getProcAddress("glProgramUniform1d"));
-    ProgramUniform1fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLfloat *)>(context->getProcAddress("glProgramUniform1fv"));
-    ProgramUniform1f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLfloat )>(context->getProcAddress("glProgramUniform1f"));
-    ProgramUniform1iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , const GLint *)>(context->getProcAddress("glProgramUniform1iv"));
-    ProgramUniform1i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint )>(context->getProcAddress("glProgramUniform1i"));
-    GetProgramPipelineiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetProgramPipelineiv"));
-    IsProgramPipeline = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsProgramPipeline"));
-    GenProgramPipelines = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glGenProgramPipelines"));
-    DeleteProgramPipelines = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(context->getProcAddress("glDeleteProgramPipelines"));
-    BindProgramPipeline = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glBindProgramPipeline"));
-    CreateShaderProgramv = reinterpret_cast<GLuint (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLchar* const *)>(context->getProcAddress("glCreateShaderProgramv"));
-    ActiveShaderProgram = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint )>(context->getProcAddress("glActiveShaderProgram"));
-    UseProgramStages = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLbitfield , GLuint )>(context->getProcAddress("glUseProgramStages"));
-    ProgramParameteri = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint )>(context->getProcAddress("glProgramParameteri"));
-    ProgramBinary = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , const GLvoid *, GLsizei )>(context->getProcAddress("glProgramBinary"));
-    GetProgramBinary = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , GLsizei *, GLenum *, GLvoid *)>(context->getProcAddress("glGetProgramBinary"));
-    ClearDepthf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(context->getProcAddress("glClearDepthf"));
-    DepthRangef = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat )>(context->getProcAddress("glDepthRangef"));
-    GetShaderPrecisionFormat = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *, GLint *)>(context->getProcAddress("glGetShaderPrecisionFormat"));
-    ShaderBinary = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *, GLenum , const GLvoid *, GLsizei )>(context->getProcAddress("glShaderBinary"));
-    ReleaseShaderCompiler = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glReleaseShaderCompiler"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_4_1_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(4, 1, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_4_2_CoreBackend::QOpenGLFunctions_4_2_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 4.2 core functions
-    TexStorage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei )>(context->getProcAddress("glTexStorage3D"));
-    TexStorage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei )>(context->getProcAddress("glTexStorage2D"));
-    TexStorage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei )>(context->getProcAddress("glTexStorage1D"));
-    MemoryBarrier = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbitfield )>(context->getProcAddress("glMemoryBarrier"));
-    BindImageTexture = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLint , GLboolean , GLint , GLenum , GLenum )>(context->getProcAddress("glBindImageTexture"));
-    GetActiveAtomicCounterBufferiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLenum , GLint *)>(context->getProcAddress("glGetActiveAtomicCounterBufferiv"));
-    GetInternalformativ = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLsizei , GLint *)>(context->getProcAddress("glGetInternalformativ"));
-    DrawTransformFeedbackStreamInstanced = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLuint , GLsizei )>(context->getProcAddress("glDrawTransformFeedbackStreamInstanced"));
-    DrawTransformFeedbackInstanced = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLsizei )>(context->getProcAddress("glDrawTransformFeedbackInstanced"));
-    DrawElementsInstancedBaseVertexBaseInstance = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , const void *, GLsizei , GLint , GLuint )>(context->getProcAddress("glDrawElementsInstancedBaseVertexBaseInstance"));
-    DrawElementsInstancedBaseInstance = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , const void *, GLsizei , GLuint )>(context->getProcAddress("glDrawElementsInstancedBaseInstance"));
-    DrawArraysInstancedBaseInstance = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLsizei , GLsizei , GLuint )>(context->getProcAddress("glDrawArraysInstancedBaseInstance"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_4_2_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(4, 2, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_4_3_CoreBackend::QOpenGLFunctions_4_3_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 4.3 core functions
-    GetObjectPtrLabel = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const void *, GLsizei , GLsizei *, GLchar *)>(context->getProcAddress("glGetObjectPtrLabel"));
-    ObjectPtrLabel = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const void *, GLsizei , const GLchar *)>(context->getProcAddress("glObjectPtrLabel"));
-    GetObjectLabel = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLsizei , GLsizei *, GLchar *)>(context->getProcAddress("glGetObjectLabel"));
-    ObjectLabel = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLsizei , const GLchar *)>(context->getProcAddress("glObjectLabel"));
-    PopDebugGroup = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glPopDebugGroup"));
-    PushDebugGroup = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLsizei , const GLchar *)>(context->getProcAddress("glPushDebugGroup"));
-    GetDebugMessageLog = reinterpret_cast<GLuint (QOPENGLF_APIENTRYP)(GLuint , GLsizei , GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *)>(context->getProcAddress("glGetDebugMessageLog"));
-    DebugMessageCallback = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLDEBUGPROC , const void *)>(context->getProcAddress("glDebugMessageCallback"));
-    DebugMessageInsert = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint , GLenum , GLsizei , const GLchar *)>(context->getProcAddress("glDebugMessageInsert"));
-    DebugMessageControl = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLsizei , const GLuint *, GLboolean )>(context->getProcAddress("glDebugMessageControl"));
-    TexStorage3DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexStorage3DMultisample"));
-    TexStorage2DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTexStorage2DMultisample"));
-    TexBufferRange = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint , GLintptr , GLsizeiptr )>(context->getProcAddress("glTexBufferRange"));
-    ShaderStorageBlockBinding = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint )>(context->getProcAddress("glShaderStorageBlockBinding"));
-    GetProgramResourceLocationIndex = reinterpret_cast<GLint (QOPENGLF_APIENTRYP)(GLuint , GLenum , const GLchar *)>(context->getProcAddress("glGetProgramResourceLocationIndex"));
-    GetProgramResourceLocation = reinterpret_cast<GLint (QOPENGLF_APIENTRYP)(GLuint , GLenum , const GLchar *)>(context->getProcAddress("glGetProgramResourceLocation"));
-    GetProgramResourceiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLsizei , const GLenum *, GLsizei , GLsizei *, GLint *)>(context->getProcAddress("glGetProgramResourceiv"));
-    GetProgramResourceName = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLsizei , GLsizei *, GLchar *)>(context->getProcAddress("glGetProgramResourceName"));
-    GetProgramResourceIndex = reinterpret_cast<GLuint (QOPENGLF_APIENTRYP)(GLuint , GLenum , const GLchar *)>(context->getProcAddress("glGetProgramResourceIndex"));
-    GetProgramInterfaceiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , GLint *)>(context->getProcAddress("glGetProgramInterfaceiv"));
-    MultiDrawElementsIndirect = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const void *, GLsizei , GLsizei )>(context->getProcAddress("glMultiDrawElementsIndirect"));
-    MultiDrawArraysIndirect = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const void *, GLsizei , GLsizei )>(context->getProcAddress("glMultiDrawArraysIndirect"));
-    InvalidateSubFramebuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLenum *, GLint , GLint , GLsizei , GLsizei )>(context->getProcAddress("glInvalidateSubFramebuffer"));
-    InvalidateFramebuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLenum *)>(context->getProcAddress("glInvalidateFramebuffer"));
-    InvalidateBufferData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glInvalidateBufferData"));
-    InvalidateBufferSubData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLintptr , GLsizeiptr )>(context->getProcAddress("glInvalidateBufferSubData"));
-    InvalidateTexImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint )>(context->getProcAddress("glInvalidateTexImage"));
-    InvalidateTexSubImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei )>(context->getProcAddress("glInvalidateTexSubImage"));
-    GetInternalformati64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLsizei , GLint64 *)>(context->getProcAddress("glGetInternalformati64v"));
-    GetFramebufferParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetFramebufferParameteriv"));
-    FramebufferParameteri = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint )>(context->getProcAddress("glFramebufferParameteri"));
-    VertexBindingDivisor = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint )>(context->getProcAddress("glVertexBindingDivisor"));
-    VertexAttribBinding = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint )>(context->getProcAddress("glVertexAttribBinding"));
-    VertexAttribLFormat = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLenum , GLuint )>(context->getProcAddress("glVertexAttribLFormat"));
-    VertexAttribIFormat = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLenum , GLuint )>(context->getProcAddress("glVertexAttribIFormat"));
-    VertexAttribFormat = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLenum , GLboolean , GLuint )>(context->getProcAddress("glVertexAttribFormat"));
-    BindVertexBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLintptr , GLsizei )>(context->getProcAddress("glBindVertexBuffer"));
-    TextureView = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLenum , GLuint , GLuint , GLuint , GLuint )>(context->getProcAddress("glTextureView"));
-    CopyImageSubData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , GLint , GLint , GLint , GLuint , GLenum , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei )>(context->getProcAddress("glCopyImageSubData"));
-    DispatchComputeIndirect = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLintptr )>(context->getProcAddress("glDispatchComputeIndirect"));
-    DispatchCompute = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint )>(context->getProcAddress("glDispatchCompute"));
-    ClearBufferSubData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLintptr , GLsizeiptr , GLenum , GLenum , const void *)>(context->getProcAddress("glClearBufferSubData"));
-    ClearBufferData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLenum , const void *)>(context->getProcAddress("glClearBufferData"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_4_3_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(4, 3, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_4_4_CoreBackend::QOpenGLFunctions_4_4_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 4.4 core functions
-    BindVertexBuffers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const GLuint *, const GLintptr *, const GLsizei *)>(context->getProcAddress("glBindVertexBuffers"));
-    BindImageTextures = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const GLuint *)>(context->getProcAddress("glBindImageTextures"));
-    BindSamplers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const GLuint *)>(context->getProcAddress("glBindSamplers"));
-    BindTextures = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const GLuint *)>(context->getProcAddress("glBindTextures"));
-    BindBuffersRange = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLsizei , const GLuint *, const GLintptr *, const GLsizeiptr *)>(context->getProcAddress("glBindBuffersRange"));
-    BindBuffersBase = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint , GLsizei , const GLuint *)>(context->getProcAddress("glBindBuffersBase"));
-    ClearTexSubImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLenum , const void *)>(context->getProcAddress("glClearTexSubImage"));
-    ClearTexImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLenum , GLenum , const void *)>(context->getProcAddress("glClearTexImage"));
-    BufferStorage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizeiptr , const void *, GLbitfield )>(context->getProcAddress("glBufferStorage"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_4_4_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(4, 4, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_4_5_CoreBackend::QOpenGLFunctions_4_5_CoreBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 4.5 core functions
-    TextureBarrier = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glTextureBarrier"));
-    ReadnPixels = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLsizei , GLsizei , GLenum , GLenum , GLsizei , void *)>(context->getProcAddress("glReadnPixels"));
-    GetnUniformuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLuint *)>(context->getProcAddress("glGetnUniformuiv"));
-    GetnUniformiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLint *)>(context->getProcAddress("glGetnUniformiv"));
-    GetnUniformfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLfloat *)>(context->getProcAddress("glGetnUniformfv"));
-    GetnUniformdv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , GLdouble *)>(context->getProcAddress("glGetnUniformdv"));
-    GetnTexImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLenum , GLenum , GLsizei , void *)>(context->getProcAddress("glGetnTexImage"));
-    GetnCompressedTexImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLsizei , void *)>(context->getProcAddress("glGetnCompressedTexImage"));
-    GetGraphicsResetStatus = reinterpret_cast<GLenum (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glGetGraphicsResetStatus"));
-    GetCompressedTextureSubImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLsizei , void *)>(context->getProcAddress("glGetCompressedTextureSubImage"));
-    GetTextureSubImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLenum , GLsizei , void *)>(context->getProcAddress("glGetTextureSubImage"));
-    MemoryBarrierByRegion = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbitfield )>(context->getProcAddress("glMemoryBarrierByRegion"));
-    CreateQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLuint *)>(context->getProcAddress("glCreateQueries"));
-    CreateProgramPipelines = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glCreateProgramPipelines"));
-    CreateSamplers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glCreateSamplers"));
-    GetVertexArrayIndexed64iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLenum , GLint64 *)>(context->getProcAddress("glGetVertexArrayIndexed64iv"));
-    GetVertexArrayIndexediv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLenum , GLint *)>(context->getProcAddress("glGetVertexArrayIndexediv"));
-    GetVertexArrayiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetVertexArrayiv"));
-    VertexArrayBindingDivisor = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint )>(context->getProcAddress("glVertexArrayBindingDivisor"));
-    VertexArrayAttribLFormat = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLint , GLenum , GLuint )>(context->getProcAddress("glVertexArrayAttribLFormat"));
-    VertexArrayAttribIFormat = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLint , GLenum , GLuint )>(context->getProcAddress("glVertexArrayAttribIFormat"));
-    VertexArrayAttribFormat = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLint , GLenum , GLboolean , GLuint )>(context->getProcAddress("glVertexArrayAttribFormat"));
-    VertexArrayAttribBinding = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint )>(context->getProcAddress("glVertexArrayAttribBinding"));
-    VertexArrayVertexBuffers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLsizei , const GLuint *, const GLintptr *, const GLsizei *)>(context->getProcAddress("glVertexArrayVertexBuffers"));
-    VertexArrayVertexBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint , GLintptr , GLsizei )>(context->getProcAddress("glVertexArrayVertexBuffer"));
-    VertexArrayElementBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint )>(context->getProcAddress("glVertexArrayElementBuffer"));
-    EnableVertexArrayAttrib = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint )>(context->getProcAddress("glEnableVertexArrayAttrib"));
-    DisableVertexArrayAttrib = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint )>(context->getProcAddress("glDisableVertexArrayAttrib"));
-    CreateVertexArrays = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glCreateVertexArrays"));
-    GetTextureParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetTextureParameteriv"));
-    GetTextureParameterIuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint *)>(context->getProcAddress("glGetTextureParameterIuiv"));
-    GetTextureParameterIiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetTextureParameterIiv"));
-    GetTextureParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLfloat *)>(context->getProcAddress("glGetTextureParameterfv"));
-    GetTextureLevelParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLenum , GLint *)>(context->getProcAddress("glGetTextureLevelParameteriv"));
-    GetTextureLevelParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLenum , GLfloat *)>(context->getProcAddress("glGetTextureLevelParameterfv"));
-    GetCompressedTextureImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLsizei , void *)>(context->getProcAddress("glGetCompressedTextureImage"));
-    GetTextureImage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLenum , GLenum , GLsizei , void *)>(context->getProcAddress("glGetTextureImage"));
-    BindTextureUnit = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint )>(context->getProcAddress("glBindTextureUnit"));
-    GenerateTextureMipmap = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glGenerateTextureMipmap"));
-    TextureParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , const GLint *)>(context->getProcAddress("glTextureParameteriv"));
-    TextureParameterIuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , const GLuint *)>(context->getProcAddress("glTextureParameterIuiv"));
-    TextureParameterIiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , const GLint *)>(context->getProcAddress("glTextureParameterIiv"));
-    TextureParameteri = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint )>(context->getProcAddress("glTextureParameteri"));
-    TextureParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , const GLfloat *)>(context->getProcAddress("glTextureParameterfv"));
-    TextureParameterf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLfloat )>(context->getProcAddress("glTextureParameterf"));
-    CopyTextureSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLint , GLint , GLint , GLsizei , GLsizei )>(context->getProcAddress("glCopyTextureSubImage3D"));
-    CopyTextureSubImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLint , GLint , GLsizei , GLsizei )>(context->getProcAddress("glCopyTextureSubImage2D"));
-    CopyTextureSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLint , GLsizei )>(context->getProcAddress("glCopyTextureSubImage1D"));
-    CompressedTextureSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLsizei , const void *)>(context->getProcAddress("glCompressedTextureSubImage3D"));
-    CompressedTextureSubImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLsizei , const void *)>(context->getProcAddress("glCompressedTextureSubImage2D"));
-    CompressedTextureSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLsizei , GLenum , GLsizei , const void *)>(context->getProcAddress("glCompressedTextureSubImage1D"));
-    TextureSubImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLint , GLsizei , GLsizei , GLsizei , GLenum , GLenum , const void *)>(context->getProcAddress("glTextureSubImage3D"));
-    TextureSubImage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLsizei , GLsizei , GLenum , GLenum , const void *)>(context->getProcAddress("glTextureSubImage2D"));
-    TextureSubImage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLsizei , GLenum , GLenum , const void *)>(context->getProcAddress("glTextureSubImage1D"));
-    TextureStorage3DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , GLenum , GLsizei , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTextureStorage3DMultisample"));
-    TextureStorage2DMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , GLenum , GLsizei , GLsizei , GLboolean )>(context->getProcAddress("glTextureStorage2DMultisample"));
-    TextureStorage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , GLenum , GLsizei , GLsizei , GLsizei )>(context->getProcAddress("glTextureStorage3D"));
-    TextureStorage2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , GLenum , GLsizei , GLsizei )>(context->getProcAddress("glTextureStorage2D"));
-    TextureStorage1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , GLenum , GLsizei )>(context->getProcAddress("glTextureStorage1D"));
-    TextureBufferRange = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLintptr , GLsizei )>(context->getProcAddress("glTextureBufferRange"));
-    TextureBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint )>(context->getProcAddress("glTextureBuffer"));
-    CreateTextures = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLuint *)>(context->getProcAddress("glCreateTextures"));
-    GetNamedRenderbufferParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetNamedRenderbufferParameteriv"));
-    NamedRenderbufferStorageMultisample = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , GLenum , GLsizei , GLsizei )>(context->getProcAddress("glNamedRenderbufferStorageMultisample"));
-    NamedRenderbufferStorage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLsizei , GLsizei )>(context->getProcAddress("glNamedRenderbufferStorage"));
-    CreateRenderbuffers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glCreateRenderbuffers"));
-    GetNamedFramebufferAttachmentParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , GLint *)>(context->getProcAddress("glGetNamedFramebufferAttachmentParameteriv"));
-    GetNamedFramebufferParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetNamedFramebufferParameteriv"));
-    CheckNamedFramebufferStatus = reinterpret_cast<GLenum (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress("glCheckNamedFramebufferStatus"));
-    BlitNamedFramebuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLint , GLint , GLint , GLint , GLint , GLint , GLint , GLint , GLbitfield , GLenum )>(context->getProcAddress("glBlitNamedFramebuffer"));
-    ClearNamedFramebufferfi = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLfloat , GLint )>(context->getProcAddress("glClearNamedFramebufferfi"));
-    ClearNamedFramebufferfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , const GLfloat *)>(context->getProcAddress("glClearNamedFramebufferfv"));
-    ClearNamedFramebufferuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , const GLuint *)>(context->getProcAddress("glClearNamedFramebufferuiv"));
-    ClearNamedFramebufferiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint , const GLint *)>(context->getProcAddress("glClearNamedFramebufferiv"));
-    InvalidateNamedFramebufferSubData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const GLenum *, GLint , GLint , GLsizei , GLsizei )>(context->getProcAddress("glInvalidateNamedFramebufferSubData"));
-    InvalidateNamedFramebufferData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const GLenum *)>(context->getProcAddress("glInvalidateNamedFramebufferData"));
-    NamedFramebufferReadBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress("glNamedFramebufferReadBuffer"));
-    NamedFramebufferDrawBuffers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const GLenum *)>(context->getProcAddress("glNamedFramebufferDrawBuffers"));
-    NamedFramebufferDrawBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress("glNamedFramebufferDrawBuffer"));
-    NamedFramebufferTextureLayer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLint , GLint )>(context->getProcAddress("glNamedFramebufferTextureLayer"));
-    NamedFramebufferTexture = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLint )>(context->getProcAddress("glNamedFramebufferTexture"));
-    NamedFramebufferParameteri = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint )>(context->getProcAddress("glNamedFramebufferParameteri"));
-    NamedFramebufferRenderbuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , GLuint )>(context->getProcAddress("glNamedFramebufferRenderbuffer"));
-    CreateFramebuffers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glCreateFramebuffers"));
-    GetNamedBufferSubData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLintptr , GLsizei , void *)>(context->getProcAddress("glGetNamedBufferSubData"));
-    GetNamedBufferPointerv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , void * *)>(context->getProcAddress("glGetNamedBufferPointerv"));
-    GetNamedBufferParameteri64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint64 *)>(context->getProcAddress("glGetNamedBufferParameteri64v"));
-    GetNamedBufferParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetNamedBufferParameteriv"));
-    FlushMappedNamedBufferRange = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLintptr , GLsizei )>(context->getProcAddress("glFlushMappedNamedBufferRange"));
-    UnmapNamedBuffer = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glUnmapNamedBuffer"));
-    MapNamedBufferRange = reinterpret_cast<void * (QOPENGLF_APIENTRYP)(GLuint , GLintptr , GLsizei , GLbitfield )>(context->getProcAddress("glMapNamedBufferRange"));
-    MapNamedBuffer = reinterpret_cast<void * (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress("glMapNamedBuffer"));
-    ClearNamedBufferSubData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLintptr , GLsizei , GLenum , GLenum , const void *)>(context->getProcAddress("glClearNamedBufferSubData"));
-    ClearNamedBufferData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLenum , GLenum , const void *)>(context->getProcAddress("glClearNamedBufferData"));
-    CopyNamedBufferSubData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLintptr , GLintptr , GLsizei )>(context->getProcAddress("glCopyNamedBufferSubData"));
-    NamedBufferSubData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLintptr , GLsizei , const void *)>(context->getProcAddress("glNamedBufferSubData"));
-    NamedBufferData = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const void *, GLenum )>(context->getProcAddress("glNamedBufferData"));
-    NamedBufferStorage = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei , const void *, GLbitfield )>(context->getProcAddress("glNamedBufferStorage"));
-    CreateBuffers = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glCreateBuffers"));
-    GetTransformFeedbacki64_v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLint64 *)>(context->getProcAddress("glGetTransformFeedbacki64_v"));
-    GetTransformFeedbacki_v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint , GLint *)>(context->getProcAddress("glGetTransformFeedbacki_v"));
-    GetTransformFeedbackiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetTransformFeedbackiv"));
-    TransformFeedbackBufferRange = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint , GLintptr , GLsizei )>(context->getProcAddress("glTransformFeedbackBufferRange"));
-    TransformFeedbackBufferBase = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint )>(context->getProcAddress("glTransformFeedbackBufferBase"));
-    CreateTransformFeedbacks = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glCreateTransformFeedbacks"));
-    ClipControl = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum )>(context->getProcAddress("glClipControl"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_4_5_CoreBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(4, 5, QOpenGLVersionStatus::CoreStatus);
-}
-
-QOpenGLFunctions_1_0_DeprecatedBackend::QOpenGLFunctions_1_0_DeprecatedBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 1.0 deprecated functions
-#if defined(Q_OS_WIN)
-    HMODULE handle = static_cast<HMODULE>(QOpenGLContext::openGLModuleHandle());
-    if (!handle)
-        handle = GetModuleHandleA("opengl32.dll");
-    Translatef = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glTranslatef"));
-    Translated = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glTranslated"));
-    Scalef = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glScalef"));
-    Scaled = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glScaled"));
-    Rotatef = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glRotatef"));
-    Rotated = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glRotated"));
-    PushMatrix = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(GetProcAddress(handle, "glPushMatrix"));
-    PopMatrix = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(GetProcAddress(handle, "glPopMatrix"));
-    Ortho = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glOrtho"));
-    MultMatrixd = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glMultMatrixd"));
-    MultMatrixf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glMultMatrixf"));
-    MatrixMode = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glMatrixMode"));
-    LoadMatrixd = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glLoadMatrixd"));
-    LoadMatrixf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glLoadMatrixf"));
-    LoadIdentity = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(GetProcAddress(handle, "glLoadIdentity"));
-    Frustum = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glFrustum"));
-    IsList = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(GetProcAddress(handle, "glIsList"));
-    GetTexGeniv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(GetProcAddress(handle, "glGetTexGeniv"));
-    GetTexGenfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(GetProcAddress(handle, "glGetTexGenfv"));
-    GetTexGendv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLdouble *)>(GetProcAddress(handle, "glGetTexGendv"));
-    GetTexEnviv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(GetProcAddress(handle, "glGetTexEnviv"));
-    GetTexEnvfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(GetProcAddress(handle, "glGetTexEnvfv"));
-    GetPolygonStipple = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLubyte *)>(GetProcAddress(handle, "glGetPolygonStipple"));
-    GetPixelMapusv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLushort *)>(GetProcAddress(handle, "glGetPixelMapusv"));
-    GetPixelMapuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint *)>(GetProcAddress(handle, "glGetPixelMapuiv"));
-    GetPixelMapfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat *)>(GetProcAddress(handle, "glGetPixelMapfv"));
-    GetMaterialiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(GetProcAddress(handle, "glGetMaterialiv"));
-    GetMaterialfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(GetProcAddress(handle, "glGetMaterialfv"));
-    GetMapiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(GetProcAddress(handle, "glGetMapiv"));
-    GetMapfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(GetProcAddress(handle, "glGetMapfv"));
-    GetMapdv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLdouble *)>(GetProcAddress(handle, "glGetMapdv"));
-    GetLightiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(GetProcAddress(handle, "glGetLightiv"));
-    GetLightfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(GetProcAddress(handle, "glGetLightfv"));
-    GetClipPlane = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLdouble *)>(GetProcAddress(handle, "glGetClipPlane"));
-    DrawPixels = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(GetProcAddress(handle, "glDrawPixels"));
-    CopyPixels = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLsizei , GLsizei , GLenum )>(GetProcAddress(handle, "glCopyPixels"));
-    PixelMapusv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLushort *)>(GetProcAddress(handle, "glPixelMapusv"));
-    PixelMapuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLuint *)>(GetProcAddress(handle, "glPixelMapuiv"));
-    PixelMapfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLfloat *)>(GetProcAddress(handle, "glPixelMapfv"));
-    PixelTransferi = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint )>(GetProcAddress(handle, "glPixelTransferi"));
-    PixelTransferf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat )>(GetProcAddress(handle, "glPixelTransferf"));
-    PixelZoom = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat )>(GetProcAddress(handle, "glPixelZoom"));
-    AlphaFunc = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat )>(GetProcAddress(handle, "glAlphaFunc"));
-    EvalPoint2 = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint )>(GetProcAddress(handle, "glEvalPoint2"));
-    EvalMesh2 = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint )>(GetProcAddress(handle, "glEvalMesh2"));
-    EvalPoint1 = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint )>(GetProcAddress(handle, "glEvalPoint1"));
-    EvalMesh1 = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint )>(GetProcAddress(handle, "glEvalMesh1"));
-    EvalCoord2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glEvalCoord2fv"));
-    EvalCoord2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat )>(GetProcAddress(handle, "glEvalCoord2f"));
-    EvalCoord2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glEvalCoord2dv"));
-    EvalCoord2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble )>(GetProcAddress(handle, "glEvalCoord2d"));
-    EvalCoord1fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glEvalCoord1fv"));
-    EvalCoord1f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(GetProcAddress(handle, "glEvalCoord1f"));
-    EvalCoord1dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glEvalCoord1dv"));
-    EvalCoord1d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble )>(GetProcAddress(handle, "glEvalCoord1d"));
-    MapGrid2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLfloat , GLfloat , GLint , GLfloat , GLfloat )>(GetProcAddress(handle, "glMapGrid2f"));
-    MapGrid2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLdouble , GLdouble , GLint , GLdouble , GLdouble )>(GetProcAddress(handle, "glMapGrid2d"));
-    MapGrid1f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLfloat , GLfloat )>(GetProcAddress(handle, "glMapGrid1f"));
-    MapGrid1d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLdouble , GLdouble )>(GetProcAddress(handle, "glMapGrid1d"));
-    Map2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat , GLfloat , GLint , GLint , GLfloat , GLfloat , GLint , GLint , const GLfloat *)>(GetProcAddress(handle, "glMap2f"));
-    Map2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLdouble , GLdouble , GLint , GLint , GLdouble , GLdouble , GLint , GLint , const GLdouble *)>(GetProcAddress(handle, "glMap2d"));
-    Map1f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat , GLfloat , GLint , GLint , const GLfloat *)>(GetProcAddress(handle, "glMap1f"));
-    Map1d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLdouble , GLdouble , GLint , GLint , const GLdouble *)>(GetProcAddress(handle, "glMap1d"));
-    PushAttrib = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbitfield )>(GetProcAddress(handle, "glPushAttrib"));
-    PopAttrib = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(GetProcAddress(handle, "glPopAttrib"));
-    Accum = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat )>(GetProcAddress(handle, "glAccum"));
-    IndexMask = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(GetProcAddress(handle, "glIndexMask"));
-    ClearIndex = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(GetProcAddress(handle, "glClearIndex"));
-    ClearAccum = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glClearAccum"));
-    PushName = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(GetProcAddress(handle, "glPushName"));
-    PopName = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(GetProcAddress(handle, "glPopName"));
-    PassThrough = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(GetProcAddress(handle, "glPassThrough"));
-    LoadName = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(GetProcAddress(handle, "glLoadName"));
-    InitNames = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(GetProcAddress(handle, "glInitNames"));
-    RenderMode = reinterpret_cast<GLint (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glRenderMode"));
-    SelectBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(GetProcAddress(handle, "glSelectBuffer"));
-    FeedbackBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLenum , GLfloat *)>(GetProcAddress(handle, "glFeedbackBuffer"));
-    TexGeniv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(GetProcAddress(handle, "glTexGeniv"));
-    TexGeni = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint )>(GetProcAddress(handle, "glTexGeni"));
-    TexGenfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(GetProcAddress(handle, "glTexGenfv"));
-    TexGenf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat )>(GetProcAddress(handle, "glTexGenf"));
-    TexGendv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLdouble *)>(GetProcAddress(handle, "glTexGendv"));
-    TexGend = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLdouble )>(GetProcAddress(handle, "glTexGend"));
-    TexEnviv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(GetProcAddress(handle, "glTexEnviv"));
-    TexEnvi = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint )>(GetProcAddress(handle, "glTexEnvi"));
-    TexEnvfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(GetProcAddress(handle, "glTexEnvfv"));
-    TexEnvf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat )>(GetProcAddress(handle, "glTexEnvf"));
-    ShadeModel = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glShadeModel"));
-    PolygonStipple = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLubyte *)>(GetProcAddress(handle, "glPolygonStipple"));
-    Materialiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(GetProcAddress(handle, "glMaterialiv"));
-    Materiali = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint )>(GetProcAddress(handle, "glMateriali"));
-    Materialfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(GetProcAddress(handle, "glMaterialfv"));
-    Materialf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat )>(GetProcAddress(handle, "glMaterialf"));
-    LineStipple = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLushort )>(GetProcAddress(handle, "glLineStipple"));
-    LightModeliv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLint *)>(GetProcAddress(handle, "glLightModeliv"));
-    LightModeli = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint )>(GetProcAddress(handle, "glLightModeli"));
-    LightModelfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLfloat *)>(GetProcAddress(handle, "glLightModelfv"));
-    LightModelf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat )>(GetProcAddress(handle, "glLightModelf"));
-    Lightiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(GetProcAddress(handle, "glLightiv"));
-    Lighti = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint )>(GetProcAddress(handle, "glLighti"));
-    Lightfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(GetProcAddress(handle, "glLightfv"));
-    Lightf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat )>(GetProcAddress(handle, "glLightf"));
-    Fogiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLint *)>(GetProcAddress(handle, "glFogiv"));
-    Fogi = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint )>(GetProcAddress(handle, "glFogi"));
-    Fogfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLfloat *)>(GetProcAddress(handle, "glFogfv"));
-    Fogf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat )>(GetProcAddress(handle, "glFogf"));
-    ColorMaterial = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum )>(GetProcAddress(handle, "glColorMaterial"));
-    ClipPlane = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLdouble *)>(GetProcAddress(handle, "glClipPlane"));
-    Vertex4sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(GetProcAddress(handle, "glVertex4sv"));
-    Vertex4s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort , GLshort )>(GetProcAddress(handle, "glVertex4s"));
-    Vertex4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(GetProcAddress(handle, "glVertex4iv"));
-    Vertex4i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint , GLint )>(GetProcAddress(handle, "glVertex4i"));
-    Vertex4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glVertex4fv"));
-    Vertex4f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glVertex4f"));
-    Vertex4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glVertex4dv"));
-    Vertex4d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glVertex4d"));
-    Vertex3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(GetProcAddress(handle, "glVertex3sv"));
-    Vertex3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort )>(GetProcAddress(handle, "glVertex3s"));
-    Vertex3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(GetProcAddress(handle, "glVertex3iv"));
-    Vertex3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint )>(GetProcAddress(handle, "glVertex3i"));
-    Vertex3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glVertex3fv"));
-    Vertex3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glVertex3f"));
-    Vertex3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glVertex3dv"));
-    Vertex3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glVertex3d"));
-    Vertex2sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(GetProcAddress(handle, "glVertex2sv"));
-    Vertex2s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort )>(GetProcAddress(handle, "glVertex2s"));
-    Vertex2iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(GetProcAddress(handle, "glVertex2iv"));
-    Vertex2i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint )>(GetProcAddress(handle, "glVertex2i"));
-    Vertex2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glVertex2fv"));
-    Vertex2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat )>(GetProcAddress(handle, "glVertex2f"));
-    Vertex2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glVertex2dv"));
-    Vertex2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble )>(GetProcAddress(handle, "glVertex2d"));
-    TexCoord4sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(GetProcAddress(handle, "glTexCoord4sv"));
-    TexCoord4s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort , GLshort )>(GetProcAddress(handle, "glTexCoord4s"));
-    TexCoord4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(GetProcAddress(handle, "glTexCoord4iv"));
-    TexCoord4i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint , GLint )>(GetProcAddress(handle, "glTexCoord4i"));
-    TexCoord4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glTexCoord4fv"));
-    TexCoord4f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glTexCoord4f"));
-    TexCoord4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glTexCoord4dv"));
-    TexCoord4d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glTexCoord4d"));
-    TexCoord3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(GetProcAddress(handle, "glTexCoord3sv"));
-    TexCoord3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort )>(GetProcAddress(handle, "glTexCoord3s"));
-    TexCoord3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(GetProcAddress(handle, "glTexCoord3iv"));
-    TexCoord3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint )>(GetProcAddress(handle, "glTexCoord3i"));
-    TexCoord3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glTexCoord3fv"));
-    TexCoord3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glTexCoord3f"));
-    TexCoord3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glTexCoord3dv"));
-    TexCoord3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glTexCoord3d"));
-    TexCoord2sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(GetProcAddress(handle, "glTexCoord2sv"));
-    TexCoord2s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort )>(GetProcAddress(handle, "glTexCoord2s"));
-    TexCoord2iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(GetProcAddress(handle, "glTexCoord2iv"));
-    TexCoord2i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint )>(GetProcAddress(handle, "glTexCoord2i"));
-    TexCoord2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glTexCoord2fv"));
-    TexCoord2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat )>(GetProcAddress(handle, "glTexCoord2f"));
-    TexCoord2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glTexCoord2dv"));
-    TexCoord2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble )>(GetProcAddress(handle, "glTexCoord2d"));
-    TexCoord1sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(GetProcAddress(handle, "glTexCoord1sv"));
-    TexCoord1s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort )>(GetProcAddress(handle, "glTexCoord1s"));
-    TexCoord1iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(GetProcAddress(handle, "glTexCoord1iv"));
-    TexCoord1i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint )>(GetProcAddress(handle, "glTexCoord1i"));
-    TexCoord1fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glTexCoord1fv"));
-    TexCoord1f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(GetProcAddress(handle, "glTexCoord1f"));
-    TexCoord1dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glTexCoord1dv"));
-    TexCoord1d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble )>(GetProcAddress(handle, "glTexCoord1d"));
-    Rectsv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *, const GLshort *)>(GetProcAddress(handle, "glRectsv"));
-    Rects = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort , GLshort )>(GetProcAddress(handle, "glRects"));
-    Rectiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *, const GLint *)>(GetProcAddress(handle, "glRectiv"));
-    Recti = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint , GLint )>(GetProcAddress(handle, "glRecti"));
-    Rectfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *, const GLfloat *)>(GetProcAddress(handle, "glRectfv"));
-    Rectf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glRectf"));
-    Rectdv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *, const GLdouble *)>(GetProcAddress(handle, "glRectdv"));
-    Rectd = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glRectd"));
-    RasterPos4sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(GetProcAddress(handle, "glRasterPos4sv"));
-    RasterPos4s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort , GLshort )>(GetProcAddress(handle, "glRasterPos4s"));
-    RasterPos4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(GetProcAddress(handle, "glRasterPos4iv"));
-    RasterPos4i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint , GLint )>(GetProcAddress(handle, "glRasterPos4i"));
-    RasterPos4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glRasterPos4fv"));
-    RasterPos4f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glRasterPos4f"));
-    RasterPos4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glRasterPos4dv"));
-    RasterPos4d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glRasterPos4d"));
-    RasterPos3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(GetProcAddress(handle, "glRasterPos3sv"));
-    RasterPos3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort )>(GetProcAddress(handle, "glRasterPos3s"));
-    RasterPos3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(GetProcAddress(handle, "glRasterPos3iv"));
-    RasterPos3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint )>(GetProcAddress(handle, "glRasterPos3i"));
-    RasterPos3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glRasterPos3fv"));
-    RasterPos3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glRasterPos3f"));
-    RasterPos3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glRasterPos3dv"));
-    RasterPos3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glRasterPos3d"));
-    RasterPos2sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(GetProcAddress(handle, "glRasterPos2sv"));
-    RasterPos2s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort )>(GetProcAddress(handle, "glRasterPos2s"));
-    RasterPos2iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(GetProcAddress(handle, "glRasterPos2iv"));
-    RasterPos2i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint )>(GetProcAddress(handle, "glRasterPos2i"));
-    RasterPos2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glRasterPos2fv"));
-    RasterPos2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat )>(GetProcAddress(handle, "glRasterPos2f"));
-    RasterPos2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glRasterPos2dv"));
-    RasterPos2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble )>(GetProcAddress(handle, "glRasterPos2d"));
-    Normal3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(GetProcAddress(handle, "glNormal3sv"));
-    Normal3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort )>(GetProcAddress(handle, "glNormal3s"));
-    Normal3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(GetProcAddress(handle, "glNormal3iv"));
-    Normal3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint )>(GetProcAddress(handle, "glNormal3i"));
-    Normal3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glNormal3fv"));
-    Normal3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glNormal3f"));
-    Normal3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glNormal3dv"));
-    Normal3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glNormal3d"));
-    Normal3bv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLbyte *)>(GetProcAddress(handle, "glNormal3bv"));
-    Normal3b = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbyte , GLbyte , GLbyte )>(GetProcAddress(handle, "glNormal3b"));
-    Indexsv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(GetProcAddress(handle, "glIndexsv"));
-    Indexs = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort )>(GetProcAddress(handle, "glIndexs"));
-    Indexiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(GetProcAddress(handle, "glIndexiv"));
-    Indexi = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint )>(GetProcAddress(handle, "glIndexi"));
-    Indexfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glIndexfv"));
-    Indexf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(GetProcAddress(handle, "glIndexf"));
-    Indexdv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glIndexdv"));
-    Indexd = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble )>(GetProcAddress(handle, "glIndexd"));
-    End = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(GetProcAddress(handle, "glEnd"));
-    EdgeFlagv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLboolean *)>(GetProcAddress(handle, "glEdgeFlagv"));
-    EdgeFlag = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLboolean )>(GetProcAddress(handle, "glEdgeFlag"));
-    Color4usv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLushort *)>(GetProcAddress(handle, "glColor4usv"));
-    Color4us = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLushort , GLushort , GLushort , GLushort )>(GetProcAddress(handle, "glColor4us"));
-    Color4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLuint *)>(GetProcAddress(handle, "glColor4uiv"));
-    Color4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint , GLuint )>(GetProcAddress(handle, "glColor4ui"));
-    Color4ubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLubyte *)>(GetProcAddress(handle, "glColor4ubv"));
-    Color4ub = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLubyte , GLubyte , GLubyte , GLubyte )>(GetProcAddress(handle, "glColor4ub"));
-    Color4sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(GetProcAddress(handle, "glColor4sv"));
-    Color4s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort , GLshort )>(GetProcAddress(handle, "glColor4s"));
-    Color4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(GetProcAddress(handle, "glColor4iv"));
-    Color4i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint , GLint )>(GetProcAddress(handle, "glColor4i"));
-    Color4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glColor4fv"));
-    Color4f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glColor4f"));
-    Color4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glColor4dv"));
-    Color4d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glColor4d"));
-    Color4bv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLbyte *)>(GetProcAddress(handle, "glColor4bv"));
-    Color4b = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbyte , GLbyte , GLbyte , GLbyte )>(GetProcAddress(handle, "glColor4b"));
-    Color3usv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLushort *)>(GetProcAddress(handle, "glColor3usv"));
-    Color3us = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLushort , GLushort , GLushort )>(GetProcAddress(handle, "glColor3us"));
-    Color3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLuint *)>(GetProcAddress(handle, "glColor3uiv"));
-    Color3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint )>(GetProcAddress(handle, "glColor3ui"));
-    Color3ubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLubyte *)>(GetProcAddress(handle, "glColor3ubv"));
-    Color3ub = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLubyte , GLubyte , GLubyte )>(GetProcAddress(handle, "glColor3ub"));
-    Color3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(GetProcAddress(handle, "glColor3sv"));
-    Color3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort )>(GetProcAddress(handle, "glColor3s"));
-    Color3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(GetProcAddress(handle, "glColor3iv"));
-    Color3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint )>(GetProcAddress(handle, "glColor3i"));
-    Color3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(GetProcAddress(handle, "glColor3fv"));
-    Color3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(GetProcAddress(handle, "glColor3f"));
-    Color3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(GetProcAddress(handle, "glColor3dv"));
-    Color3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(GetProcAddress(handle, "glColor3d"));
-    Color3bv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLbyte *)>(GetProcAddress(handle, "glColor3bv"));
-    Color3b = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbyte , GLbyte , GLbyte )>(GetProcAddress(handle, "glColor3b"));
-    Bitmap = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLsizei , GLfloat , GLfloat , GLfloat , GLfloat , const GLubyte *)>(GetProcAddress(handle, "glBitmap"));
-    Begin = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glBegin"));
-    ListBase = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(GetProcAddress(handle, "glListBase"));
-    GenLists = reinterpret_cast<GLuint (QOPENGLF_APIENTRYP)(GLsizei )>(GetProcAddress(handle, "glGenLists"));
-    DeleteLists = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei )>(GetProcAddress(handle, "glDeleteLists"));
-    CallLists = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLenum , const GLvoid *)>(GetProcAddress(handle, "glCallLists"));
-    CallList = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(GetProcAddress(handle, "glCallList"));
-    EndList = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(GetProcAddress(handle, "glEndList"));
-    NewList = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(GetProcAddress(handle, "glNewList"));
-#else
-    Translatef = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glTranslatef"));
-    Translated = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glTranslated"));
-    Scalef = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glScalef"));
-    Scaled = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glScaled"));
-    Rotatef = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glRotatef"));
-    Rotated = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glRotated"));
-    PushMatrix = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glPushMatrix"));
-    PopMatrix = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glPopMatrix"));
-    Ortho = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glOrtho"));
-    MultMatrixd = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glMultMatrixd"));
-    MultMatrixf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glMultMatrixf"));
-    MatrixMode = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glMatrixMode"));
-    LoadMatrixd = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glLoadMatrixd"));
-    LoadMatrixf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glLoadMatrixf"));
-    LoadIdentity = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glLoadIdentity"));
-    Frustum = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glFrustum"));
-    IsList = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsList"));
-    GetTexGeniv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetTexGeniv"));
-    GetTexGenfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(context->getProcAddress("glGetTexGenfv"));
-    GetTexGendv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLdouble *)>(context->getProcAddress("glGetTexGendv"));
-    GetTexEnviv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetTexEnviv"));
-    GetTexEnvfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(context->getProcAddress("glGetTexEnvfv"));
-    GetPolygonStipple = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLubyte *)>(context->getProcAddress("glGetPolygonStipple"));
-    GetPixelMapusv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLushort *)>(context->getProcAddress("glGetPixelMapusv"));
-    GetPixelMapuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint *)>(context->getProcAddress("glGetPixelMapuiv"));
-    GetPixelMapfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat *)>(context->getProcAddress("glGetPixelMapfv"));
-    GetMaterialiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetMaterialiv"));
-    GetMaterialfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(context->getProcAddress("glGetMaterialfv"));
-    GetMapiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetMapiv"));
-    GetMapfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(context->getProcAddress("glGetMapfv"));
-    GetMapdv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLdouble *)>(context->getProcAddress("glGetMapdv"));
-    GetLightiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetLightiv"));
-    GetLightfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(context->getProcAddress("glGetLightfv"));
-    GetClipPlane = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLdouble *)>(context->getProcAddress("glGetClipPlane"));
-    DrawPixels = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glDrawPixels"));
-    CopyPixels = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLsizei , GLsizei , GLenum )>(context->getProcAddress("glCopyPixels"));
-    PixelMapusv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLushort *)>(context->getProcAddress("glPixelMapusv"));
-    PixelMapuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLuint *)>(context->getProcAddress("glPixelMapuiv"));
-    PixelMapfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLfloat *)>(context->getProcAddress("glPixelMapfv"));
-    PixelTransferi = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint )>(context->getProcAddress("glPixelTransferi"));
-    PixelTransferf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat )>(context->getProcAddress("glPixelTransferf"));
-    PixelZoom = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat )>(context->getProcAddress("glPixelZoom"));
-    AlphaFunc = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat )>(context->getProcAddress("glAlphaFunc"));
-    EvalPoint2 = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint )>(context->getProcAddress("glEvalPoint2"));
-    EvalMesh2 = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint )>(context->getProcAddress("glEvalMesh2"));
-    EvalPoint1 = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint )>(context->getProcAddress("glEvalPoint1"));
-    EvalMesh1 = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint )>(context->getProcAddress("glEvalMesh1"));
-    EvalCoord2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glEvalCoord2fv"));
-    EvalCoord2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat )>(context->getProcAddress("glEvalCoord2f"));
-    EvalCoord2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glEvalCoord2dv"));
-    EvalCoord2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble )>(context->getProcAddress("glEvalCoord2d"));
-    EvalCoord1fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glEvalCoord1fv"));
-    EvalCoord1f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(context->getProcAddress("glEvalCoord1f"));
-    EvalCoord1dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glEvalCoord1dv"));
-    EvalCoord1d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble )>(context->getProcAddress("glEvalCoord1d"));
-    MapGrid2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLfloat , GLfloat , GLint , GLfloat , GLfloat )>(context->getProcAddress("glMapGrid2f"));
-    MapGrid2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLdouble , GLdouble , GLint , GLdouble , GLdouble )>(context->getProcAddress("glMapGrid2d"));
-    MapGrid1f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLfloat , GLfloat )>(context->getProcAddress("glMapGrid1f"));
-    MapGrid1d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLdouble , GLdouble )>(context->getProcAddress("glMapGrid1d"));
-    Map2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat , GLfloat , GLint , GLint , GLfloat , GLfloat , GLint , GLint , const GLfloat *)>(context->getProcAddress("glMap2f"));
-    Map2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLdouble , GLdouble , GLint , GLint , GLdouble , GLdouble , GLint , GLint , const GLdouble *)>(context->getProcAddress("glMap2d"));
-    Map1f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat , GLfloat , GLint , GLint , const GLfloat *)>(context->getProcAddress("glMap1f"));
-    Map1d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLdouble , GLdouble , GLint , GLint , const GLdouble *)>(context->getProcAddress("glMap1d"));
-    PushAttrib = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbitfield )>(context->getProcAddress("glPushAttrib"));
-    PopAttrib = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glPopAttrib"));
-    Accum = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat )>(context->getProcAddress("glAccum"));
-    IndexMask = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIndexMask"));
-    ClearIndex = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(context->getProcAddress("glClearIndex"));
-    ClearAccum = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glClearAccum"));
-    PushName = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glPushName"));
-    PopName = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glPopName"));
-    PassThrough = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(context->getProcAddress("glPassThrough"));
-    LoadName = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glLoadName"));
-    InitNames = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glInitNames"));
-    RenderMode = reinterpret_cast<GLint (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glRenderMode"));
-    SelectBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glSelectBuffer"));
-    FeedbackBuffer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLenum , GLfloat *)>(context->getProcAddress("glFeedbackBuffer"));
-    TexGeniv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(context->getProcAddress("glTexGeniv"));
-    TexGeni = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint )>(context->getProcAddress("glTexGeni"));
-    TexGenfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(context->getProcAddress("glTexGenfv"));
-    TexGenf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat )>(context->getProcAddress("glTexGenf"));
-    TexGendv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLdouble *)>(context->getProcAddress("glTexGendv"));
-    TexGend = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLdouble )>(context->getProcAddress("glTexGend"));
-    TexEnviv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(context->getProcAddress("glTexEnviv"));
-    TexEnvi = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint )>(context->getProcAddress("glTexEnvi"));
-    TexEnvfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(context->getProcAddress("glTexEnvfv"));
-    TexEnvf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat )>(context->getProcAddress("glTexEnvf"));
-    ShadeModel = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glShadeModel"));
-    PolygonStipple = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLubyte *)>(context->getProcAddress("glPolygonStipple"));
-    Materialiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(context->getProcAddress("glMaterialiv"));
-    Materiali = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint )>(context->getProcAddress("glMateriali"));
-    Materialfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(context->getProcAddress("glMaterialfv"));
-    Materialf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat )>(context->getProcAddress("glMaterialf"));
-    LineStipple = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLushort )>(context->getProcAddress("glLineStipple"));
-    LightModeliv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLint *)>(context->getProcAddress("glLightModeliv"));
-    LightModeli = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint )>(context->getProcAddress("glLightModeli"));
-    LightModelfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLfloat *)>(context->getProcAddress("glLightModelfv"));
-    LightModelf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat )>(context->getProcAddress("glLightModelf"));
-    Lightiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(context->getProcAddress("glLightiv"));
-    Lighti = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint )>(context->getProcAddress("glLighti"));
-    Lightfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(context->getProcAddress("glLightfv"));
-    Lightf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat )>(context->getProcAddress("glLightf"));
-    Fogiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLint *)>(context->getProcAddress("glFogiv"));
-    Fogi = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint )>(context->getProcAddress("glFogi"));
-    Fogfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLfloat *)>(context->getProcAddress("glFogfv"));
-    Fogf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat )>(context->getProcAddress("glFogf"));
-    ColorMaterial = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum )>(context->getProcAddress("glColorMaterial"));
-    ClipPlane = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLdouble *)>(context->getProcAddress("glClipPlane"));
-    Vertex4sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glVertex4sv"));
-    Vertex4s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort , GLshort )>(context->getProcAddress("glVertex4s"));
-    Vertex4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glVertex4iv"));
-    Vertex4i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint , GLint )>(context->getProcAddress("glVertex4i"));
-    Vertex4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glVertex4fv"));
-    Vertex4f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glVertex4f"));
-    Vertex4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glVertex4dv"));
-    Vertex4d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glVertex4d"));
-    Vertex3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glVertex3sv"));
-    Vertex3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort )>(context->getProcAddress("glVertex3s"));
-    Vertex3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glVertex3iv"));
-    Vertex3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint )>(context->getProcAddress("glVertex3i"));
-    Vertex3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glVertex3fv"));
-    Vertex3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glVertex3f"));
-    Vertex3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glVertex3dv"));
-    Vertex3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glVertex3d"));
-    Vertex2sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glVertex2sv"));
-    Vertex2s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort )>(context->getProcAddress("glVertex2s"));
-    Vertex2iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glVertex2iv"));
-    Vertex2i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint )>(context->getProcAddress("glVertex2i"));
-    Vertex2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glVertex2fv"));
-    Vertex2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat )>(context->getProcAddress("glVertex2f"));
-    Vertex2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glVertex2dv"));
-    Vertex2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble )>(context->getProcAddress("glVertex2d"));
-    TexCoord4sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glTexCoord4sv"));
-    TexCoord4s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort , GLshort )>(context->getProcAddress("glTexCoord4s"));
-    TexCoord4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glTexCoord4iv"));
-    TexCoord4i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint , GLint )>(context->getProcAddress("glTexCoord4i"));
-    TexCoord4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glTexCoord4fv"));
-    TexCoord4f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glTexCoord4f"));
-    TexCoord4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glTexCoord4dv"));
-    TexCoord4d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glTexCoord4d"));
-    TexCoord3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glTexCoord3sv"));
-    TexCoord3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort )>(context->getProcAddress("glTexCoord3s"));
-    TexCoord3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glTexCoord3iv"));
-    TexCoord3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint )>(context->getProcAddress("glTexCoord3i"));
-    TexCoord3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glTexCoord3fv"));
-    TexCoord3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glTexCoord3f"));
-    TexCoord3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glTexCoord3dv"));
-    TexCoord3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glTexCoord3d"));
-    TexCoord2sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glTexCoord2sv"));
-    TexCoord2s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort )>(context->getProcAddress("glTexCoord2s"));
-    TexCoord2iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glTexCoord2iv"));
-    TexCoord2i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint )>(context->getProcAddress("glTexCoord2i"));
-    TexCoord2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glTexCoord2fv"));
-    TexCoord2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat )>(context->getProcAddress("glTexCoord2f"));
-    TexCoord2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glTexCoord2dv"));
-    TexCoord2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble )>(context->getProcAddress("glTexCoord2d"));
-    TexCoord1sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glTexCoord1sv"));
-    TexCoord1s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort )>(context->getProcAddress("glTexCoord1s"));
-    TexCoord1iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glTexCoord1iv"));
-    TexCoord1i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint )>(context->getProcAddress("glTexCoord1i"));
-    TexCoord1fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glTexCoord1fv"));
-    TexCoord1f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(context->getProcAddress("glTexCoord1f"));
-    TexCoord1dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glTexCoord1dv"));
-    TexCoord1d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble )>(context->getProcAddress("glTexCoord1d"));
-    Rectsv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *, const GLshort *)>(context->getProcAddress("glRectsv"));
-    Rects = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort , GLshort )>(context->getProcAddress("glRects"));
-    Rectiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *, const GLint *)>(context->getProcAddress("glRectiv"));
-    Recti = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint , GLint )>(context->getProcAddress("glRecti"));
-    Rectfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *, const GLfloat *)>(context->getProcAddress("glRectfv"));
-    Rectf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glRectf"));
-    Rectdv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *, const GLdouble *)>(context->getProcAddress("glRectdv"));
-    Rectd = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glRectd"));
-    RasterPos4sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glRasterPos4sv"));
-    RasterPos4s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort , GLshort )>(context->getProcAddress("glRasterPos4s"));
-    RasterPos4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glRasterPos4iv"));
-    RasterPos4i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint , GLint )>(context->getProcAddress("glRasterPos4i"));
-    RasterPos4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glRasterPos4fv"));
-    RasterPos4f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glRasterPos4f"));
-    RasterPos4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glRasterPos4dv"));
-    RasterPos4d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glRasterPos4d"));
-    RasterPos3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glRasterPos3sv"));
-    RasterPos3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort )>(context->getProcAddress("glRasterPos3s"));
-    RasterPos3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glRasterPos3iv"));
-    RasterPos3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint )>(context->getProcAddress("glRasterPos3i"));
-    RasterPos3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glRasterPos3fv"));
-    RasterPos3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glRasterPos3f"));
-    RasterPos3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glRasterPos3dv"));
-    RasterPos3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glRasterPos3d"));
-    RasterPos2sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glRasterPos2sv"));
-    RasterPos2s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort )>(context->getProcAddress("glRasterPos2s"));
-    RasterPos2iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glRasterPos2iv"));
-    RasterPos2i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint )>(context->getProcAddress("glRasterPos2i"));
-    RasterPos2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glRasterPos2fv"));
-    RasterPos2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat )>(context->getProcAddress("glRasterPos2f"));
-    RasterPos2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glRasterPos2dv"));
-    RasterPos2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble )>(context->getProcAddress("glRasterPos2d"));
-    Normal3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glNormal3sv"));
-    Normal3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort )>(context->getProcAddress("glNormal3s"));
-    Normal3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glNormal3iv"));
-    Normal3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint )>(context->getProcAddress("glNormal3i"));
-    Normal3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glNormal3fv"));
-    Normal3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glNormal3f"));
-    Normal3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glNormal3dv"));
-    Normal3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glNormal3d"));
-    Normal3bv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLbyte *)>(context->getProcAddress("glNormal3bv"));
-    Normal3b = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbyte , GLbyte , GLbyte )>(context->getProcAddress("glNormal3b"));
-    Indexsv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glIndexsv"));
-    Indexs = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort )>(context->getProcAddress("glIndexs"));
-    Indexiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glIndexiv"));
-    Indexi = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint )>(context->getProcAddress("glIndexi"));
-    Indexfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glIndexfv"));
-    Indexf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(context->getProcAddress("glIndexf"));
-    Indexdv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glIndexdv"));
-    Indexd = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble )>(context->getProcAddress("glIndexd"));
-    End = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glEnd"));
-    EdgeFlagv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLboolean *)>(context->getProcAddress("glEdgeFlagv"));
-    EdgeFlag = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLboolean )>(context->getProcAddress("glEdgeFlag"));
-    Color4usv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLushort *)>(context->getProcAddress("glColor4usv"));
-    Color4us = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLushort , GLushort , GLushort , GLushort )>(context->getProcAddress("glColor4us"));
-    Color4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLuint *)>(context->getProcAddress("glColor4uiv"));
-    Color4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint , GLuint )>(context->getProcAddress("glColor4ui"));
-    Color4ubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLubyte *)>(context->getProcAddress("glColor4ubv"));
-    Color4ub = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLubyte , GLubyte , GLubyte , GLubyte )>(context->getProcAddress("glColor4ub"));
-    Color4sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glColor4sv"));
-    Color4s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort , GLshort )>(context->getProcAddress("glColor4s"));
-    Color4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glColor4iv"));
-    Color4i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint , GLint )>(context->getProcAddress("glColor4i"));
-    Color4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glColor4fv"));
-    Color4f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glColor4f"));
-    Color4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glColor4dv"));
-    Color4d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glColor4d"));
-    Color4bv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLbyte *)>(context->getProcAddress("glColor4bv"));
-    Color4b = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbyte , GLbyte , GLbyte , GLbyte )>(context->getProcAddress("glColor4b"));
-    Color3usv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLushort *)>(context->getProcAddress("glColor3usv"));
-    Color3us = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLushort , GLushort , GLushort )>(context->getProcAddress("glColor3us"));
-    Color3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLuint *)>(context->getProcAddress("glColor3uiv"));
-    Color3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint )>(context->getProcAddress("glColor3ui"));
-    Color3ubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLubyte *)>(context->getProcAddress("glColor3ubv"));
-    Color3ub = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLubyte , GLubyte , GLubyte )>(context->getProcAddress("glColor3ub"));
-    Color3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glColor3sv"));
-    Color3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort )>(context->getProcAddress("glColor3s"));
-    Color3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glColor3iv"));
-    Color3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint )>(context->getProcAddress("glColor3i"));
-    Color3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glColor3fv"));
-    Color3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glColor3f"));
-    Color3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glColor3dv"));
-    Color3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glColor3d"));
-    Color3bv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLbyte *)>(context->getProcAddress("glColor3bv"));
-    Color3b = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbyte , GLbyte , GLbyte )>(context->getProcAddress("glColor3b"));
-    Bitmap = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLsizei , GLfloat , GLfloat , GLfloat , GLfloat , const GLubyte *)>(context->getProcAddress("glBitmap"));
-    Begin = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glBegin"));
-    ListBase = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glListBase"));
-    GenLists = reinterpret_cast<GLuint (QOPENGLF_APIENTRYP)(GLsizei )>(context->getProcAddress("glGenLists"));
-    DeleteLists = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLsizei )>(context->getProcAddress("glDeleteLists"));
-    CallLists = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLenum , const GLvoid *)>(context->getProcAddress("glCallLists"));
-    CallList = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glCallList"));
-    EndList = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glEndList"));
-    NewList = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress("glNewList"));
-#endif
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_1_0_DeprecatedBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(1, 0, QOpenGLVersionStatus::DeprecatedStatus);
-}
-
-QOpenGLFunctions_1_1_DeprecatedBackend::QOpenGLFunctions_1_1_DeprecatedBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 1.1 deprecated functions
-#if defined(Q_OS_WIN)
-    HMODULE handle = static_cast<HMODULE>(QOpenGLContext::openGLModuleHandle());
-    if (!handle)
-        handle = GetModuleHandleA("opengl32.dll");
-    PushClientAttrib = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbitfield )>(GetProcAddress(handle, "glPushClientAttrib"));
-    PopClientAttrib = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(GetProcAddress(handle, "glPopClientAttrib"));
-    Indexubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLubyte *)>(GetProcAddress(handle, "glIndexubv"));
-    Indexub = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLubyte )>(GetProcAddress(handle, "glIndexub"));
-    PrioritizeTextures = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *, const GLfloat *)>(GetProcAddress(handle, "glPrioritizeTextures"));
-    AreTexturesResident = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *, GLboolean *)>(GetProcAddress(handle, "glAreTexturesResident"));
-    VertexPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLenum , GLsizei , const GLvoid *)>(GetProcAddress(handle, "glVertexPointer"));
-    TexCoordPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLenum , GLsizei , const GLvoid *)>(GetProcAddress(handle, "glTexCoordPointer"));
-    NormalPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLvoid *)>(GetProcAddress(handle, "glNormalPointer"));
-    InterleavedArrays = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLvoid *)>(GetProcAddress(handle, "glInterleavedArrays"));
-    GetPointerv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLvoid * *)>(GetProcAddress(handle, "glGetPointerv"));
-    IndexPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLvoid *)>(GetProcAddress(handle, "glIndexPointer"));
-    EnableClientState = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glEnableClientState"));
-    EdgeFlagPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLvoid *)>(GetProcAddress(handle, "glEdgeFlagPointer"));
-    DisableClientState = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(GetProcAddress(handle, "glDisableClientState"));
-    ColorPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLenum , GLsizei , const GLvoid *)>(GetProcAddress(handle, "glColorPointer"));
-    ArrayElement = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint )>(GetProcAddress(handle, "glArrayElement"));
-#else
-    PushClientAttrib = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbitfield )>(context->getProcAddress("glPushClientAttrib"));
-    PopClientAttrib = reinterpret_cast<void (QOPENGLF_APIENTRYP)()>(context->getProcAddress("glPopClientAttrib"));
-    Indexubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLubyte *)>(context->getProcAddress("glIndexubv"));
-    Indexub = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLubyte )>(context->getProcAddress("glIndexub"));
-    PrioritizeTextures = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *, const GLfloat *)>(context->getProcAddress("glPrioritizeTextures"));
-    AreTexturesResident = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *, GLboolean *)>(context->getProcAddress("glAreTexturesResident"));
-    VertexPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glVertexPointer"));
-    TexCoordPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glTexCoordPointer"));
-    NormalPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glNormalPointer"));
-    InterleavedArrays = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glInterleavedArrays"));
-    GetPointerv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLvoid * *)>(context->getProcAddress("glGetPointerv"));
-    IndexPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glIndexPointer"));
-    EnableClientState = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glEnableClientState"));
-    EdgeFlagPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLvoid *)>(context->getProcAddress("glEdgeFlagPointer"));
-    DisableClientState = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glDisableClientState"));
-    ColorPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glColorPointer"));
-    ArrayElement = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint )>(context->getProcAddress("glArrayElement"));
-#endif
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_1_1_DeprecatedBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(1, 1, QOpenGLVersionStatus::DeprecatedStatus);
-}
-
-QOpenGLFunctions_1_2_DeprecatedBackend::QOpenGLFunctions_1_2_DeprecatedBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 1.2 deprecated functions
-    ResetMinmax = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glResetMinmax"));
-    ResetHistogram = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glResetHistogram"));
-    Minmax = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLboolean )>(context->getProcAddress("glMinmax"));
-    Histogram = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLenum , GLboolean )>(context->getProcAddress("glHistogram"));
-    GetMinmaxParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetMinmaxParameteriv"));
-    GetMinmaxParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(context->getProcAddress("glGetMinmaxParameterfv"));
-    GetMinmax = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLboolean , GLenum , GLenum , GLvoid *)>(context->getProcAddress("glGetMinmax"));
-    GetHistogramParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetHistogramParameteriv"));
-    GetHistogramParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(context->getProcAddress("glGetHistogramParameterfv"));
-    GetHistogram = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLboolean , GLenum , GLenum , GLvoid *)>(context->getProcAddress("glGetHistogram"));
-    SeparableFilter2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *, const GLvoid *)>(context->getProcAddress("glSeparableFilter2D"));
-    GetSeparableFilter = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLvoid *, GLvoid *, GLvoid *)>(context->getProcAddress("glGetSeparableFilter"));
-    GetConvolutionParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetConvolutionParameteriv"));
-    GetConvolutionParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(context->getProcAddress("glGetConvolutionParameterfv"));
-    GetConvolutionFilter = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLvoid *)>(context->getProcAddress("glGetConvolutionFilter"));
-    CopyConvolutionFilter2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint , GLint , GLsizei , GLsizei )>(context->getProcAddress("glCopyConvolutionFilter2D"));
-    CopyConvolutionFilter1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint , GLint , GLsizei )>(context->getProcAddress("glCopyConvolutionFilter1D"));
-    ConvolutionParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(context->getProcAddress("glConvolutionParameteriv"));
-    ConvolutionParameteri = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint )>(context->getProcAddress("glConvolutionParameteri"));
-    ConvolutionParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(context->getProcAddress("glConvolutionParameterfv"));
-    ConvolutionParameterf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat )>(context->getProcAddress("glConvolutionParameterf"));
-    ConvolutionFilter2D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glConvolutionFilter2D"));
-    ConvolutionFilter1D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glConvolutionFilter1D"));
-    CopyColorSubTable = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLint , GLint , GLsizei )>(context->getProcAddress("glCopyColorSubTable"));
-    ColorSubTable = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glColorSubTable"));
-    GetColorTableParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetColorTableParameteriv"));
-    GetColorTableParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLfloat *)>(context->getProcAddress("glGetColorTableParameterfv"));
-    GetColorTable = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLvoid *)>(context->getProcAddress("glGetColorTable"));
-    CopyColorTable = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint , GLint , GLsizei )>(context->getProcAddress("glCopyColorTable"));
-    ColorTableParameteriv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLint *)>(context->getProcAddress("glColorTableParameteriv"));
-    ColorTableParameterfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLfloat *)>(context->getProcAddress("glColorTableParameterfv"));
-    ColorTable = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLsizei , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glColorTable"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_1_2_DeprecatedBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(1, 2, QOpenGLVersionStatus::DeprecatedStatus);
-}
-
-QOpenGLFunctions_1_3_DeprecatedBackend::QOpenGLFunctions_1_3_DeprecatedBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 1.3 deprecated functions
-    MultTransposeMatrixd = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glMultTransposeMatrixd"));
-    MultTransposeMatrixf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glMultTransposeMatrixf"));
-    LoadTransposeMatrixd = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glLoadTransposeMatrixd"));
-    LoadTransposeMatrixf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glLoadTransposeMatrixf"));
-    MultiTexCoord4sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLshort *)>(context->getProcAddress("glMultiTexCoord4sv"));
-    MultiTexCoord4s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLshort , GLshort , GLshort , GLshort )>(context->getProcAddress("glMultiTexCoord4s"));
-    MultiTexCoord4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLint *)>(context->getProcAddress("glMultiTexCoord4iv"));
-    MultiTexCoord4i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint , GLint )>(context->getProcAddress("glMultiTexCoord4i"));
-    MultiTexCoord4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLfloat *)>(context->getProcAddress("glMultiTexCoord4fv"));
-    MultiTexCoord4f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glMultiTexCoord4f"));
-    MultiTexCoord4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLdouble *)>(context->getProcAddress("glMultiTexCoord4dv"));
-    MultiTexCoord4d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLdouble , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glMultiTexCoord4d"));
-    MultiTexCoord3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLshort *)>(context->getProcAddress("glMultiTexCoord3sv"));
-    MultiTexCoord3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLshort , GLshort , GLshort )>(context->getProcAddress("glMultiTexCoord3s"));
-    MultiTexCoord3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLint *)>(context->getProcAddress("glMultiTexCoord3iv"));
-    MultiTexCoord3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLint )>(context->getProcAddress("glMultiTexCoord3i"));
-    MultiTexCoord3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLfloat *)>(context->getProcAddress("glMultiTexCoord3fv"));
-    MultiTexCoord3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glMultiTexCoord3f"));
-    MultiTexCoord3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLdouble *)>(context->getProcAddress("glMultiTexCoord3dv"));
-    MultiTexCoord3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glMultiTexCoord3d"));
-    MultiTexCoord2sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLshort *)>(context->getProcAddress("glMultiTexCoord2sv"));
-    MultiTexCoord2s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLshort , GLshort )>(context->getProcAddress("glMultiTexCoord2s"));
-    MultiTexCoord2iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLint *)>(context->getProcAddress("glMultiTexCoord2iv"));
-    MultiTexCoord2i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint )>(context->getProcAddress("glMultiTexCoord2i"));
-    MultiTexCoord2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLfloat *)>(context->getProcAddress("glMultiTexCoord2fv"));
-    MultiTexCoord2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat , GLfloat )>(context->getProcAddress("glMultiTexCoord2f"));
-    MultiTexCoord2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLdouble *)>(context->getProcAddress("glMultiTexCoord2dv"));
-    MultiTexCoord2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLdouble , GLdouble )>(context->getProcAddress("glMultiTexCoord2d"));
-    MultiTexCoord1sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLshort *)>(context->getProcAddress("glMultiTexCoord1sv"));
-    MultiTexCoord1s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLshort )>(context->getProcAddress("glMultiTexCoord1s"));
-    MultiTexCoord1iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLint *)>(context->getProcAddress("glMultiTexCoord1iv"));
-    MultiTexCoord1i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint )>(context->getProcAddress("glMultiTexCoord1i"));
-    MultiTexCoord1fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLfloat *)>(context->getProcAddress("glMultiTexCoord1fv"));
-    MultiTexCoord1f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLfloat )>(context->getProcAddress("glMultiTexCoord1f"));
-    MultiTexCoord1dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLdouble *)>(context->getProcAddress("glMultiTexCoord1dv"));
-    MultiTexCoord1d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLdouble )>(context->getProcAddress("glMultiTexCoord1d"));
-    ClientActiveTexture = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glClientActiveTexture"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_1_3_DeprecatedBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(1, 3, QOpenGLVersionStatus::DeprecatedStatus);
-}
-
-QOpenGLFunctions_1_4_DeprecatedBackend::QOpenGLFunctions_1_4_DeprecatedBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 1.4 deprecated functions
-    WindowPos3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glWindowPos3sv"));
-    WindowPos3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort )>(context->getProcAddress("glWindowPos3s"));
-    WindowPos3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glWindowPos3iv"));
-    WindowPos3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint )>(context->getProcAddress("glWindowPos3i"));
-    WindowPos3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glWindowPos3fv"));
-    WindowPos3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glWindowPos3f"));
-    WindowPos3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glWindowPos3dv"));
-    WindowPos3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glWindowPos3d"));
-    WindowPos2sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glWindowPos2sv"));
-    WindowPos2s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort )>(context->getProcAddress("glWindowPos2s"));
-    WindowPos2iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glWindowPos2iv"));
-    WindowPos2i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint )>(context->getProcAddress("glWindowPos2i"));
-    WindowPos2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glWindowPos2fv"));
-    WindowPos2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat )>(context->getProcAddress("glWindowPos2f"));
-    WindowPos2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glWindowPos2dv"));
-    WindowPos2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble )>(context->getProcAddress("glWindowPos2d"));
-    SecondaryColorPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glSecondaryColorPointer"));
-    SecondaryColor3usv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLushort *)>(context->getProcAddress("glSecondaryColor3usv"));
-    SecondaryColor3us = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLushort , GLushort , GLushort )>(context->getProcAddress("glSecondaryColor3us"));
-    SecondaryColor3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLuint *)>(context->getProcAddress("glSecondaryColor3uiv"));
-    SecondaryColor3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint )>(context->getProcAddress("glSecondaryColor3ui"));
-    SecondaryColor3ubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLubyte *)>(context->getProcAddress("glSecondaryColor3ubv"));
-    SecondaryColor3ub = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLubyte , GLubyte , GLubyte )>(context->getProcAddress("glSecondaryColor3ub"));
-    SecondaryColor3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLshort *)>(context->getProcAddress("glSecondaryColor3sv"));
-    SecondaryColor3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLshort , GLshort , GLshort )>(context->getProcAddress("glSecondaryColor3s"));
-    SecondaryColor3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLint *)>(context->getProcAddress("glSecondaryColor3iv"));
-    SecondaryColor3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLint , GLint , GLint )>(context->getProcAddress("glSecondaryColor3i"));
-    SecondaryColor3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glSecondaryColor3fv"));
-    SecondaryColor3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glSecondaryColor3f"));
-    SecondaryColor3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glSecondaryColor3dv"));
-    SecondaryColor3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glSecondaryColor3d"));
-    SecondaryColor3bv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLbyte *)>(context->getProcAddress("glSecondaryColor3bv"));
-    SecondaryColor3b = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLbyte , GLbyte , GLbyte )>(context->getProcAddress("glSecondaryColor3b"));
-    FogCoordPointer = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , const GLvoid *)>(context->getProcAddress("glFogCoordPointer"));
-    FogCoorddv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLdouble *)>(context->getProcAddress("glFogCoorddv"));
-    FogCoordd = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLdouble )>(context->getProcAddress("glFogCoordd"));
-    FogCoordfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(const GLfloat *)>(context->getProcAddress("glFogCoordfv"));
-    FogCoordf = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLfloat )>(context->getProcAddress("glFogCoordf"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_1_4_DeprecatedBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(1, 4, QOpenGLVersionStatus::DeprecatedStatus);
-}
-
-QOpenGLFunctions_2_0_DeprecatedBackend::QOpenGLFunctions_2_0_DeprecatedBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 2.0 deprecated functions
-    VertexAttrib4usv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLushort *)>(context->getProcAddress("glVertexAttrib4usv"));
-    VertexAttrib4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLuint *)>(context->getProcAddress("glVertexAttrib4uiv"));
-    VertexAttrib4ubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLubyte *)>(context->getProcAddress("glVertexAttrib4ubv"));
-    VertexAttrib4sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLshort *)>(context->getProcAddress("glVertexAttrib4sv"));
-    VertexAttrib4s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLshort , GLshort , GLshort , GLshort )>(context->getProcAddress("glVertexAttrib4s"));
-    VertexAttrib4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLint *)>(context->getProcAddress("glVertexAttrib4iv"));
-    VertexAttrib4fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLfloat *)>(context->getProcAddress("glVertexAttrib4fv"));
-    VertexAttrib4f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLfloat , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glVertexAttrib4f"));
-    VertexAttrib4dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLdouble *)>(context->getProcAddress("glVertexAttrib4dv"));
-    VertexAttrib4d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLdouble , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glVertexAttrib4d"));
-    VertexAttrib4bv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLbyte *)>(context->getProcAddress("glVertexAttrib4bv"));
-    VertexAttrib4Nusv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLushort *)>(context->getProcAddress("glVertexAttrib4Nusv"));
-    VertexAttrib4Nuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLuint *)>(context->getProcAddress("glVertexAttrib4Nuiv"));
-    VertexAttrib4Nubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLubyte *)>(context->getProcAddress("glVertexAttrib4Nubv"));
-    VertexAttrib4Nub = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLubyte , GLubyte , GLubyte , GLubyte )>(context->getProcAddress("glVertexAttrib4Nub"));
-    VertexAttrib4Nsv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLshort *)>(context->getProcAddress("glVertexAttrib4Nsv"));
-    VertexAttrib4Niv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLint *)>(context->getProcAddress("glVertexAttrib4Niv"));
-    VertexAttrib4Nbv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLbyte *)>(context->getProcAddress("glVertexAttrib4Nbv"));
-    VertexAttrib3sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLshort *)>(context->getProcAddress("glVertexAttrib3sv"));
-    VertexAttrib3s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLshort , GLshort , GLshort )>(context->getProcAddress("glVertexAttrib3s"));
-    VertexAttrib3fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLfloat *)>(context->getProcAddress("glVertexAttrib3fv"));
-    VertexAttrib3f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLfloat , GLfloat , GLfloat )>(context->getProcAddress("glVertexAttrib3f"));
-    VertexAttrib3dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLdouble *)>(context->getProcAddress("glVertexAttrib3dv"));
-    VertexAttrib3d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLdouble , GLdouble , GLdouble )>(context->getProcAddress("glVertexAttrib3d"));
-    VertexAttrib2sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLshort *)>(context->getProcAddress("glVertexAttrib2sv"));
-    VertexAttrib2s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLshort , GLshort )>(context->getProcAddress("glVertexAttrib2s"));
-    VertexAttrib2fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLfloat *)>(context->getProcAddress("glVertexAttrib2fv"));
-    VertexAttrib2f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLfloat , GLfloat )>(context->getProcAddress("glVertexAttrib2f"));
-    VertexAttrib2dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLdouble *)>(context->getProcAddress("glVertexAttrib2dv"));
-    VertexAttrib2d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLdouble , GLdouble )>(context->getProcAddress("glVertexAttrib2d"));
-    VertexAttrib1sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLshort *)>(context->getProcAddress("glVertexAttrib1sv"));
-    VertexAttrib1s = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLshort )>(context->getProcAddress("glVertexAttrib1s"));
-    VertexAttrib1fv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLfloat *)>(context->getProcAddress("glVertexAttrib1fv"));
-    VertexAttrib1f = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLfloat )>(context->getProcAddress("glVertexAttrib1f"));
-    VertexAttrib1dv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLdouble *)>(context->getProcAddress("glVertexAttrib1dv"));
-    VertexAttrib1d = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLdouble )>(context->getProcAddress("glVertexAttrib1d"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_2_0_DeprecatedBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(2, 0, QOpenGLVersionStatus::DeprecatedStatus);
-}
-
-QOpenGLFunctions_3_0_DeprecatedBackend::QOpenGLFunctions_3_0_DeprecatedBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 3.0 deprecated functions
-    VertexAttribI4usv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLushort *)>(context->getProcAddress("glVertexAttribI4usv"));
-    VertexAttribI4ubv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLubyte *)>(context->getProcAddress("glVertexAttribI4ubv"));
-    VertexAttribI4sv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLshort *)>(context->getProcAddress("glVertexAttribI4sv"));
-    VertexAttribI4bv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLbyte *)>(context->getProcAddress("glVertexAttribI4bv"));
-    VertexAttribI4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLuint *)>(context->getProcAddress("glVertexAttribI4uiv"));
-    VertexAttribI3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLuint *)>(context->getProcAddress("glVertexAttribI3uiv"));
-    VertexAttribI2uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLuint *)>(context->getProcAddress("glVertexAttribI2uiv"));
-    VertexAttribI1uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLuint *)>(context->getProcAddress("glVertexAttribI1uiv"));
-    VertexAttribI4iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLint *)>(context->getProcAddress("glVertexAttribI4iv"));
-    VertexAttribI3iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLint *)>(context->getProcAddress("glVertexAttribI3iv"));
-    VertexAttribI2iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLint *)>(context->getProcAddress("glVertexAttribI2iv"));
-    VertexAttribI1iv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , const GLint *)>(context->getProcAddress("glVertexAttribI1iv"));
-    VertexAttribI4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint , GLuint , GLuint )>(context->getProcAddress("glVertexAttribI4ui"));
-    VertexAttribI3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint , GLuint )>(context->getProcAddress("glVertexAttribI3ui"));
-    VertexAttribI2ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint , GLuint )>(context->getProcAddress("glVertexAttribI2ui"));
-    VertexAttribI1ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLuint )>(context->getProcAddress("glVertexAttribI1ui"));
-    VertexAttribI4i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint , GLint )>(context->getProcAddress("glVertexAttribI4i"));
-    VertexAttribI3i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint , GLint )>(context->getProcAddress("glVertexAttribI3i"));
-    VertexAttribI2i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint , GLint )>(context->getProcAddress("glVertexAttribI2i"));
-    VertexAttribI1i = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLint )>(context->getProcAddress("glVertexAttribI1i"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_3_0_DeprecatedBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(3, 0, QOpenGLVersionStatus::DeprecatedStatus);
-}
-
-QOpenGLFunctions_3_3_DeprecatedBackend::QOpenGLFunctions_3_3_DeprecatedBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 3.3 deprecated functions
-    SecondaryColorP3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glSecondaryColorP3uiv"));
-    SecondaryColorP3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glSecondaryColorP3ui"));
-    ColorP4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glColorP4uiv"));
-    ColorP4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glColorP4ui"));
-    ColorP3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glColorP3uiv"));
-    ColorP3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glColorP3ui"));
-    NormalP3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glNormalP3uiv"));
-    NormalP3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glNormalP3ui"));
-    MultiTexCoordP4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLuint *)>(context->getProcAddress("glMultiTexCoordP4uiv"));
-    MultiTexCoordP4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint )>(context->getProcAddress("glMultiTexCoordP4ui"));
-    MultiTexCoordP3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLuint *)>(context->getProcAddress("glMultiTexCoordP3uiv"));
-    MultiTexCoordP3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint )>(context->getProcAddress("glMultiTexCoordP3ui"));
-    MultiTexCoordP2uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLuint *)>(context->getProcAddress("glMultiTexCoordP2uiv"));
-    MultiTexCoordP2ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint )>(context->getProcAddress("glMultiTexCoordP2ui"));
-    MultiTexCoordP1uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , const GLuint *)>(context->getProcAddress("glMultiTexCoordP1uiv"));
-    MultiTexCoordP1ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLuint )>(context->getProcAddress("glMultiTexCoordP1ui"));
-    TexCoordP4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glTexCoordP4uiv"));
-    TexCoordP4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glTexCoordP4ui"));
-    TexCoordP3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glTexCoordP3uiv"));
-    TexCoordP3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glTexCoordP3ui"));
-    TexCoordP2uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glTexCoordP2uiv"));
-    TexCoordP2ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glTexCoordP2ui"));
-    TexCoordP1uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glTexCoordP1uiv"));
-    TexCoordP1ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glTexCoordP1ui"));
-    VertexP4uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glVertexP4uiv"));
-    VertexP4ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glVertexP4ui"));
-    VertexP3uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glVertexP3uiv"));
-    VertexP3ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glVertexP3ui"));
-    VertexP2uiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , const GLuint *)>(context->getProcAddress("glVertexP2uiv"));
-    VertexP2ui = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glVertexP2ui"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_3_3_DeprecatedBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(3, 3, QOpenGLVersionStatus::DeprecatedStatus);
-}
-
-QOpenGLFunctions_4_5_DeprecatedBackend::QOpenGLFunctions_4_5_DeprecatedBackend(QOpenGLContext *context)
-    : QOpenGLVersionFunctionsBackend(context)
-{
-    // OpenGL 4.5 deprecated functions
-    GetnMinmax = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLboolean , GLenum , GLenum , GLsizei , void *)>(context->getProcAddress("glGetnMinmax"));
-    GetnHistogram = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLboolean , GLenum , GLenum , GLsizei , void *)>(context->getProcAddress("glGetnHistogram"));
-    GetnSeparableFilter = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLsizei , void *, GLsizei , void *, void *)>(context->getProcAddress("glGetnSeparableFilter"));
-    GetnConvolutionFilter = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLsizei , void *)>(context->getProcAddress("glGetnConvolutionFilter"));
-    GetnColorTable = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLenum , GLsizei , void *)>(context->getProcAddress("glGetnColorTable"));
-    GetnPolygonStipple = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLubyte *)>(context->getProcAddress("glGetnPolygonStipple"));
-    GetnPixelMapusv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLushort *)>(context->getProcAddress("glGetnPixelMapusv"));
-    GetnPixelMapuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLuint *)>(context->getProcAddress("glGetnPixelMapuiv"));
-    GetnPixelMapfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLsizei , GLfloat *)>(context->getProcAddress("glGetnPixelMapfv"));
-    GetnMapiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLsizei , GLint *)>(context->getProcAddress("glGetnMapiv"));
-    GetnMapfv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLsizei , GLfloat *)>(context->getProcAddress("glGetnMapfv"));
-    GetnMapdv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLsizei , GLdouble *)>(context->getProcAddress("glGetnMapdv"));
-
-}
-
-QOpenGLVersionStatus QOpenGLFunctions_4_5_DeprecatedBackend::versionStatus()
-{
-    return QOpenGLVersionStatus(4, 5, QOpenGLVersionStatus::DeprecatedStatus);
-}
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_1_0_CoreBackend, QT_OPENGL_1_0_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_1_1_CoreBackend, QT_OPENGL_1_1_FUNCTIONS)
+
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_1_2_CoreBackend, QT_OPENGL_1_2_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_1_3_CoreBackend, QT_OPENGL_1_3_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_1_4_CoreBackend, QT_OPENGL_1_4_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_1_5_CoreBackend, QT_OPENGL_1_5_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_2_0_CoreBackend, QT_OPENGL_2_0_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_2_1_CoreBackend, QT_OPENGL_2_1_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_3_0_CoreBackend, QT_OPENGL_3_0_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_3_1_CoreBackend, QT_OPENGL_3_1_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_3_2_CoreBackend, QT_OPENGL_3_2_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_3_3_CoreBackend, QT_OPENGL_3_3_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_4_0_CoreBackend, QT_OPENGL_4_0_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_4_1_CoreBackend, QT_OPENGL_4_1_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_4_2_CoreBackend, QT_OPENGL_4_2_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_4_3_CoreBackend, QT_OPENGL_4_3_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_4_4_CoreBackend, QT_OPENGL_4_4_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_4_5_CoreBackend, QT_OPENGL_4_5_FUNCTIONS)
+
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_1_0_DeprecatedBackend, QT_OPENGL_1_0_DEPRECATED_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_1_1_DeprecatedBackend, QT_OPENGL_1_1_DEPRECATED_FUNCTIONS)
+
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_1_2_DeprecatedBackend, QT_OPENGL_1_2_DEPRECATED_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_1_3_DeprecatedBackend, QT_OPENGL_1_3_DEPRECATED_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_1_4_DeprecatedBackend, QT_OPENGL_1_4_DEPRECATED_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_2_0_DeprecatedBackend, QT_OPENGL_2_0_DEPRECATED_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_3_0_DeprecatedBackend, QT_OPENGL_3_0_DEPRECATED_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_3_3_DeprecatedBackend, QT_OPENGL_3_3_DEPRECATED_FUNCTIONS)
+QT_OPENGL_IMPLEMENT(QOpenGLFunctions_4_5_DeprecatedBackend, QT_OPENGL_4_5_DEPRECATED_FUNCTIONS)
 
 #else
 
diff --git a/src/gui/opengl/qopenglversionfunctions.h b/src/gui/opengl/qopenglversionfunctions.h
index 695fc76052..7f991b1955 100644
--- a/src/gui/opengl/qopenglversionfunctions.h
+++ b/src/gui/opengl/qopenglversionfunctions.h
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -106,9 +113,61 @@ Q_DECL_CONSTEXPR inline bool operator!=(const QOpenGLVersionStatus &lhs, const Q
     return !operator==(lhs, rhs);
 }
 
+#define QT_OPENGL_DECLARE_FUNCTIONS(ret, name, args) \
+    ret (QOPENGLF_APIENTRYP name)args;
+#define QT_OPENGL_COUNT_FUNCTIONS(ret, name, args) +1
+
+#define QT_OPENGL_DECLARE(FUNCTIONS) \
+public: \
+    struct Functions { \
+        FUNCTIONS(QT_OPENGL_DECLARE_FUNCTIONS) \
+    }; \
+    union { \
+        QFunctionPointer functions[FUNCTIONS(QT_OPENGL_COUNT_FUNCTIONS)]; \
+        Functions f; \
+    }; \
+private: \
+    void init()
+
 class QOpenGLVersionFunctionsBackend
 {
 public:
+#define QT_OPENGL_VERSIONS(F) \
+        F(1_0_Core) \
+        F(1_1_Core) \
+        F(1_2_Core) \
+        F(1_3_Core) \
+        F(1_4_Core) \
+        F(1_5_Core) \
+        F(2_0_Core) \
+        F(2_1_Core) \
+        F(3_0_Core) \
+        F(3_1_Core) \
+        F(3_2_Core) \
+        F(3_3_Core) \
+        F(4_0_Core) \
+        F(4_1_Core) \
+        F(4_2_Core) \
+        F(4_3_Core) \
+        F(4_4_Core) \
+        F(4_5_Core) \
+        F(1_0_Deprecated) \
+        F(1_1_Deprecated) \
+        F(1_2_Deprecated) \
+        F(1_3_Deprecated) \
+        F(1_4_Deprecated) \
+        F(2_0_Deprecated) \
+        F(3_0_Deprecated) \
+        F(3_3_Deprecated) \
+        F(4_5_Deprecated) \
+
+#define VERSION_ENUM(X) OpenGL_##X,
+    enum Version {
+        QT_OPENGL_VERSIONS(VERSION_ENUM)
+        OpenGLVersionBackendCount
+    };
+#undef VERSION_ENUM
+
     QOpenGLVersionFunctionsBackend(QOpenGLContext *ctx)
         : context(ctx)
     {}
@@ -117,6 +176,17 @@ public:
     QAtomicInt refs;
 };
 
+class QOpenGLVersionFunctionsStorage
+{
+public:
+    QOpenGLVersionFunctionsStorage();
+    ~QOpenGLVersionFunctionsStorage();
+
+    QOpenGLVersionFunctionsBackend *backend(QOpenGLContext *context, QOpenGLVersionFunctionsBackend::Version v);
+
+    QOpenGLVersionFunctionsBackend **backends;
+};
+
 class QAbstractOpenGLFunctions;
 
 class QAbstractOpenGLFunctionsPrivate
@@ -127,12 +197,7 @@ public:
           initialized(false)
     {}
 
-    static QOpenGLVersionFunctionsBackend *functionsBackend(QOpenGLContext *context,
-                                                            const QOpenGLVersionStatus &v);
-    static void insertFunctionsBackend(QOpenGLContext *context,
-                                       const QOpenGLVersionStatus &v,
-                                       QOpenGLVersionFunctionsBackend *backend);
-    static void removeFunctionsBackend(QOpenGLContext *context, const QOpenGLVersionStatus &v);
+    static QOpenGLVersionFunctionsBackend *functionsBackend(QOpenGLContext *context, QOpenGLVersionFunctionsBackend::Version v);
     static void insertExternalFunctions(QOpenGLContext *context, QAbstractOpenGLFunctions *f);
     static void removeExternalFunctions(QOpenGLContext *context, QAbstractOpenGLFunctions *f);
 
@@ -173,1456 +238,1648 @@ inline QAbstractOpenGLFunctionsPrivate *QAbstractOpenGLFunctionsPrivate::get(QAb
 class QOpenGLFunctions_1_0_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_1_0_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_1_0_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_1_0_Core; }
 
     // OpenGL 1.0 core functions
-    void (QOPENGLF_APIENTRYP Viewport)(GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP DepthRange)(GLdouble nearVal, GLdouble farVal);
-    GLboolean (QOPENGLF_APIENTRYP IsEnabled)(GLenum cap);
-    void (QOPENGLF_APIENTRYP GetTexLevelParameteriv)(GLenum target, GLint level, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetTexLevelParameterfv)(GLenum target, GLint level, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetTexParameteriv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetTexParameterfv)(GLenum target, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetTexImage)(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-    const GLubyte * (QOPENGLF_APIENTRYP GetString)(GLenum name);
-    void (QOPENGLF_APIENTRYP GetIntegerv)(GLenum pname, GLint *data);
-    void (QOPENGLF_APIENTRYP GetFloatv)(GLenum pname, GLfloat *data);
-    GLenum (QOPENGLF_APIENTRYP GetError)();
-    void (QOPENGLF_APIENTRYP GetDoublev)(GLenum pname, GLdouble *data);
-    void (QOPENGLF_APIENTRYP GetBooleanv)(GLenum pname, GLboolean *data);
-    void (QOPENGLF_APIENTRYP ReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP ReadBuffer)(GLenum src);
-    void (QOPENGLF_APIENTRYP PixelStorei)(GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP PixelStoref)(GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP DepthFunc)(GLenum func);
-    void (QOPENGLF_APIENTRYP StencilOp)(GLenum fail, GLenum zfail, GLenum zpass);
-    void (QOPENGLF_APIENTRYP StencilFunc)(GLenum func, GLint ref, GLuint mask);
-    void (QOPENGLF_APIENTRYP LogicOp)(GLenum opcode);
-    void (QOPENGLF_APIENTRYP BlendFunc)(GLenum sfactor, GLenum dfactor);
-    void (QOPENGLF_APIENTRYP Flush)();
-    void (QOPENGLF_APIENTRYP Finish)();
-    void (QOPENGLF_APIENTRYP Enable)(GLenum cap);
-    void (QOPENGLF_APIENTRYP Disable)(GLenum cap);
-    void (QOPENGLF_APIENTRYP DepthMask)(GLboolean flag);
-    void (QOPENGLF_APIENTRYP ColorMask)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-    void (QOPENGLF_APIENTRYP StencilMask)(GLuint mask);
-    void (QOPENGLF_APIENTRYP ClearDepth)(GLdouble depth);
-    void (QOPENGLF_APIENTRYP ClearStencil)(GLint s);
-    void (QOPENGLF_APIENTRYP ClearColor)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-    void (QOPENGLF_APIENTRYP Clear)(GLbitfield mask);
-    void (QOPENGLF_APIENTRYP DrawBuffer)(GLenum buf);
-    void (QOPENGLF_APIENTRYP TexImage2D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP TexImage1D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP TexParameteriv)(GLenum target, GLenum pname, const GLint *params);
-    void (QOPENGLF_APIENTRYP TexParameteri)(GLenum target, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP TexParameterfv)(GLenum target, GLenum pname, const GLfloat *params);
-    void (QOPENGLF_APIENTRYP TexParameterf)(GLenum target, GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP Scissor)(GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP PolygonMode)(GLenum face, GLenum mode);
-    void (QOPENGLF_APIENTRYP PointSize)(GLfloat size);
-    void (QOPENGLF_APIENTRYP LineWidth)(GLfloat width);
-    void (QOPENGLF_APIENTRYP Hint)(GLenum target, GLenum mode);
-    void (QOPENGLF_APIENTRYP FrontFace)(GLenum mode);
-    void (QOPENGLF_APIENTRYP CullFace)(GLenum mode);
-
+#define QT_OPENGL_1_0_FUNCTIONS(F) \
+    F(void, Viewport, (GLint x, GLint y, GLsizei width, GLsizei height)) \
+    F(void, DepthRange, (GLdouble nearVal, GLdouble farVal)) \
+    F(GLboolean, IsEnabled, (GLenum cap)) \
+    F(void, GetTexLevelParameteriv, (GLenum target, GLint level, GLenum pname, GLint *params)) \
+    F(void, GetTexLevelParameterfv, (GLenum target, GLint level, GLenum pname, GLfloat *params)) \
+    F(void, GetTexParameteriv, (GLenum target, GLenum pname, GLint *params)) \
+    F(void, GetTexParameterfv, (GLenum target, GLenum pname, GLfloat *params)) \
+    F(void, GetTexImage, (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)) \
+    F(const GLubyte *, GetString, (GLenum name)) \
+    F(void, GetIntegerv, (GLenum pname, GLint *data)) \
+    F(void, GetFloatv, (GLenum pname, GLfloat *data)) \
+    F(GLenum, GetError, ()) \
+    F(void, GetDoublev, (GLenum pname, GLdouble *data)) \
+    F(void, GetBooleanv, (GLenum pname, GLboolean *data)) \
+    F(void, ReadPixels, (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)) \
+    F(void, ReadBuffer, (GLenum src)) \
+    F(void, PixelStorei, (GLenum pname, GLint param)) \
+    F(void, PixelStoref, (GLenum pname, GLfloat param)) \
+    F(void, DepthFunc, (GLenum func)) \
+    F(void, StencilOp, (GLenum fail, GLenum zfail, GLenum zpass)) \
+    F(void, StencilFunc, (GLenum func, GLint ref, GLuint mask)) \
+    F(void, LogicOp, (GLenum opcode)) \
+    F(void, BlendFunc, (GLenum sfactor, GLenum dfactor)) \
+    F(void, Flush, ()) \
+    F(void, Finish, ()) \
+    F(void, Enable, (GLenum cap)) \
+    F(void, Disable, (GLenum cap)) \
+    F(void, DepthMask, (GLboolean flag)) \
+    F(void, ColorMask, (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)) \
+    F(void, StencilMask, (GLuint mask)) \
+    F(void, ClearDepth, (GLdouble depth)) \
+    F(void, ClearStencil, (GLint s)) \
+    F(void, ClearColor, (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)) \
+    F(void, Clear, (GLbitfield mask)) \
+    F(void, DrawBuffer, (GLenum buf)) \
+    F(void, TexImage2D, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)) \
+    F(void, TexImage1D, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)) \
+    F(void, TexParameteriv, (GLenum target, GLenum pname, const GLint *params)) \
+    F(void, TexParameteri, (GLenum target, GLenum pname, GLint param)) \
+    F(void, TexParameterfv, (GLenum target, GLenum pname, const GLfloat *params)) \
+    F(void, TexParameterf, (GLenum target, GLenum pname, GLfloat param)) \
+    F(void, Scissor, (GLint x, GLint y, GLsizei width, GLsizei height)) \
+    F(void, PolygonMode, (GLenum face, GLenum mode)) \
+    F(void, PointSize, (GLfloat size)) \
+    F(void, LineWidth, (GLfloat width)) \
+    F(void, Hint, (GLenum target, GLenum mode)) \
+    F(void, FrontFace, (GLenum mode)) \
+    F(void, CullFace, (GLenum mode)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_1_0_FUNCTIONS);
 };
 
 class QOpenGLFunctions_1_1_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_1_1_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_1_1_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_1_1_Core; }
 
     // OpenGL 1.1 core functions
-    void (QOPENGLF_APIENTRYP Indexubv)(const GLubyte *c);
-    void (QOPENGLF_APIENTRYP Indexub)(GLubyte c);
-    GLboolean (QOPENGLF_APIENTRYP IsTexture)(GLuint texture);
-    void (QOPENGLF_APIENTRYP GenTextures)(GLsizei n, GLuint *textures);
-    void (QOPENGLF_APIENTRYP DeleteTextures)(GLsizei n, const GLuint *textures);
-    void (QOPENGLF_APIENTRYP BindTexture)(GLenum target, GLuint texture);
-    void (QOPENGLF_APIENTRYP TexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP TexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP CopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP CopyTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-    void (QOPENGLF_APIENTRYP CopyTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-    void (QOPENGLF_APIENTRYP CopyTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
-    void (QOPENGLF_APIENTRYP PolygonOffset)(GLfloat factor, GLfloat units);
-    void (QOPENGLF_APIENTRYP GetPointerv)(GLenum pname, GLvoid* *params);
-    void (QOPENGLF_APIENTRYP DrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-    void (QOPENGLF_APIENTRYP DrawArrays)(GLenum mode, GLint first, GLsizei count);
-
+#define QT_OPENGL_1_1_FUNCTIONS(F) \
+    F(void, Indexubv, (const GLubyte *c)) \
+    F(void, Indexub, (GLubyte c)) \
+    F(GLboolean, IsTexture, (GLuint texture)) \
+    F(void, GenTextures, (GLsizei n, GLuint *textures)) \
+    F(void, DeleteTextures, (GLsizei n, const GLuint *textures)) \
+    F(void, BindTexture, (GLenum target, GLuint texture)) \
+    F(void, TexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)) \
+    F(void, TexSubImage1D, (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)) \
+    F(void, CopyTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)) \
+    F(void, CopyTexSubImage1D, (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)) \
+    F(void, CopyTexImage2D, (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)) \
+    F(void, CopyTexImage1D, (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)) \
+    F(void, PolygonOffset, (GLfloat factor, GLfloat units)) \
+    F(void, GetPointerv, (GLenum pname, GLvoid* *params)) \
+    F(void, DrawElements, (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)) \
+    F(void, DrawArrays, (GLenum mode, GLint first, GLsizei count)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_1_1_FUNCTIONS);
 };
 
 class QOpenGLFunctions_1_2_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_1_2_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_1_2_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_1_2_Core; }
 
     // OpenGL 1.2 core functions
-    void (QOPENGLF_APIENTRYP CopyTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP TexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP TexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP DrawRangeElements)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
-    void (QOPENGLF_APIENTRYP BlendEquation)(GLenum mode);
-    void (QOPENGLF_APIENTRYP BlendColor)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-
+#define QT_OPENGL_1_2_FUNCTIONS(F) \
+    F(void, CopyTexSubImage3D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)) \
+    F(void, TexSubImage3D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)) \
+    F(void, TexImage3D, (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)) \
+    F(void, DrawRangeElements, (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)) \
+    F(void, BlendEquation, (GLenum mode)) \
+    F(void, BlendColor, (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_1_2_FUNCTIONS);
 };
 
 class QOpenGLFunctions_1_3_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_1_3_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_1_3_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_1_3_Core; }
 
     // OpenGL 1.3 core functions
-    void (QOPENGLF_APIENTRYP GetCompressedTexImage)(GLenum target, GLint level, GLvoid *img);
-    void (QOPENGLF_APIENTRYP CompressedTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
-    void (QOPENGLF_APIENTRYP CompressedTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
-    void (QOPENGLF_APIENTRYP CompressedTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
-    void (QOPENGLF_APIENTRYP CompressedTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
-    void (QOPENGLF_APIENTRYP CompressedTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
-    void (QOPENGLF_APIENTRYP CompressedTexImage3D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
-    void (QOPENGLF_APIENTRYP SampleCoverage)(GLfloat value, GLboolean invert);
-    void (QOPENGLF_APIENTRYP ActiveTexture)(GLenum texture);
-
+#define QT_OPENGL_1_3_FUNCTIONS(F) \
+    F(void, GetCompressedTexImage, (GLenum target, GLint level, GLvoid *img)) \
+    F(void, CompressedTexSubImage1D, (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)) \
+    F(void, CompressedTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)) \
+    F(void, CompressedTexSubImage3D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)) \
+    F(void, CompressedTexImage1D, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)) \
+    F(void, CompressedTexImage2D, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)) \
+    F(void, CompressedTexImage3D, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)) \
+    F(void, SampleCoverage, (GLfloat value, GLboolean invert)) \
+    F(void, ActiveTexture, (GLenum texture)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_1_3_FUNCTIONS);
 };
 
 class QOpenGLFunctions_1_4_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_1_4_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_1_4_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_1_4_Core; }
 
     // OpenGL 1.4 core functions
-    void (QOPENGLF_APIENTRYP PointParameteriv)(GLenum pname, const GLint *params);
-    void (QOPENGLF_APIENTRYP PointParameteri)(GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP PointParameterfv)(GLenum pname, const GLfloat *params);
-    void (QOPENGLF_APIENTRYP PointParameterf)(GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP MultiDrawElements)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount);
-    void (QOPENGLF_APIENTRYP MultiDrawArrays)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
-    void (QOPENGLF_APIENTRYP BlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-
+#define QT_OPENGL_1_4_FUNCTIONS(F) \
+    F(void, PointParameteriv, (GLenum pname, const GLint *params)) \
+    F(void, PointParameteri, (GLenum pname, GLint param)) \
+    F(void, PointParameterfv, (GLenum pname, const GLfloat *params)) \
+    F(void, PointParameterf, (GLenum pname, GLfloat param)) \
+    F(void, MultiDrawElements, (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount)) \
+    F(void, MultiDrawArrays, (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount)) \
+    F(void, BlendFuncSeparate, (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_1_4_FUNCTIONS);
 };
 
 class QOpenGLFunctions_1_5_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_1_5_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_1_5_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_1_5_Core; }
 
     // OpenGL 1.5 core functions
-    void (QOPENGLF_APIENTRYP GetBufferPointerv)(GLenum target, GLenum pname, GLvoid* *params);
-    void (QOPENGLF_APIENTRYP GetBufferParameteriv)(GLenum target, GLenum pname, GLint *params);
-    GLboolean (QOPENGLF_APIENTRYP UnmapBuffer)(GLenum target);
-    GLvoid* (QOPENGLF_APIENTRYP MapBuffer)(GLenum target, GLenum access);
-    void (QOPENGLF_APIENTRYP GetBufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data);
-    void (QOPENGLF_APIENTRYP BufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data);
-    void (QOPENGLF_APIENTRYP BufferData)(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage);
-    GLboolean (QOPENGLF_APIENTRYP IsBuffer)(GLuint buffer);
-    void (QOPENGLF_APIENTRYP GenBuffers)(GLsizei n, GLuint *buffers);
-    void (QOPENGLF_APIENTRYP DeleteBuffers)(GLsizei n, const GLuint *buffers);
-    void (QOPENGLF_APIENTRYP BindBuffer)(GLenum target, GLuint buffer);
-    void (QOPENGLF_APIENTRYP GetQueryObjectuiv)(GLuint id, GLenum pname, GLuint *params);
-    void (QOPENGLF_APIENTRYP GetQueryObjectiv)(GLuint id, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetQueryiv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP EndQuery)(GLenum target);
-    void (QOPENGLF_APIENTRYP BeginQuery)(GLenum target, GLuint id);
-    GLboolean (QOPENGLF_APIENTRYP IsQuery)(GLuint id);
-    void (QOPENGLF_APIENTRYP DeleteQueries)(GLsizei n, const GLuint *ids);
-    void (QOPENGLF_APIENTRYP GenQueries)(GLsizei n, GLuint *ids);
-
+#define QT_OPENGL_1_5_FUNCTIONS(F) \
+    F(void, GetBufferPointerv, (GLenum target, GLenum pname, GLvoid* *params)) \
+    F(void, GetBufferParameteriv, (GLenum target, GLenum pname, GLint *params)) \
+    F(GLboolean, UnmapBuffer, (GLenum target)) \
+    F(GLvoid*, MapBuffer, (GLenum target, GLenum access)) \
+    F(void, GetBufferSubData, (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)) \
+    F(void, BufferSubData, (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)) \
+    F(void, BufferData, (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)) \
+    F(GLboolean, IsBuffer, (GLuint buffer)) \
+    F(void, GenBuffers, (GLsizei n, GLuint *buffers)) \
+    F(void, DeleteBuffers, (GLsizei n, const GLuint *buffers)) \
+    F(void, BindBuffer, (GLenum target, GLuint buffer)) \
+    F(void, GetQueryObjectuiv, (GLuint id, GLenum pname, GLuint *params)) \
+    F(void, GetQueryObjectiv, (GLuint id, GLenum pname, GLint *params)) \
+    F(void, GetQueryiv, (GLenum target, GLenum pname, GLint *params)) \
+    F(void, EndQuery, (GLenum target)) \
+    F(void, BeginQuery, (GLenum target, GLuint id)) \
+    F(GLboolean, IsQuery, (GLuint id)) \
+    F(void, DeleteQueries, (GLsizei n, const GLuint *ids)) \
+    F(void, GenQueries, (GLsizei n, GLuint *ids)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_1_5_FUNCTIONS);
 };
 
 class QOpenGLFunctions_2_0_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_2_0_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_2_0_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_2_0_Core; }
 
     // OpenGL 2.0 core functions
-    void (QOPENGLF_APIENTRYP VertexAttribPointer)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-    void (QOPENGLF_APIENTRYP ValidateProgram)(GLuint program);
-    void (QOPENGLF_APIENTRYP UniformMatrix4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP Uniform4iv)(GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP Uniform3iv)(GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP Uniform2iv)(GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP Uniform1iv)(GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP Uniform4fv)(GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP Uniform3fv)(GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP Uniform2fv)(GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP Uniform1fv)(GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP Uniform4i)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-    void (QOPENGLF_APIENTRYP Uniform3i)(GLint location, GLint v0, GLint v1, GLint v2);
-    void (QOPENGLF_APIENTRYP Uniform2i)(GLint location, GLint v0, GLint v1);
-    void (QOPENGLF_APIENTRYP Uniform1i)(GLint location, GLint v0);
-    void (QOPENGLF_APIENTRYP Uniform4f)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-    void (QOPENGLF_APIENTRYP Uniform3f)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-    void (QOPENGLF_APIENTRYP Uniform2f)(GLint location, GLfloat v0, GLfloat v1);
-    void (QOPENGLF_APIENTRYP Uniform1f)(GLint location, GLfloat v0);
-    void (QOPENGLF_APIENTRYP UseProgram)(GLuint program);
-    void (QOPENGLF_APIENTRYP ShaderSource)(GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length);
-    void (QOPENGLF_APIENTRYP LinkProgram)(GLuint program);
-    GLboolean (QOPENGLF_APIENTRYP IsShader)(GLuint shader);
-    GLboolean (QOPENGLF_APIENTRYP IsProgram)(GLuint program);
-    void (QOPENGLF_APIENTRYP GetVertexAttribPointerv)(GLuint index, GLenum pname, GLvoid* *pointer);
-    void (QOPENGLF_APIENTRYP GetVertexAttribiv)(GLuint index, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetVertexAttribfv)(GLuint index, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetVertexAttribdv)(GLuint index, GLenum pname, GLdouble *params);
-    void (QOPENGLF_APIENTRYP GetUniformiv)(GLuint program, GLint location, GLint *params);
-    void (QOPENGLF_APIENTRYP GetUniformfv)(GLuint program, GLint location, GLfloat *params);
-    GLint (QOPENGLF_APIENTRYP GetUniformLocation)(GLuint program, const GLchar *name);
-    void (QOPENGLF_APIENTRYP GetShaderSource)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
-    void (QOPENGLF_APIENTRYP GetShaderInfoLog)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-    void (QOPENGLF_APIENTRYP GetShaderiv)(GLuint shader, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetProgramInfoLog)(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-    void (QOPENGLF_APIENTRYP GetProgramiv)(GLuint program, GLenum pname, GLint *params);
-    GLint (QOPENGLF_APIENTRYP GetAttribLocation)(GLuint program, const GLchar *name);
-    void (QOPENGLF_APIENTRYP GetAttachedShaders)(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
-    void (QOPENGLF_APIENTRYP GetActiveUniform)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-    void (QOPENGLF_APIENTRYP GetActiveAttrib)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
-    void (QOPENGLF_APIENTRYP EnableVertexAttribArray)(GLuint index);
-    void (QOPENGLF_APIENTRYP DisableVertexAttribArray)(GLuint index);
-    void (QOPENGLF_APIENTRYP DetachShader)(GLuint program, GLuint shader);
-    void (QOPENGLF_APIENTRYP DeleteShader)(GLuint shader);
-    void (QOPENGLF_APIENTRYP DeleteProgram)(GLuint program);
-    GLuint (QOPENGLF_APIENTRYP CreateShader)(GLenum type);
-    GLuint (QOPENGLF_APIENTRYP CreateProgram)();
-    void (QOPENGLF_APIENTRYP CompileShader)(GLuint shader);
-    void (QOPENGLF_APIENTRYP BindAttribLocation)(GLuint program, GLuint index, const GLchar *name);
-    void (QOPENGLF_APIENTRYP AttachShader)(GLuint program, GLuint shader);
-    void (QOPENGLF_APIENTRYP StencilMaskSeparate)(GLenum face, GLuint mask);
-    void (QOPENGLF_APIENTRYP StencilFuncSeparate)(GLenum face, GLenum func, GLint ref, GLuint mask);
-    void (QOPENGLF_APIENTRYP StencilOpSeparate)(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
-    void (QOPENGLF_APIENTRYP DrawBuffers)(GLsizei n, const GLenum *bufs);
-    void (QOPENGLF_APIENTRYP BlendEquationSeparate)(GLenum modeRGB, GLenum modeAlpha);
-    void (QOPENGLF_APIENTRYP VertexAttrib4usv)(GLuint index, const GLushort *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4uiv)(GLuint index, const GLuint *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4ubv)(GLuint index, const GLubyte *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4sv)(GLuint index, const GLshort *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4s)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-    void (QOPENGLF_APIENTRYP VertexAttrib4iv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4fv)(GLuint index, const GLfloat *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4f)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void (QOPENGLF_APIENTRYP VertexAttrib4dv)(GLuint index, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4d)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-    void (QOPENGLF_APIENTRYP VertexAttrib4bv)(GLuint index, const GLbyte *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4Nusv)(GLuint index, const GLushort *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4Nuiv)(GLuint index, const GLuint *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4Nubv)(GLuint index, const GLubyte *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4Nub)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-    void (QOPENGLF_APIENTRYP VertexAttrib4Nsv)(GLuint index, const GLshort *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4Niv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4Nbv)(GLuint index, const GLbyte *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib3sv)(GLuint index, const GLshort *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib3s)(GLuint index, GLshort x, GLshort y, GLshort z);
-    void (QOPENGLF_APIENTRYP VertexAttrib3fv)(GLuint index, const GLfloat *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib3f)(GLuint index, GLfloat x, GLfloat y, GLfloat z);
-    void (QOPENGLF_APIENTRYP VertexAttrib3dv)(GLuint index, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib3d)(GLuint index, GLdouble x, GLdouble y, GLdouble z);
-    void (QOPENGLF_APIENTRYP VertexAttrib2sv)(GLuint index, const GLshort *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib2s)(GLuint index, GLshort x, GLshort y);
-    void (QOPENGLF_APIENTRYP VertexAttrib2fv)(GLuint index, const GLfloat *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib2f)(GLuint index, GLfloat x, GLfloat y);
-    void (QOPENGLF_APIENTRYP VertexAttrib2dv)(GLuint index, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib2d)(GLuint index, GLdouble x, GLdouble y);
-    void (QOPENGLF_APIENTRYP VertexAttrib1sv)(GLuint index, const GLshort *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib1s)(GLuint index, GLshort x);
-    void (QOPENGLF_APIENTRYP VertexAttrib1fv)(GLuint index, const GLfloat *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib1f)(GLuint index, GLfloat x);
-    void (QOPENGLF_APIENTRYP VertexAttrib1dv)(GLuint index, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib1d)(GLuint index, GLdouble x);
+#define QT_OPENGL_2_0_FUNCTIONS(F) \
+    F(void, VertexAttribPointer, (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)) \
+    F(void, ValidateProgram, (GLuint program)) \
+    F(void, UniformMatrix4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, UniformMatrix3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, UniformMatrix2fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, Uniform4iv, (GLint location, GLsizei count, const GLint *value)) \
+    F(void, Uniform3iv, (GLint location, GLsizei count, const GLint *value)) \
+    F(void, Uniform2iv, (GLint location, GLsizei count, const GLint *value)) \
+    F(void, Uniform1iv, (GLint location, GLsizei count, const GLint *value)) \
+    F(void, Uniform4fv, (GLint location, GLsizei count, const GLfloat *value)) \
+    F(void, Uniform3fv, (GLint location, GLsizei count, const GLfloat *value)) \
+    F(void, Uniform2fv, (GLint location, GLsizei count, const GLfloat *value)) \
+    F(void, Uniform1fv, (GLint location, GLsizei count, const GLfloat *value)) \
+    F(void, Uniform4i, (GLint location, GLint v0, GLint v1, GLint v2, GLint v3)) \
+    F(void, Uniform3i, (GLint location, GLint v0, GLint v1, GLint v2)) \
+    F(void, Uniform2i, (GLint location, GLint v0, GLint v1)) \
+    F(void, Uniform1i, (GLint location, GLint v0)) \
+    F(void, Uniform4f, (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)) \
+    F(void, Uniform3f, (GLint location, GLfloat v0, GLfloat v1, GLfloat v2)) \
+    F(void, Uniform2f, (GLint location, GLfloat v0, GLfloat v1)) \
+    F(void, Uniform1f, (GLint location, GLfloat v0)) \
+    F(void, UseProgram, (GLuint program)) \
+    F(void, ShaderSource, (GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length)) \
+    F(void, LinkProgram, (GLuint program)) \
+    F(GLboolean, IsShader, (GLuint shader)) \
+    F(GLboolean, IsProgram, (GLuint program)) \
+    F(void, GetVertexAttribPointerv, (GLuint index, GLenum pname, GLvoid* *pointer)) \
+    F(void, GetVertexAttribiv, (GLuint index, GLenum pname, GLint *params)) \
+    F(void, GetVertexAttribfv, (GLuint index, GLenum pname, GLfloat *params)) \
+    F(void, GetVertexAttribdv, (GLuint index, GLenum pname, GLdouble *params)) \
+    F(void, GetUniformiv, (GLuint program, GLint location, GLint *params)) \
+    F(void, GetUniformfv, (GLuint program, GLint location, GLfloat *params)) \
+    F(GLint, GetUniformLocation, (GLuint program, const GLchar *name)) \
+    F(void, GetShaderSource, (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)) \
+    F(void, GetShaderInfoLog, (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog)) \
+    F(void, GetShaderiv, (GLuint shader, GLenum pname, GLint *params)) \
+    F(void, GetProgramInfoLog, (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog)) \
+    F(void, GetProgramiv, (GLuint program, GLenum pname, GLint *params)) \
+    F(GLint, GetAttribLocation, (GLuint program, const GLchar *name)) \
+    F(void, GetAttachedShaders, (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders)) \
+    F(void, GetActiveUniform, (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)) \
+    F(void, GetActiveAttrib, (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)) \
+    F(void, EnableVertexAttribArray, (GLuint index)) \
+    F(void, DisableVertexAttribArray, (GLuint index)) \
+    F(void, DetachShader, (GLuint program, GLuint shader)) \
+    F(void, DeleteShader, (GLuint shader)) \
+    F(void, DeleteProgram, (GLuint program)) \
+    F(GLuint, CreateShader, (GLenum type)) \
+    F(GLuint, CreateProgram, ()) \
+    F(void, CompileShader, (GLuint shader)) \
+    F(void, BindAttribLocation, (GLuint program, GLuint index, const GLchar *name)) \
+    F(void, AttachShader, (GLuint program, GLuint shader)) \
+    F(void, StencilMaskSeparate, (GLenum face, GLuint mask)) \
+    F(void, StencilFuncSeparate, (GLenum face, GLenum func, GLint ref, GLuint mask)) \
+    F(void, StencilOpSeparate, (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass)) \
+    F(void, DrawBuffers, (GLsizei n, const GLenum *bufs)) \
+    F(void, BlendEquationSeparate, (GLenum modeRGB, GLenum modeAlpha)) \
+    F(void, VertexAttrib4usv, (GLuint index, const GLushort *v)) \
+    F(void, VertexAttrib4uiv, (GLuint index, const GLuint *v)) \
+    F(void, VertexAttrib4ubv, (GLuint index, const GLubyte *v)) \
+    F(void, VertexAttrib4sv, (GLuint index, const GLshort *v)) \
+    F(void, VertexAttrib4s, (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)) \
+    F(void, VertexAttrib4iv, (GLuint index, const GLint *v)) \
+    F(void, VertexAttrib4fv, (GLuint index, const GLfloat *v)) \
+    F(void, VertexAttrib4f, (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) \
+    F(void, VertexAttrib4dv, (GLuint index, const GLdouble *v)) \
+    F(void, VertexAttrib4d, (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) \
+    F(void, VertexAttrib4bv, (GLuint index, const GLbyte *v)) \
+    F(void, VertexAttrib4Nusv, (GLuint index, const GLushort *v)) \
+    F(void, VertexAttrib4Nuiv, (GLuint index, const GLuint *v)) \
+    F(void, VertexAttrib4Nubv, (GLuint index, const GLubyte *v)) \
+    F(void, VertexAttrib4Nub, (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)) \
+    F(void, VertexAttrib4Nsv, (GLuint index, const GLshort *v)) \
+    F(void, VertexAttrib4Niv, (GLuint index, const GLint *v)) \
+    F(void, VertexAttrib4Nbv, (GLuint index, const GLbyte *v)) \
+    F(void, VertexAttrib3sv, (GLuint index, const GLshort *v)) \
+    F(void, VertexAttrib3s, (GLuint index, GLshort x, GLshort y, GLshort z)) \
+    F(void, VertexAttrib3fv, (GLuint index, const GLfloat *v)) \
+    F(void, VertexAttrib3f, (GLuint index, GLfloat x, GLfloat y, GLfloat z)) \
+    F(void, VertexAttrib3dv, (GLuint index, const GLdouble *v)) \
+    F(void, VertexAttrib3d, (GLuint index, GLdouble x, GLdouble y, GLdouble z)) \
+    F(void, VertexAttrib2sv, (GLuint index, const GLshort *v)) \
+    F(void, VertexAttrib2s, (GLuint index, GLshort x, GLshort y)) \
+    F(void, VertexAttrib2fv, (GLuint index, const GLfloat *v)) \
+    F(void, VertexAttrib2f, (GLuint index, GLfloat x, GLfloat y)) \
+    F(void, VertexAttrib2dv, (GLuint index, const GLdouble *v)) \
+    F(void, VertexAttrib2d, (GLuint index, GLdouble x, GLdouble y)) \
+    F(void, VertexAttrib1sv, (GLuint index, const GLshort *v)) \
+    F(void, VertexAttrib1s, (GLuint index, GLshort x)) \
+    F(void, VertexAttrib1fv, (GLuint index, const GLfloat *v)) \
+    F(void, VertexAttrib1f, (GLuint index, GLfloat x)) \
+    F(void, VertexAttrib1dv, (GLuint index, const GLdouble *v)) \
+    F(void, VertexAttrib1d, (GLuint index, GLdouble x)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_2_0_FUNCTIONS);
 };
 
 class QOpenGLFunctions_2_1_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_2_1_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_2_1_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_2_1_Core; }
 
     // OpenGL 2.1 core functions
-    void (QOPENGLF_APIENTRYP UniformMatrix4x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix3x4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix4x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix2x4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix3x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix2x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-
+#define QT_OPENGL_2_1_FUNCTIONS(F) \
+    F(void, UniformMatrix4x3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, UniformMatrix3x4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, UniformMatrix4x2fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, UniformMatrix2x4fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, UniformMatrix3x2fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, UniformMatrix2x3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_2_1_FUNCTIONS);
 };
 
 class QOpenGLFunctions_3_0_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_3_0_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_3_0_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_3_0_Core; }
 
     // OpenGL 3.0 core functions
-    GLboolean (QOPENGLF_APIENTRYP IsVertexArray)(GLuint array);
-    void (QOPENGLF_APIENTRYP GenVertexArrays)(GLsizei n, GLuint *arrays);
-    void (QOPENGLF_APIENTRYP DeleteVertexArrays)(GLsizei n, const GLuint *arrays);
-    void (QOPENGLF_APIENTRYP BindVertexArray)(GLuint array);
-    void (QOPENGLF_APIENTRYP FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length);
-    GLvoid* (QOPENGLF_APIENTRYP MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-    void (QOPENGLF_APIENTRYP FramebufferTextureLayer)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-    void (QOPENGLF_APIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-    void (QOPENGLF_APIENTRYP GenerateMipmap)(GLenum target);
-    void (QOPENGLF_APIENTRYP GetFramebufferAttachmentParameteriv)(GLenum target, GLenum attachment, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP FramebufferRenderbuffer)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-    void (QOPENGLF_APIENTRYP FramebufferTexture3D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-    void (QOPENGLF_APIENTRYP FramebufferTexture2D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-    void (QOPENGLF_APIENTRYP FramebufferTexture1D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-    GLenum (QOPENGLF_APIENTRYP CheckFramebufferStatus)(GLenum target);
-    void (QOPENGLF_APIENTRYP GenFramebuffers)(GLsizei n, GLuint *framebuffers);
-    void (QOPENGLF_APIENTRYP DeleteFramebuffers)(GLsizei n, const GLuint *framebuffers);
-    void (QOPENGLF_APIENTRYP BindFramebuffer)(GLenum target, GLuint framebuffer);
-    GLboolean (QOPENGLF_APIENTRYP IsFramebuffer)(GLuint framebuffer);
-    void (QOPENGLF_APIENTRYP GetRenderbufferParameteriv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP RenderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP GenRenderbuffers)(GLsizei n, GLuint *renderbuffers);
-    void (QOPENGLF_APIENTRYP DeleteRenderbuffers)(GLsizei n, const GLuint *renderbuffers);
-    void (QOPENGLF_APIENTRYP BindRenderbuffer)(GLenum target, GLuint renderbuffer);
-    GLboolean (QOPENGLF_APIENTRYP IsRenderbuffer)(GLuint renderbuffer);
-    const GLubyte * (QOPENGLF_APIENTRYP GetStringi)(GLenum name, GLuint index);
-    void (QOPENGLF_APIENTRYP ClearBufferfi)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-    void (QOPENGLF_APIENTRYP ClearBufferfv)(GLenum buffer, GLint drawbuffer, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ClearBufferuiv)(GLenum buffer, GLint drawbuffer, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ClearBufferiv)(GLenum buffer, GLint drawbuffer, const GLint *value);
-    void (QOPENGLF_APIENTRYP GetTexParameterIuiv)(GLenum target, GLenum pname, GLuint *params);
-    void (QOPENGLF_APIENTRYP GetTexParameterIiv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP TexParameterIuiv)(GLenum target, GLenum pname, const GLuint *params);
-    void (QOPENGLF_APIENTRYP TexParameterIiv)(GLenum target, GLenum pname, const GLint *params);
-    void (QOPENGLF_APIENTRYP Uniform4uiv)(GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP Uniform3uiv)(GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP Uniform2uiv)(GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP Uniform1uiv)(GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP Uniform4ui)(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-    void (QOPENGLF_APIENTRYP Uniform3ui)(GLint location, GLuint v0, GLuint v1, GLuint v2);
-    void (QOPENGLF_APIENTRYP Uniform2ui)(GLint location, GLuint v0, GLuint v1);
-    void (QOPENGLF_APIENTRYP Uniform1ui)(GLint location, GLuint v0);
-    GLint (QOPENGLF_APIENTRYP GetFragDataLocation)(GLuint program, const GLchar *name);
-    void (QOPENGLF_APIENTRYP BindFragDataLocation)(GLuint program, GLuint color, const GLchar *name);
-    void (QOPENGLF_APIENTRYP GetUniformuiv)(GLuint program, GLint location, GLuint *params);
-    void (QOPENGLF_APIENTRYP GetVertexAttribIuiv)(GLuint index, GLenum pname, GLuint *params);
-    void (QOPENGLF_APIENTRYP GetVertexAttribIiv)(GLuint index, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP VertexAttribIPointer)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-    void (QOPENGLF_APIENTRYP EndConditionalRender)();
-    void (QOPENGLF_APIENTRYP BeginConditionalRender)(GLuint id, GLenum mode);
-    void (QOPENGLF_APIENTRYP ClampColor)(GLenum target, GLenum clamp);
-    void (QOPENGLF_APIENTRYP GetTransformFeedbackVarying)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
-    void (QOPENGLF_APIENTRYP TransformFeedbackVaryings)(GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode);
-    void (QOPENGLF_APIENTRYP BindBufferBase)(GLenum target, GLuint index, GLuint buffer);
-    void (QOPENGLF_APIENTRYP BindBufferRange)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-    void (QOPENGLF_APIENTRYP EndTransformFeedback)();
-    void (QOPENGLF_APIENTRYP BeginTransformFeedback)(GLenum primitiveMode);
-    GLboolean (QOPENGLF_APIENTRYP IsEnabledi)(GLenum target, GLuint index);
-    void (QOPENGLF_APIENTRYP Disablei)(GLenum target, GLuint index);
-    void (QOPENGLF_APIENTRYP Enablei)(GLenum target, GLuint index);
-    void (QOPENGLF_APIENTRYP GetIntegeri_v)(GLenum target, GLuint index, GLint *data);
-    void (QOPENGLF_APIENTRYP GetBooleani_v)(GLenum target, GLuint index, GLboolean *data);
-    void (QOPENGLF_APIENTRYP ColorMaski)(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
-    void (QOPENGLF_APIENTRYP VertexAttribI4usv)(GLuint index, const GLushort *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI4ubv)(GLuint index, const GLubyte *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI4sv)(GLuint index, const GLshort *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI4bv)(GLuint index, const GLbyte *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI4uiv)(GLuint index, const GLuint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI3uiv)(GLuint index, const GLuint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI2uiv)(GLuint index, const GLuint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI1uiv)(GLuint index, const GLuint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI4iv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI3iv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI2iv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI1iv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-    void (QOPENGLF_APIENTRYP VertexAttribI3ui)(GLuint index, GLuint x, GLuint y, GLuint z);
-    void (QOPENGLF_APIENTRYP VertexAttribI2ui)(GLuint index, GLuint x, GLuint y);
-    void (QOPENGLF_APIENTRYP VertexAttribI1ui)(GLuint index, GLuint x);
-    void (QOPENGLF_APIENTRYP VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w);
-    void (QOPENGLF_APIENTRYP VertexAttribI3i)(GLuint index, GLint x, GLint y, GLint z);
-    void (QOPENGLF_APIENTRYP VertexAttribI2i)(GLuint index, GLint x, GLint y);
-    void (QOPENGLF_APIENTRYP VertexAttribI1i)(GLuint index, GLint x);
+#define QT_OPENGL_3_0_FUNCTIONS(F) \
+    F(GLboolean, IsVertexArray, (GLuint array)) \
+    F(void, GenVertexArrays, (GLsizei n, GLuint *arrays)) \
+    F(void, DeleteVertexArrays, (GLsizei n, const GLuint *arrays)) \
+    F(void, BindVertexArray, (GLuint array)) \
+    F(void, FlushMappedBufferRange, (GLenum target, GLintptr offset, GLsizeiptr length)) \
+    F(GLvoid *, MapBufferRange, (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)) \
+    F(void, FramebufferTextureLayer, (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)) \
+    F(void, RenderbufferStorageMultisample, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)) \
+    F(void, BlitFramebuffer, (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)) \
+    F(void, GenerateMipmap, (GLenum target)) \
+    F(void, GetFramebufferAttachmentParameteriv, (GLenum target, GLenum attachment, GLenum pname, GLint *params)) \
+    F(void, FramebufferRenderbuffer, (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)) \
+    F(void, FramebufferTexture3D, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)) \
+    F(void, FramebufferTexture2D, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) \
+    F(void, FramebufferTexture1D, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) \
+    F(GLenum, CheckFramebufferStatus, (GLenum target)) \
+    F(void, GenFramebuffers, (GLsizei n, GLuint *framebuffers)) \
+    F(void, DeleteFramebuffers, (GLsizei n, const GLuint *framebuffers)) \
+    F(void, BindFramebuffer, (GLenum target, GLuint framebuffer)) \
+    F(GLboolean, IsFramebuffer, (GLuint framebuffer)) \
+    F(void, GetRenderbufferParameteriv, (GLenum target, GLenum pname, GLint *params)) \
+    F(void, RenderbufferStorage, (GLenum target, GLenum internalformat, GLsizei width, GLsizei height)) \
+    F(void, GenRenderbuffers, (GLsizei n, GLuint *renderbuffers)) \
+    F(void, DeleteRenderbuffers, (GLsizei n, const GLuint *renderbuffers)) \
+    F(void, BindRenderbuffer, (GLenum target, GLuint renderbuffer)) \
+    F(GLboolean, IsRenderbuffer, (GLuint renderbuffer)) \
+    F(const GLubyte *, GetStringi, (GLenum name, GLuint index)) \
+    F(void, ClearBufferfi, (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)) \
+    F(void, ClearBufferfv, (GLenum buffer, GLint drawbuffer, const GLfloat *value)) \
+    F(void, ClearBufferuiv, (GLenum buffer, GLint drawbuffer, const GLuint *value)) \
+    F(void, ClearBufferiv, (GLenum buffer, GLint drawbuffer, const GLint *value)) \
+    F(void, GetTexParameterIuiv, (GLenum target, GLenum pname, GLuint *params)) \
+    F(void, GetTexParameterIiv, (GLenum target, GLenum pname, GLint *params)) \
+    F(void, TexParameterIuiv, (GLenum target, GLenum pname, const GLuint *params)) \
+    F(void, TexParameterIiv, (GLenum target, GLenum pname, const GLint *params)) \
+    F(void, Uniform4uiv, (GLint location, GLsizei count, const GLuint *value)) \
+    F(void, Uniform3uiv, (GLint location, GLsizei count, const GLuint *value)) \
+    F(void, Uniform2uiv, (GLint location, GLsizei count, const GLuint *value)) \
+    F(void, Uniform1uiv, (GLint location, GLsizei count, const GLuint *value)) \
+    F(void, Uniform4ui, (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)) \
+    F(void, Uniform3ui, (GLint location, GLuint v0, GLuint v1, GLuint v2)) \
+    F(void, Uniform2ui, (GLint location, GLuint v0, GLuint v1)) \
+    F(void, Uniform1ui, (GLint location, GLuint v0)) \
+    F(GLint, GetFragDataLocation, (GLuint program, const GLchar *name)) \
+    F(void, BindFragDataLocation, (GLuint program, GLuint color, const GLchar *name)) \
+    F(void, GetUniformuiv, (GLuint program, GLint location, GLuint *params)) \
+    F(void, GetVertexAttribIuiv, (GLuint index, GLenum pname, GLuint *params)) \
+    F(void, GetVertexAttribIiv, (GLuint index, GLenum pname, GLint *params)) \
+    F(void, VertexAttribIPointer, (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) \
+    F(void, EndConditionalRender, ()) \
+    F(void, BeginConditionalRender, (GLuint id, GLenum mode)) \
+    F(void, ClampColor, (GLenum target, GLenum clamp)) \
+    F(void, GetTransformFeedbackVarying, (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)) \
+    F(void, TransformFeedbackVaryings, (GLuint program, GLsizei count, const GLchar* const *varyings, GLenum bufferMode)) \
+    F(void, BindBufferBase, (GLenum target, GLuint index, GLuint buffer)) \
+    F(void, BindBufferRange, (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)) \
+    F(void, EndTransformFeedback, ()) \
+    F(void, BeginTransformFeedback, (GLenum primitiveMode)) \
+    F(GLboolean, IsEnabledi, (GLenum target, GLuint index)) \
+    F(void, Disablei, (GLenum target, GLuint index)) \
+    F(void, Enablei, (GLenum target, GLuint index)) \
+    F(void, GetIntegeri_v,(GLenum target, GLuint index, GLint *data)) \
+    F(void, GetBooleani_v,(GLenum target, GLuint index, GLboolean *data)) \
+    F(void, ColorMaski, (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a)) \
+    F(void, VertexAttribI4usv, (GLuint index, const GLushort *v)) \
+    F(void, VertexAttribI4ubv, (GLuint index, const GLubyte *v)) \
+    F(void, VertexAttribI4sv, (GLuint index, const GLshort *v)) \
+    F(void, VertexAttribI4bv, (GLuint index, const GLbyte *v)) \
+    F(void, VertexAttribI4uiv, (GLuint index, const GLuint *v)) \
+    F(void, VertexAttribI3uiv, (GLuint index, const GLuint *v)) \
+    F(void, VertexAttribI2uiv, (GLuint index, const GLuint *v)) \
+    F(void, VertexAttribI1uiv, (GLuint index, const GLuint *v)) \
+    F(void, VertexAttribI4iv, (GLuint index, const GLint *v)) \
+    F(void, VertexAttribI3iv, (GLuint index, const GLint *v)) \
+    F(void, VertexAttribI2iv, (GLuint index, const GLint *v)) \
+    F(void, VertexAttribI1iv, (GLuint index, const GLint *v)) \
+    F(void, VertexAttribI4ui, (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)) \
+    F(void, VertexAttribI3ui, (GLuint index, GLuint x, GLuint y, GLuint z)) \
+    F(void, VertexAttribI2ui, (GLuint index, GLuint x, GLuint y)) \
+    F(void, VertexAttribI1ui, (GLuint index, GLuint x)) \
+    F(void, VertexAttribI4i, (GLuint index, GLint x, GLint y, GLint z, GLint w)) \
+    F(void, VertexAttribI3i, (GLuint index, GLint x, GLint y, GLint z)) \
+    F(void, VertexAttribI2i, (GLuint index, GLint x, GLint y)) \
+    F(void, VertexAttribI1i, (GLuint index, GLint x)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_3_0_FUNCTIONS);
 };
 
 class QOpenGLFunctions_3_1_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_3_1_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_3_1_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_3_1_Core; }
 
     // OpenGL 3.1 core functions
-    void (QOPENGLF_APIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-    void (QOPENGLF_APIENTRYP UniformBlockBinding)(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-    void (QOPENGLF_APIENTRYP GetActiveUniformBlockName)(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
-    void (QOPENGLF_APIENTRYP GetActiveUniformBlockiv)(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
-    GLuint (QOPENGLF_APIENTRYP GetUniformBlockIndex)(GLuint program, const GLchar *uniformBlockName);
-    void (QOPENGLF_APIENTRYP GetActiveUniformName)(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
-    void (QOPENGLF_APIENTRYP GetActiveUniformsiv)(GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetUniformIndices)(GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices);
-    void (QOPENGLF_APIENTRYP PrimitiveRestartIndex)(GLuint index);
-    void (QOPENGLF_APIENTRYP TexBuffer)(GLenum target, GLenum internalformat, GLuint buffer);
-    void (QOPENGLF_APIENTRYP DrawElementsInstanced)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount);
-    void (QOPENGLF_APIENTRYP DrawArraysInstanced)(GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
-
+#define QT_OPENGL_3_1_FUNCTIONS(F) \
+    F(void, CopyBufferSubData, (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)) \
+    F(void, UniformBlockBinding, (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)) \
+    F(void, GetActiveUniformBlockName, (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName)) \
+    F(void, GetActiveUniformBlockiv, (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params)) \
+    F(GLuint, GetUniformBlockIndex, (GLuint program, const GLchar *uniformBlockName)) \
+    F(void, GetActiveUniformName, (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName)) \
+    F(void, GetActiveUniformsiv, (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params)) \
+    F(void, GetUniformIndices, (GLuint program, GLsizei uniformCount, const GLchar* const *uniformNames, GLuint *uniformIndices)) \
+    F(void, PrimitiveRestartIndex, (GLuint index)) \
+    F(void, TexBuffer, (GLenum target, GLenum internalformat, GLuint buffer)) \
+    F(void, DrawElementsInstanced, (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount)) \
+    F(void, DrawArraysInstanced, (GLenum mode, GLint first, GLsizei count, GLsizei instancecount)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_3_1_FUNCTIONS);
 };
 
 class QOpenGLFunctions_3_2_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_3_2_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_3_2_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_3_2_Core; }
 
     // OpenGL 3.2 core functions
-    void (QOPENGLF_APIENTRYP SampleMaski)(GLuint maskNumber, GLbitfield mask);
-    void (QOPENGLF_APIENTRYP GetMultisamplefv)(GLenum pname, GLuint index, GLfloat *val);
-    void (QOPENGLF_APIENTRYP TexImage3DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-    void (QOPENGLF_APIENTRYP TexImage2DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-    void (QOPENGLF_APIENTRYP GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
-    void (QOPENGLF_APIENTRYP GetInteger64v)(GLenum pname, GLint64 *data);
-    void (QOPENGLF_APIENTRYP WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout);
-    GLenum (QOPENGLF_APIENTRYP ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout);
-    void (QOPENGLF_APIENTRYP DeleteSync)(GLsync sync);
-    GLboolean (QOPENGLF_APIENTRYP IsSync)(GLsync sync);
-    GLsync (QOPENGLF_APIENTRYP FenceSync)(GLenum condition, GLbitfield flags);
-    void (QOPENGLF_APIENTRYP ProvokingVertex)(GLenum mode);
-    void (QOPENGLF_APIENTRYP MultiDrawElementsBaseVertex)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex);
-    void (QOPENGLF_APIENTRYP DrawElementsInstancedBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex);
-    void (QOPENGLF_APIENTRYP DrawRangeElementsBaseVertex)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
-    void (QOPENGLF_APIENTRYP DrawElementsBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex);
-    void (QOPENGLF_APIENTRYP FramebufferTexture)(GLenum target, GLenum attachment, GLuint texture, GLint level);
-    void (QOPENGLF_APIENTRYP GetBufferParameteri64v)(GLenum target, GLenum pname, GLint64 *params);
-    void (QOPENGLF_APIENTRYP GetInteger64i_v)(GLenum target, GLuint index, GLint64 *data);
-
+#define QT_OPENGL_3_2_FUNCTIONS(F) \
+    F(void, SampleMaski, (GLuint maskNumber, GLbitfield mask)) \
+    F(void, GetMultisamplefv, (GLenum pname, GLuint index, GLfloat *val)) \
+    F(void, TexImage3DMultisample, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)) \
+    F(void, TexImage2DMultisample, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)) \
+    F(void, GetSynciv, (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)) \
+    F(void, GetInteger64v, (GLenum pname, GLint64 *data)) \
+    F(void, WaitSync, (GLsync sync, GLbitfield flags, GLuint64 timeout)) \
+    F(GLenum, ClientWaitSync, (GLsync sync, GLbitfield flags, GLuint64 timeout)) \
+    F(void, DeleteSync, (GLsync sync)) \
+    F(GLboolean, IsSync, (GLsync sync)) \
+    F(GLsync, FenceSync, (GLenum condition, GLbitfield flags)) \
+    F(void, ProvokingVertex, (GLenum mode)) \
+    F(void, MultiDrawElementsBaseVertex, (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex)) \
+    F(void, DrawElementsInstancedBaseVertex, (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex)) \
+    F(void, DrawRangeElementsBaseVertex, (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)) \
+    F(void, DrawElementsBaseVertex, (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)) \
+    F(void, FramebufferTexture, (GLenum target, GLenum attachment, GLuint texture, GLint level)) \
+    F(void, GetBufferParameteri64v, (GLenum target, GLenum pname, GLint64 *params)) \
+    F(void, GetInteger64i_v,(GLenum target, GLuint index, GLint64 *data))
+
+    QT_OPENGL_DECLARE(QT_OPENGL_3_2_FUNCTIONS);
 };
 
 class QOpenGLFunctions_3_3_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_3_3_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_3_3_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_3_3_Core; }
 
     // OpenGL 3.3 core functions
-    void (QOPENGLF_APIENTRYP VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-    void (QOPENGLF_APIENTRYP VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value);
-    void (QOPENGLF_APIENTRYP VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-    void (QOPENGLF_APIENTRYP VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value);
-    void (QOPENGLF_APIENTRYP VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-    void (QOPENGLF_APIENTRYP VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value);
-    void (QOPENGLF_APIENTRYP VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
-    void (QOPENGLF_APIENTRYP VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value);
-    void (QOPENGLF_APIENTRYP SecondaryColorP3uiv)(GLenum type, const GLuint *color);
-    void (QOPENGLF_APIENTRYP SecondaryColorP3ui)(GLenum type, GLuint color);
-    void (QOPENGLF_APIENTRYP ColorP4uiv)(GLenum type, const GLuint *color);
-    void (QOPENGLF_APIENTRYP ColorP4ui)(GLenum type, GLuint color);
-    void (QOPENGLF_APIENTRYP ColorP3uiv)(GLenum type, const GLuint *color);
-    void (QOPENGLF_APIENTRYP ColorP3ui)(GLenum type, GLuint color);
-    void (QOPENGLF_APIENTRYP NormalP3uiv)(GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP NormalP3ui)(GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP4uiv)(GLenum texture, GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP4ui)(GLenum texture, GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP3uiv)(GLenum texture, GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP3ui)(GLenum texture, GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP2uiv)(GLenum texture, GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP2ui)(GLenum texture, GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP1uiv)(GLenum texture, GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP1ui)(GLenum texture, GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP TexCoordP4uiv)(GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP TexCoordP4ui)(GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP TexCoordP3uiv)(GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP TexCoordP3ui)(GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP TexCoordP2uiv)(GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP TexCoordP2ui)(GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP TexCoordP1uiv)(GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP TexCoordP1ui)(GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP VertexP4uiv)(GLenum type, const GLuint *value);
-    void (QOPENGLF_APIENTRYP VertexP4ui)(GLenum type, GLuint value);
-    void (QOPENGLF_APIENTRYP VertexP3uiv)(GLenum type, const GLuint *value);
-    void (QOPENGLF_APIENTRYP VertexP3ui)(GLenum type, GLuint value);
-    void (QOPENGLF_APIENTRYP VertexP2uiv)(GLenum type, const GLuint *value);
-    void (QOPENGLF_APIENTRYP VertexP2ui)(GLenum type, GLuint value);
-    void (QOPENGLF_APIENTRYP GetQueryObjectui64v)(GLuint id, GLenum pname, GLuint64 *params);
-    void (QOPENGLF_APIENTRYP GetQueryObjecti64v)(GLuint id, GLenum pname, GLint64 *params);
-    void (QOPENGLF_APIENTRYP QueryCounter)(GLuint id, GLenum target);
-    void (QOPENGLF_APIENTRYP GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint *params);
-    void (QOPENGLF_APIENTRYP GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint *param);
-    void (QOPENGLF_APIENTRYP SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint *param);
-    void (QOPENGLF_APIENTRYP SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat *param);
-    void (QOPENGLF_APIENTRYP SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint *param);
-    void (QOPENGLF_APIENTRYP SamplerParameteri)(GLuint sampler, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP BindSampler)(GLuint unit, GLuint sampler);
-    GLboolean (QOPENGLF_APIENTRYP IsSampler)(GLuint sampler);
-    void (QOPENGLF_APIENTRYP DeleteSamplers)(GLsizei count, const GLuint *samplers);
-    void (QOPENGLF_APIENTRYP GenSamplers)(GLsizei count, GLuint *samplers);
-    GLint (QOPENGLF_APIENTRYP GetFragDataIndex)(GLuint program, const GLchar *name);
-    void (QOPENGLF_APIENTRYP BindFragDataLocationIndexed)(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
-    void (QOPENGLF_APIENTRYP VertexAttribDivisor)(GLuint index, GLuint divisor);
-
+#define QT_OPENGL_3_3_FUNCTIONS(F) \
+    F(void, VertexAttribP4uiv, (GLuint index, GLenum type, GLboolean normalized, const GLuint *value)) \
+    F(void, VertexAttribP4ui, (GLuint index, GLenum type, GLboolean normalized, GLuint value)) \
+    F(void, VertexAttribP3uiv, (GLuint index, GLenum type, GLboolean normalized, const GLuint *value)) \
+    F(void, VertexAttribP3ui, (GLuint index, GLenum type, GLboolean normalized, GLuint value)) \
+    F(void, VertexAttribP2uiv, (GLuint index, GLenum type, GLboolean normalized, const GLuint *value)) \
+    F(void, VertexAttribP2ui, (GLuint index, GLenum type, GLboolean normalized, GLuint value)) \
+    F(void, VertexAttribP1uiv, (GLuint index, GLenum type, GLboolean normalized, const GLuint *value)) \
+    F(void, VertexAttribP1ui, (GLuint index, GLenum type, GLboolean normalized, GLuint value)) \
+    F(void, SecondaryColorP3uiv, (GLenum type, const GLuint *color)) \
+    F(void, SecondaryColorP3ui, (GLenum type, GLuint color)) \
+    F(void, ColorP4uiv, (GLenum type, const GLuint *color)) \
+    F(void, ColorP4ui, (GLenum type, GLuint color)) \
+    F(void, ColorP3uiv, (GLenum type, const GLuint *color)) \
+    F(void, ColorP3ui, (GLenum type, GLuint color)) \
+    F(void, NormalP3uiv, (GLenum type, const GLuint *coords)) \
+    F(void, NormalP3ui, (GLenum type, GLuint coords)) \
+    F(void, MultiTexCoordP4uiv, (GLenum texture, GLenum type, const GLuint *coords)) \
+    F(void, MultiTexCoordP4ui, (GLenum texture, GLenum type, GLuint coords)) \
+    F(void, MultiTexCoordP3uiv, (GLenum texture, GLenum type, const GLuint *coords)) \
+    F(void, MultiTexCoordP3ui, (GLenum texture, GLenum type, GLuint coords)) \
+    F(void, MultiTexCoordP2uiv, (GLenum texture, GLenum type, const GLuint *coords)) \
+    F(void, MultiTexCoordP2ui, (GLenum texture, GLenum type, GLuint coords)) \
+    F(void, MultiTexCoordP1uiv, (GLenum texture, GLenum type, const GLuint *coords)) \
+    F(void, MultiTexCoordP1ui, (GLenum texture, GLenum type, GLuint coords)) \
+    F(void, TexCoordP4uiv, (GLenum type, const GLuint *coords)) \
+    F(void, TexCoordP4ui, (GLenum type, GLuint coords)) \
+    F(void, TexCoordP3uiv, (GLenum type, const GLuint *coords)) \
+    F(void, TexCoordP3ui, (GLenum type, GLuint coords)) \
+    F(void, TexCoordP2uiv, (GLenum type, const GLuint *coords)) \
+    F(void, TexCoordP2ui, (GLenum type, GLuint coords)) \
+    F(void, TexCoordP1uiv, (GLenum type, const GLuint *coords)) \
+    F(void, TexCoordP1ui, (GLenum type, GLuint coords)) \
+    F(void, VertexP4uiv, (GLenum type, const GLuint *value)) \
+    F(void, VertexP4ui, (GLenum type, GLuint value)) \
+    F(void, VertexP3uiv, (GLenum type, const GLuint *value)) \
+    F(void, VertexP3ui, (GLenum type, GLuint value)) \
+    F(void, VertexP2uiv, (GLenum type, const GLuint *value)) \
+    F(void, VertexP2ui, (GLenum type, GLuint value)) \
+    F(void, GetQueryObjectui64v, (GLuint id, GLenum pname, GLuint64 *params)) \
+    F(void, GetQueryObjecti64v, (GLuint id, GLenum pname, GLint64 *params)) \
+    F(void, QueryCounter, (GLuint id, GLenum target)) \
+    F(void, GetSamplerParameterIuiv, (GLuint sampler, GLenum pname, GLuint *params)) \
+    F(void, GetSamplerParameterfv, (GLuint sampler, GLenum pname, GLfloat *params)) \
+    F(void, GetSamplerParameterIiv, (GLuint sampler, GLenum pname, GLint *params)) \
+    F(void, GetSamplerParameteriv, (GLuint sampler, GLenum pname, GLint *params)) \
+    F(void, SamplerParameterIuiv, (GLuint sampler, GLenum pname, const GLuint *param)) \
+    F(void, SamplerParameterIiv, (GLuint sampler, GLenum pname, const GLint *param)) \
+    F(void, SamplerParameterfv, (GLuint sampler, GLenum pname, const GLfloat *param)) \
+    F(void, SamplerParameterf, (GLuint sampler, GLenum pname, GLfloat param)) \
+    F(void, SamplerParameteriv, (GLuint sampler, GLenum pname, const GLint *param)) \
+    F(void, SamplerParameteri, (GLuint sampler, GLenum pname, GLint param)) \
+    F(void, BindSampler, (GLuint unit, GLuint sampler)) \
+    F(GLboolean, IsSampler, (GLuint sampler)) \
+    F(void, DeleteSamplers, (GLsizei count, const GLuint *samplers)) \
+    F(void, GenSamplers, (GLsizei count, GLuint *samplers)) \
+    F(GLint, GetFragDataIndex, (GLuint program, const GLchar *name)) \
+    F(void, BindFragDataLocationIndexed, (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)) \
+    F(void, VertexAttribDivisor, (GLuint index, GLuint divisor)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_3_3_FUNCTIONS);
 };
 
 class QOpenGLFunctions_4_0_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_4_0_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_4_0_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_4_0_Core; }
 
     // OpenGL 4.0 core functions
-    void (QOPENGLF_APIENTRYP GetQueryIndexediv)(GLenum target, GLuint index, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP EndQueryIndexed)(GLenum target, GLuint index);
-    void (QOPENGLF_APIENTRYP BeginQueryIndexed)(GLenum target, GLuint index, GLuint id);
-    void (QOPENGLF_APIENTRYP DrawTransformFeedbackStream)(GLenum mode, GLuint id, GLuint stream);
-    void (QOPENGLF_APIENTRYP DrawTransformFeedback)(GLenum mode, GLuint id);
-    void (QOPENGLF_APIENTRYP ResumeTransformFeedback)();
-    void (QOPENGLF_APIENTRYP PauseTransformFeedback)();
-    GLboolean (QOPENGLF_APIENTRYP IsTransformFeedback)(GLuint id);
-    void (QOPENGLF_APIENTRYP GenTransformFeedbacks)(GLsizei n, GLuint *ids);
-    void (QOPENGLF_APIENTRYP DeleteTransformFeedbacks)(GLsizei n, const GLuint *ids);
-    void (QOPENGLF_APIENTRYP BindTransformFeedback)(GLenum target, GLuint id);
-    void (QOPENGLF_APIENTRYP PatchParameterfv)(GLenum pname, const GLfloat *values);
-    void (QOPENGLF_APIENTRYP PatchParameteri)(GLenum pname, GLint value);
-    void (QOPENGLF_APIENTRYP GetProgramStageiv)(GLuint program, GLenum shadertype, GLenum pname, GLint *values);
-    void (QOPENGLF_APIENTRYP GetUniformSubroutineuiv)(GLenum shadertype, GLint location, GLuint *params);
-    void (QOPENGLF_APIENTRYP UniformSubroutinesuiv)(GLenum shadertype, GLsizei count, const GLuint *indices);
-    void (QOPENGLF_APIENTRYP GetActiveSubroutineName)(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-    void (QOPENGLF_APIENTRYP GetActiveSubroutineUniformName)(GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
-    void (QOPENGLF_APIENTRYP GetActiveSubroutineUniformiv)(GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
-    GLuint (QOPENGLF_APIENTRYP GetSubroutineIndex)(GLuint program, GLenum shadertype, const GLchar *name);
-    GLint (QOPENGLF_APIENTRYP GetSubroutineUniformLocation)(GLuint program, GLenum shadertype, const GLchar *name);
-    void (QOPENGLF_APIENTRYP GetUniformdv)(GLuint program, GLint location, GLdouble *params);
-    void (QOPENGLF_APIENTRYP UniformMatrix4x3dv)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix4x2dv)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix3x4dv)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix3x2dv)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix2x4dv)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix2x3dv)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix4dv)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix3dv)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP UniformMatrix2dv)(GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP Uniform4dv)(GLint location, GLsizei count, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP Uniform3dv)(GLint location, GLsizei count, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP Uniform2dv)(GLint location, GLsizei count, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP Uniform1dv)(GLint location, GLsizei count, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP Uniform4d)(GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-    void (QOPENGLF_APIENTRYP Uniform3d)(GLint location, GLdouble x, GLdouble y, GLdouble z);
-    void (QOPENGLF_APIENTRYP Uniform2d)(GLint location, GLdouble x, GLdouble y);
-    void (QOPENGLF_APIENTRYP Uniform1d)(GLint location, GLdouble x);
-    void (QOPENGLF_APIENTRYP DrawElementsIndirect)(GLenum mode, GLenum type, const GLvoid *indirect);
-    void (QOPENGLF_APIENTRYP DrawArraysIndirect)(GLenum mode, const GLvoid *indirect);
-    void (QOPENGLF_APIENTRYP BlendFuncSeparatei)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
-    void (QOPENGLF_APIENTRYP BlendFunci)(GLuint buf, GLenum src, GLenum dst);
-    void (QOPENGLF_APIENTRYP BlendEquationSeparatei)(GLuint buf, GLenum modeRGB, GLenum modeAlpha);
-    void (QOPENGLF_APIENTRYP BlendEquationi)(GLuint buf, GLenum mode);
-    void (QOPENGLF_APIENTRYP MinSampleShading)(GLfloat value);
-
+#define QT_OPENGL_4_0_FUNCTIONS(F) \
+    F(void, GetQueryIndexediv, (GLenum target, GLuint index, GLenum pname, GLint *params)) \
+    F(void, EndQueryIndexed, (GLenum target, GLuint index)) \
+    F(void, BeginQueryIndexed, (GLenum target, GLuint index, GLuint id)) \
+    F(void, DrawTransformFeedbackStream, (GLenum mode, GLuint id, GLuint stream)) \
+    F(void, DrawTransformFeedback, (GLenum mode, GLuint id)) \
+    F(void, ResumeTransformFeedback, ()) \
+    F(void, PauseTransformFeedback, ()) \
+    F(GLboolean, IsTransformFeedback, (GLuint id)) \
+    F(void, GenTransformFeedbacks, (GLsizei n, GLuint *ids)) \
+    F(void, DeleteTransformFeedbacks, (GLsizei n, const GLuint *ids)) \
+    F(void, BindTransformFeedback, (GLenum target, GLuint id)) \
+    F(void, PatchParameterfv, (GLenum pname, const GLfloat *values)) \
+    F(void, PatchParameteri, (GLenum pname, GLint value)) \
+    F(void, GetProgramStageiv, (GLuint program, GLenum shadertype, GLenum pname, GLint *values)) \
+    F(void, GetUniformSubroutineuiv, (GLenum shadertype, GLint location, GLuint *params)) \
+    F(void, UniformSubroutinesuiv, (GLenum shadertype, GLsizei count, const GLuint *indices)) \
+    F(void, GetActiveSubroutineName, (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)) \
+    F(void, GetActiveSubroutineUniformName, (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name)) \
+    F(void, GetActiveSubroutineUniformiv, (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values)) \
+    F(GLuint, GetSubroutineIndex, (GLuint program, GLenum shadertype, const GLchar *name)) \
+    F(GLint, GetSubroutineUniformLocation, (GLuint program, GLenum shadertype, const GLchar *name)) \
+    F(void, GetUniformdv, (GLuint program, GLint location, GLdouble *params)) \
+    F(void, UniformMatrix4x3dv, (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, UniformMatrix4x2dv, (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, UniformMatrix3x4dv, (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, UniformMatrix3x2dv, (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, UniformMatrix2x4dv, (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, UniformMatrix2x3dv, (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, UniformMatrix4dv, (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, UniformMatrix3dv, (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, UniformMatrix2dv, (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, Uniform4dv, (GLint location, GLsizei count, const GLdouble *value)) \
+    F(void, Uniform3dv, (GLint location, GLsizei count, const GLdouble *value)) \
+    F(void, Uniform2dv, (GLint location, GLsizei count, const GLdouble *value)) \
+    F(void, Uniform1dv, (GLint location, GLsizei count, const GLdouble *value)) \
+    F(void, Uniform4d, (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) \
+    F(void, Uniform3d, (GLint location, GLdouble x, GLdouble y, GLdouble z)) \
+    F(void, Uniform2d, (GLint location, GLdouble x, GLdouble y)) \
+    F(void, Uniform1d, (GLint location, GLdouble x)) \
+    F(void, DrawElementsIndirect, (GLenum mode, GLenum type, const GLvoid *indirect)) \
+    F(void, DrawArraysIndirect, (GLenum mode, const GLvoid *indirect)) \
+    F(void, BlendFuncSeparatei, (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)) \
+    F(void, BlendFunci, (GLuint buf, GLenum src, GLenum dst)) \
+    F(void, BlendEquationSeparatei, (GLuint buf, GLenum modeRGB, GLenum modeAlpha)) \
+    F(void, BlendEquationi, (GLuint buf, GLenum mode)) \
+    F(void, MinSampleShading, (GLfloat value)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_4_0_FUNCTIONS);
 };
 
 class QOpenGLFunctions_4_1_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_4_1_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_4_1_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_4_1_Core; }
 
     // OpenGL 4.1 core functions
-    void (QOPENGLF_APIENTRYP GetDoublei_v)(GLenum target, GLuint index, GLdouble *data);
-    void (QOPENGLF_APIENTRYP GetFloati_v)(GLenum target, GLuint index, GLfloat *data);
-    void (QOPENGLF_APIENTRYP DepthRangeIndexed)(GLuint index, GLdouble n, GLdouble f);
-    void (QOPENGLF_APIENTRYP DepthRangeArrayv)(GLuint first, GLsizei count, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP ScissorIndexedv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP ScissorIndexed)(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP ScissorArrayv)(GLuint first, GLsizei count, const GLint *v);
-    void (QOPENGLF_APIENTRYP ViewportIndexedfv)(GLuint index, const GLfloat *v);
-    void (QOPENGLF_APIENTRYP ViewportIndexedf)(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
-    void (QOPENGLF_APIENTRYP ViewportArrayv)(GLuint first, GLsizei count, const GLfloat *v);
-    void (QOPENGLF_APIENTRYP GetVertexAttribLdv)(GLuint index, GLenum pname, GLdouble *params);
-    void (QOPENGLF_APIENTRYP VertexAttribLPointer)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-    void (QOPENGLF_APIENTRYP VertexAttribL4dv)(GLuint index, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP VertexAttribL3dv)(GLuint index, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP VertexAttribL2dv)(GLuint index, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP VertexAttribL1dv)(GLuint index, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP VertexAttribL4d)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-    void (QOPENGLF_APIENTRYP VertexAttribL3d)(GLuint index, GLdouble x, GLdouble y, GLdouble z);
-    void (QOPENGLF_APIENTRYP VertexAttribL2d)(GLuint index, GLdouble x, GLdouble y);
-    void (QOPENGLF_APIENTRYP VertexAttribL1d)(GLuint index, GLdouble x);
-    void (QOPENGLF_APIENTRYP GetProgramPipelineInfoLog)(GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
-    void (QOPENGLF_APIENTRYP ValidateProgramPipeline)(GLuint pipeline);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix4x3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix3x4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix4x2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix2x4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix3x2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix2x3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix4x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix3x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix4x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix2x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix3x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix2x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix4dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix3dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix2dv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniformMatrix2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform4uiv)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform4ui)(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-    void (QOPENGLF_APIENTRYP ProgramUniform4dv)(GLuint program, GLint location, GLsizei count, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform4d)(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
-    void (QOPENGLF_APIENTRYP ProgramUniform4fv)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform4f)(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
-    void (QOPENGLF_APIENTRYP ProgramUniform4iv)(GLuint program, GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform4i)(GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
-    void (QOPENGLF_APIENTRYP ProgramUniform3uiv)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform3ui)(GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
-    void (QOPENGLF_APIENTRYP ProgramUniform3dv)(GLuint program, GLint location, GLsizei count, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform3d)(GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
-    void (QOPENGLF_APIENTRYP ProgramUniform3fv)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform3f)(GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
-    void (QOPENGLF_APIENTRYP ProgramUniform3iv)(GLuint program, GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform3i)(GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
-    void (QOPENGLF_APIENTRYP ProgramUniform2uiv)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform2ui)(GLuint program, GLint location, GLuint v0, GLuint v1);
-    void (QOPENGLF_APIENTRYP ProgramUniform2dv)(GLuint program, GLint location, GLsizei count, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform2d)(GLuint program, GLint location, GLdouble v0, GLdouble v1);
-    void (QOPENGLF_APIENTRYP ProgramUniform2fv)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform2f)(GLuint program, GLint location, GLfloat v0, GLfloat v1);
-    void (QOPENGLF_APIENTRYP ProgramUniform2iv)(GLuint program, GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform2i)(GLuint program, GLint location, GLint v0, GLint v1);
-    void (QOPENGLF_APIENTRYP ProgramUniform1uiv)(GLuint program, GLint location, GLsizei count, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform1ui)(GLuint program, GLint location, GLuint v0);
-    void (QOPENGLF_APIENTRYP ProgramUniform1dv)(GLuint program, GLint location, GLsizei count, const GLdouble *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform1d)(GLuint program, GLint location, GLdouble v0);
-    void (QOPENGLF_APIENTRYP ProgramUniform1fv)(GLuint program, GLint location, GLsizei count, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform1f)(GLuint program, GLint location, GLfloat v0);
-    void (QOPENGLF_APIENTRYP ProgramUniform1iv)(GLuint program, GLint location, GLsizei count, const GLint *value);
-    void (QOPENGLF_APIENTRYP ProgramUniform1i)(GLuint program, GLint location, GLint v0);
-    void (QOPENGLF_APIENTRYP GetProgramPipelineiv)(GLuint pipeline, GLenum pname, GLint *params);
-    GLboolean (QOPENGLF_APIENTRYP IsProgramPipeline)(GLuint pipeline);
-    void (QOPENGLF_APIENTRYP GenProgramPipelines)(GLsizei n, GLuint *pipelines);
-    void (QOPENGLF_APIENTRYP DeleteProgramPipelines)(GLsizei n, const GLuint *pipelines);
-    void (QOPENGLF_APIENTRYP BindProgramPipeline)(GLuint pipeline);
-    GLuint (QOPENGLF_APIENTRYP CreateShaderProgramv)(GLenum type, GLsizei count, const GLchar* const *strings);
-    void (QOPENGLF_APIENTRYP ActiveShaderProgram)(GLuint pipeline, GLuint program);
-    void (QOPENGLF_APIENTRYP UseProgramStages)(GLuint pipeline, GLbitfield stages, GLuint program);
-    void (QOPENGLF_APIENTRYP ProgramParameteri)(GLuint program, GLenum pname, GLint value);
-    void (QOPENGLF_APIENTRYP ProgramBinary)(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length);
-    void (QOPENGLF_APIENTRYP GetProgramBinary)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
-    void (QOPENGLF_APIENTRYP ClearDepthf)(GLfloat dd);
-    void (QOPENGLF_APIENTRYP DepthRangef)(GLfloat n, GLfloat f);
-    void (QOPENGLF_APIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
-    void (QOPENGLF_APIENTRYP ShaderBinary)(GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length);
-    void (QOPENGLF_APIENTRYP ReleaseShaderCompiler)();
-
+#define QT_OPENGL_4_1_FUNCTIONS(F) \
+    F(void, GetDoublei_v, (GLenum target, GLuint index, GLdouble *data)) \
+    F(void, GetFloati_v,(GLenum target, GLuint index, GLfloat *data)) \
+    F(void, DepthRangeIndexed, (GLuint index, GLdouble n, GLdouble f)) \
+    F(void, DepthRangeArrayv, (GLuint first, GLsizei count, const GLdouble *v)) \
+    F(void, ScissorIndexedv, (GLuint index, const GLint *v)) \
+    F(void, ScissorIndexed, (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height)) \
+    F(void, ScissorArrayv, (GLuint first, GLsizei count, const GLint *v)) \
+    F(void, ViewportIndexedfv, (GLuint index, const GLfloat *v)) \
+    F(void, ViewportIndexedf, (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h)) \
+    F(void, ViewportArrayv, (GLuint first, GLsizei count, const GLfloat *v)) \
+    F(void, GetVertexAttribLdv, (GLuint index, GLenum pname, GLdouble *params)) \
+    F(void, VertexAttribLPointer, (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) \
+    F(void, VertexAttribL4dv, (GLuint index, const GLdouble *v)) \
+    F(void, VertexAttribL3dv, (GLuint index, const GLdouble *v)) \
+    F(void, VertexAttribL2dv, (GLuint index, const GLdouble *v)) \
+    F(void, VertexAttribL1dv, (GLuint index, const GLdouble *v)) \
+    F(void, VertexAttribL4d, (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) \
+    F(void, VertexAttribL3d, (GLuint index, GLdouble x, GLdouble y, GLdouble z)) \
+    F(void, VertexAttribL2d, (GLuint index, GLdouble x, GLdouble y)) \
+    F(void, VertexAttribL1d, (GLuint index, GLdouble x)) \
+    F(void, GetProgramPipelineInfoLog, (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog)) \
+    F(void, ValidateProgramPipeline, (GLuint pipeline)) \
+    F(void, ProgramUniformMatrix4x3dv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, ProgramUniformMatrix3x4dv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, ProgramUniformMatrix4x2dv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, ProgramUniformMatrix2x4dv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, ProgramUniformMatrix3x2dv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, ProgramUniformMatrix2x3dv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, ProgramUniformMatrix4x3fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix3x4fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix4x2fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix2x4fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix3x2fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix2x3fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix4dv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, ProgramUniformMatrix3dv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, ProgramUniformMatrix2dv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value)) \
+    F(void, ProgramUniformMatrix4fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix3fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniformMatrix2fv, (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) \
+    F(void, ProgramUniform4uiv, (GLuint program, GLint location, GLsizei count, const GLuint *value)) \
+    F(void, ProgramUniform4ui, (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)) \
+    F(void, ProgramUniform4dv, (GLuint program, GLint location, GLsizei count, const GLdouble *value)) \
+    F(void, ProgramUniform4d, (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3)) \
+    F(void, ProgramUniform4fv, (GLuint program, GLint location, GLsizei count, const GLfloat *value)) \
+    F(void, ProgramUniform4f, (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)) \
+    F(void, ProgramUniform4iv, (GLuint program, GLint location, GLsizei count, const GLint *value)) \
+    F(void, ProgramUniform4i, (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3)) \
+    F(void, ProgramUniform3uiv, (GLuint program, GLint location, GLsizei count, const GLuint *value)) \
+    F(void, ProgramUniform3ui, (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2)) \
+    F(void, ProgramUniform3dv, (GLuint program, GLint location, GLsizei count, const GLdouble *value)) \
+    F(void, ProgramUniform3d, (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2)) \
+    F(void, ProgramUniform3fv, (GLuint program, GLint location, GLsizei count, const GLfloat *value)) \
+    F(void, ProgramUniform3f, (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2)) \
+    F(void, ProgramUniform3iv, (GLuint program, GLint location, GLsizei count, const GLint *value)) \
+    F(void, ProgramUniform3i, (GLuint program, GLint location, GLint v0, GLint v1, GLint v2)) \
+    F(void, ProgramUniform2uiv, (GLuint program, GLint location, GLsizei count, const GLuint *value)) \
+    F(void, ProgramUniform2ui, (GLuint program, GLint location, GLuint v0, GLuint v1)) \
+    F(void, ProgramUniform2dv, (GLuint program, GLint location, GLsizei count, const GLdouble *value)) \
+    F(void, ProgramUniform2d, (GLuint program, GLint location, GLdouble v0, GLdouble v1)) \
+    F(void, ProgramUniform2fv, (GLuint program, GLint location, GLsizei count, const GLfloat *value)) \
+    F(void, ProgramUniform2f, (GLuint program, GLint location, GLfloat v0, GLfloat v1)) \
+    F(void, ProgramUniform2iv, (GLuint program, GLint location, GLsizei count, const GLint *value)) \
+    F(void, ProgramUniform2i, (GLuint program, GLint location, GLint v0, GLint v1)) \
+    F(void, ProgramUniform1uiv, (GLuint program, GLint location, GLsizei count, const GLuint *value)) \
+    F(void, ProgramUniform1ui, (GLuint program, GLint location, GLuint v0)) \
+    F(void, ProgramUniform1dv, (GLuint program, GLint location, GLsizei count, const GLdouble *value)) \
+    F(void, ProgramUniform1d, (GLuint program, GLint location, GLdouble v0)) \
+    F(void, ProgramUniform1fv, (GLuint program, GLint location, GLsizei count, const GLfloat *value)) \
+    F(void, ProgramUniform1f, (GLuint program, GLint location, GLfloat v0)) \
+    F(void, ProgramUniform1iv, (GLuint program, GLint location, GLsizei count, const GLint *value)) \
+    F(void, ProgramUniform1i, (GLuint program, GLint location, GLint v0)) \
+    F(void, GetProgramPipelineiv, (GLuint pipeline, GLenum pname, GLint *params)) \
+    F(GLboolean, IsProgramPipeline, (GLuint pipeline)) \
+    F(void, GenProgramPipelines, (GLsizei n, GLuint *pipelines)) \
+    F(void, DeleteProgramPipelines, (GLsizei n, const GLuint *pipelines)) \
+    F(void, BindProgramPipeline, (GLuint pipeline)) \
+    F(GLuint, CreateShaderProgramv, (GLenum type, GLsizei count, const GLchar* const *strings)) \
+    F(void, ActiveShaderProgram, (GLuint pipeline, GLuint program)) \
+    F(void, UseProgramStages, (GLuint pipeline, GLbitfield stages, GLuint program)) \
+    F(void, ProgramParameteri, (GLuint program, GLenum pname, GLint value)) \
+    F(void, ProgramBinary, (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length)) \
+    F(void, GetProgramBinary, (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary)) \
+    F(void, ClearDepthf, (GLfloat dd)) \
+    F(void, DepthRangef, (GLfloat n, GLfloat f)) \
+    F(void, GetShaderPrecisionFormat, (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)) \
+    F(void, ShaderBinary, (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length)) \
+    F(void, ReleaseShaderCompiler, ()) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_4_1_FUNCTIONS);
 };
 
 class QOpenGLFunctions_4_2_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_4_2_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_4_2_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_4_2_Core; }
 
     // OpenGL 4.2 core functions
-    void (QOPENGLF_APIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-    void (QOPENGLF_APIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
-    void (QOPENGLF_APIENTRYP MemoryBarrier)(GLbitfield barriers);
-    void (QOPENGLF_APIENTRYP BindImageTexture)(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
-    void (QOPENGLF_APIENTRYP GetActiveAtomicCounterBufferiv)(GLuint program, GLuint bufferIndex, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetInternalformativ)(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
-    void (QOPENGLF_APIENTRYP DrawTransformFeedbackStreamInstanced)(GLenum mode, GLuint id, GLuint stream, GLsizei instancecount);
-    void (QOPENGLF_APIENTRYP DrawTransformFeedbackInstanced)(GLenum mode, GLuint id, GLsizei instancecount);
-    void (QOPENGLF_APIENTRYP DrawElementsInstancedBaseVertexBaseInstance)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
-    void (QOPENGLF_APIENTRYP DrawElementsInstancedBaseInstance)(GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance);
-    void (QOPENGLF_APIENTRYP DrawArraysInstancedBaseInstance)(GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
-
+#define QT_OPENGL_4_2_FUNCTIONS(F) \
+    F(void, TexStorage3D, (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)) \
+    F(void, TexStorage2D, (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)) \
+    F(void, TexStorage1D, (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)) \
+    F(void, MemoryBarrier, (GLbitfield barriers)) \
+    F(void, BindImageTexture, (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format)) \
+    F(void, GetActiveAtomicCounterBufferiv, (GLuint program, GLuint bufferIndex, GLenum pname, GLint *params)) \
+    F(void, GetInternalformativ, (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params)) \
+    F(void, DrawTransformFeedbackStreamInstanced, (GLenum mode, GLuint id, GLuint stream, GLsizei instancecount)) \
+    F(void, DrawTransformFeedbackInstanced, (GLenum mode, GLuint id, GLsizei instancecount)) \
+    F(void, DrawElementsInstancedBaseVertexBaseInstance, (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance)) \
+    F(void, DrawElementsInstancedBaseInstance, (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance)) \
+    F(void, DrawArraysInstancedBaseInstance, (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_4_2_FUNCTIONS);
 };
 
 class QOpenGLFunctions_4_3_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_4_3_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_4_3_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_4_3_Core; }
 
     // OpenGL 4.3 core functions
-    void (QOPENGLF_APIENTRYP TexStorage3DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-    void (QOPENGLF_APIENTRYP TexStorage2DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-    void (QOPENGLF_APIENTRYP TexBufferRange)(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
-    void (QOPENGLF_APIENTRYP ShaderStorageBlockBinding)(GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding);
-    GLint (QOPENGLF_APIENTRYP GetProgramResourceLocationIndex)(GLuint program, GLenum programInterface, const GLchar *name);
-    GLint (QOPENGLF_APIENTRYP GetProgramResourceLocation)(GLuint program, GLenum programInterface, const GLchar *name);
-    void (QOPENGLF_APIENTRYP GetProgramResourceiv)(GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params);
-    void (QOPENGLF_APIENTRYP GetProgramResourceName)(GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
-    GLuint (QOPENGLF_APIENTRYP GetProgramResourceIndex)(GLuint program, GLenum programInterface, const GLchar *name);
-    void (QOPENGLF_APIENTRYP GetProgramInterfaceiv)(GLuint program, GLenum programInterface, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP MultiDrawElementsIndirect)(GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride);
-    void (QOPENGLF_APIENTRYP MultiDrawArraysIndirect)(GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride);
-    void (QOPENGLF_APIENTRYP InvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP InvalidateFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum *attachments);
-    void (QOPENGLF_APIENTRYP InvalidateBufferData)(GLuint buffer);
-    void (QOPENGLF_APIENTRYP InvalidateBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr length);
-    void (QOPENGLF_APIENTRYP InvalidateTexImage)(GLuint texture, GLint level);
-    void (QOPENGLF_APIENTRYP InvalidateTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
-    void (QOPENGLF_APIENTRYP GetInternalformati64v)(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params);
-    void (QOPENGLF_APIENTRYP GetFramebufferParameteriv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP FramebufferParameteri)(GLenum target, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP VertexBindingDivisor)(GLuint bindingindex, GLuint divisor);
-    void (QOPENGLF_APIENTRYP VertexAttribBinding)(GLuint attribindex, GLuint bindingindex);
-    void (QOPENGLF_APIENTRYP VertexAttribLFormat)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
-    void (QOPENGLF_APIENTRYP VertexAttribIFormat)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
-    void (QOPENGLF_APIENTRYP VertexAttribFormat)(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
-    void (QOPENGLF_APIENTRYP BindVertexBuffer)(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
-    void (QOPENGLF_APIENTRYP TextureView)(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
-    void (QOPENGLF_APIENTRYP CopyImageSubData)(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
-    void (QOPENGLF_APIENTRYP DispatchComputeIndirect)(GLintptr indirect);
-    void (QOPENGLF_APIENTRYP DispatchCompute)(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
-    void (QOPENGLF_APIENTRYP ClearBufferSubData)(GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
-    void (QOPENGLF_APIENTRYP ClearBufferData)(GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data);
-    void (QOPENGLF_APIENTRYP GetObjectPtrLabel)(const GLvoid *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
-    void (QOPENGLF_APIENTRYP ObjectPtrLabel)(const GLvoid *ptr, GLsizei length, const GLchar *label);
-    void (QOPENGLF_APIENTRYP GetObjectLabel)(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
-    void (QOPENGLF_APIENTRYP ObjectLabel)(GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
-    void (QOPENGLF_APIENTRYP PopDebugGroup)();
-    void (QOPENGLF_APIENTRYP PushDebugGroup)(GLenum source, GLuint id, GLsizei length, const GLchar *message);
-    GLuint (QOPENGLF_APIENTRYP GetDebugMessageLog)(GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
-    void (QOPENGLF_APIENTRYP DebugMessageCallback)(GLDEBUGPROC callback, const GLvoid *userParam);
-    void (QOPENGLF_APIENTRYP DebugMessageInsert)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-    void (QOPENGLF_APIENTRYP DebugMessageControl)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
-
+#define QT_OPENGL_4_3_FUNCTIONS(F) \
+    F(void, TexStorage3DMultisample, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)) \
+    F(void, TexStorage2DMultisample, (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)) \
+    F(void, TexBufferRange, (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size)) \
+    F(void, ShaderStorageBlockBinding, (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding)) \
+    F(GLint, GetProgramResourceLocationIndex, (GLuint program, GLenum programInterface, const GLchar *name)) \
+    F(GLint, GetProgramResourceLocation, (GLuint program, GLenum programInterface, const GLchar *name)) \
+    F(void, GetProgramResourceiv, (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params)) \
+    F(void, GetProgramResourceName, (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name)) \
+    F(GLuint, GetProgramResourceIndex, (GLuint program, GLenum programInterface, const GLchar *name)) \
+    F(void, GetProgramInterfaceiv, (GLuint program, GLenum programInterface, GLenum pname, GLint *params)) \
+    F(void, MultiDrawElementsIndirect, (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride)) \
+    F(void, MultiDrawArraysIndirect, (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride)) \
+    F(void, InvalidateSubFramebuffer, (GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height)) \
+    F(void, InvalidateFramebuffer, (GLenum target, GLsizei numAttachments, const GLenum *attachments)) \
+    F(void, InvalidateBufferData, (GLuint buffer)) \
+    F(void, InvalidateBufferSubData, (GLuint buffer, GLintptr offset, GLsizeiptr length)) \
+    F(void, InvalidateTexImage, (GLuint texture, GLint level)) \
+    F(void, InvalidateTexSubImage, (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth)) \
+    F(void, GetInternalformati64v, (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params)) \
+    F(void, GetFramebufferParameteriv, (GLenum target, GLenum pname, GLint *params)) \
+    F(void, FramebufferParameteri, (GLenum target, GLenum pname, GLint param)) \
+    F(void, VertexBindingDivisor, (GLuint bindingindex, GLuint divisor)) \
+    F(void, VertexAttribBinding, (GLuint attribindex, GLuint bindingindex)) \
+    F(void, VertexAttribLFormat, (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)) \
+    F(void, VertexAttribIFormat, (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)) \
+    F(void, VertexAttribFormat, (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset)) \
+    F(void, BindVertexBuffer, (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride)) \
+    F(void, TextureView, (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers)) \
+    F(void, CopyImageSubData, (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth)) \
+    F(void, DispatchComputeIndirect, (GLintptr indirect)) \
+    F(void, DispatchCompute, (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z)) \
+    F(void, ClearBufferSubData, (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data)) \
+    F(void, ClearBufferData, (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data)) \
+    F(void, GetObjectPtrLabel, (const GLvoid *ptr, GLsizei bufSize, GLsizei *length, GLchar *label)) \
+    F(void, ObjectPtrLabel, (const GLvoid *ptr, GLsizei length, const GLchar *label)) \
+    F(void, GetObjectLabel, (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label)) \
+    F(void, ObjectLabel, (GLenum identifier, GLuint name, GLsizei length, const GLchar *label)) \
+    F(void, PopDebugGroup, ()) \
+    F(void, PushDebugGroup, (GLenum source, GLuint id, GLsizei length, const GLchar *message)) \
+    F(GLuint, GetDebugMessageLog, (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog)) \
+    F(void, DebugMessageCallback, (GLDEBUGPROC callback, const GLvoid *userParam)) \
+    F(void, DebugMessageInsert, (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf)) \
+    F(void, DebugMessageControl, (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_4_3_FUNCTIONS);
 };
 
 class QOpenGLFunctions_4_4_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_4_4_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_4_4_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_4_4_Core; }
 
     // OpenGL 4.4 core functions
-    void (QOPENGLF_APIENTRYP BindVertexBuffers)(GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
-    void (QOPENGLF_APIENTRYP BindImageTextures)(GLuint first, GLsizei count, const GLuint *textures);
-    void (QOPENGLF_APIENTRYP BindSamplers)(GLuint first, GLsizei count, const GLuint *samplers);
-    void (QOPENGLF_APIENTRYP BindTextures)(GLuint first, GLsizei count, const GLuint *textures);
-    void (QOPENGLF_APIENTRYP BindBuffersRange)(GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes);
-    void (QOPENGLF_APIENTRYP BindBuffersBase)(GLenum target, GLuint first, GLsizei count, const GLuint *buffers);
-    void (QOPENGLF_APIENTRYP ClearTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
-    void (QOPENGLF_APIENTRYP ClearTexImage)(GLuint texture, GLint level, GLenum format, GLenum type, const void *data);
-    void (QOPENGLF_APIENTRYP BufferStorage)(GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
-
+#define QT_OPENGL_4_4_FUNCTIONS(F) \
+    F(void, BindVertexBuffers, (GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides)) \
+    F(void, BindImageTextures, (GLuint first, GLsizei count, const GLuint *textures)) \
+    F(void, BindSamplers, (GLuint first, GLsizei count, const GLuint *samplers)) \
+    F(void, BindTextures, (GLuint first, GLsizei count, const GLuint *textures)) \
+    F(void, BindBuffersRange, (GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes)) \
+    F(void, BindBuffersBase, (GLenum target, GLuint first, GLsizei count, const GLuint *buffers)) \
+    F(void, ClearTexSubImage, (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data)) \
+    F(void, ClearTexImage, (GLuint texture, GLint level, GLenum format, GLenum type, const void *data)) \
+    F(void, BufferStorage, (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_4_4_FUNCTIONS);
 };
 
 class QOpenGLFunctions_4_5_CoreBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_4_5_CoreBackend(QOpenGLContext *context);
+    QOpenGLFunctions_4_5_CoreBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_4_5_Core; }
 
     // OpenGL 4.5 core functions
-    void (QOPENGLF_APIENTRYP TextureBarrier)();
-    void (QOPENGLF_APIENTRYP ReadnPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
-    void (QOPENGLF_APIENTRYP GetnUniformuiv)(GLuint program, GLint location, GLsizei bufSize, GLuint *params);
-    void (QOPENGLF_APIENTRYP GetnUniformiv)(GLuint program, GLint location, GLsizei bufSize, GLint *params);
-    void (QOPENGLF_APIENTRYP GetnUniformfv)(GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetnUniformdv)(GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
-    void (QOPENGLF_APIENTRYP GetnTexImage)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
-    void (QOPENGLF_APIENTRYP GetnCompressedTexImage)(GLenum target, GLint lod, GLsizei bufSize, void *pixels);
-    GLenum (QOPENGLF_APIENTRYP GetGraphicsResetStatus)();
-    void (QOPENGLF_APIENTRYP GetCompressedTextureSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void *pixels);
-    void (QOPENGLF_APIENTRYP GetTextureSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
-    void (QOPENGLF_APIENTRYP MemoryBarrierByRegion)(GLbitfield barriers);
-    void (QOPENGLF_APIENTRYP CreateQueries)(GLenum target, GLsizei n, GLuint *ids);
-    void (QOPENGLF_APIENTRYP CreateProgramPipelines)(GLsizei n, GLuint *pipelines);
-    void (QOPENGLF_APIENTRYP CreateSamplers)(GLsizei n, GLuint *samplers);
-    void (QOPENGLF_APIENTRYP GetVertexArrayIndexed64iv)(GLuint vaobj, GLuint index, GLenum pname, GLint64 *param);
-    void (QOPENGLF_APIENTRYP GetVertexArrayIndexediv)(GLuint vaobj, GLuint index, GLenum pname, GLint *param);
-    void (QOPENGLF_APIENTRYP GetVertexArrayiv)(GLuint vaobj, GLenum pname, GLint *param);
-    void (QOPENGLF_APIENTRYP VertexArrayBindingDivisor)(GLuint vaobj, GLuint bindingindex, GLuint divisor);
-    void (QOPENGLF_APIENTRYP VertexArrayAttribLFormat)(GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
-    void (QOPENGLF_APIENTRYP VertexArrayAttribIFormat)(GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
-    void (QOPENGLF_APIENTRYP VertexArrayAttribFormat)(GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
-    void (QOPENGLF_APIENTRYP VertexArrayAttribBinding)(GLuint vaobj, GLuint attribindex, GLuint bindingindex);
-    void (QOPENGLF_APIENTRYP VertexArrayVertexBuffers)(GLuint vaobj, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
-    void (QOPENGLF_APIENTRYP VertexArrayVertexBuffer)(GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
-    void (QOPENGLF_APIENTRYP VertexArrayElementBuffer)(GLuint vaobj, GLuint buffer);
-    void (QOPENGLF_APIENTRYP EnableVertexArrayAttrib)(GLuint vaobj, GLuint index);
-    void (QOPENGLF_APIENTRYP DisableVertexArrayAttrib)(GLuint vaobj, GLuint index);
-    void (QOPENGLF_APIENTRYP CreateVertexArrays)(GLsizei n, GLuint *arrays);
-    void (QOPENGLF_APIENTRYP GetTextureParameteriv)(GLuint texture, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetTextureParameterIuiv)(GLuint texture, GLenum pname, GLuint *params);
-    void (QOPENGLF_APIENTRYP GetTextureParameterIiv)(GLuint texture, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetTextureParameterfv)(GLuint texture, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetTextureLevelParameteriv)(GLuint texture, GLint level, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetTextureLevelParameterfv)(GLuint texture, GLint level, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetCompressedTextureImage)(GLuint texture, GLint level, GLsizei bufSize, void *pixels);
-    void (QOPENGLF_APIENTRYP GetTextureImage)(GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels);
-    void (QOPENGLF_APIENTRYP BindTextureUnit)(GLuint unit, GLuint texture);
-    void (QOPENGLF_APIENTRYP GenerateTextureMipmap)(GLuint texture);
-    void (QOPENGLF_APIENTRYP TextureParameteriv)(GLuint texture, GLenum pname, const GLint *param);
-    void (QOPENGLF_APIENTRYP TextureParameterIuiv)(GLuint texture, GLenum pname, const GLuint *params);
-    void (QOPENGLF_APIENTRYP TextureParameterIiv)(GLuint texture, GLenum pname, const GLint *params);
-    void (QOPENGLF_APIENTRYP TextureParameteri)(GLuint texture, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP TextureParameterfv)(GLuint texture, GLenum pname, const GLfloat *param);
-    void (QOPENGLF_APIENTRYP TextureParameterf)(GLuint texture, GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP CopyTextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP CopyTextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP CopyTextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-    void (QOPENGLF_APIENTRYP CompressedTextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
-    void (QOPENGLF_APIENTRYP CompressedTextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
-    void (QOPENGLF_APIENTRYP CompressedTextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
-    void (QOPENGLF_APIENTRYP TextureSubImage3D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
-    void (QOPENGLF_APIENTRYP TextureSubImage2D)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
-    void (QOPENGLF_APIENTRYP TextureSubImage1D)(GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
-    void (QOPENGLF_APIENTRYP TextureStorage3DMultisample)(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
-    void (QOPENGLF_APIENTRYP TextureStorage2DMultisample)(GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
-    void (QOPENGLF_APIENTRYP TextureStorage3D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-    void (QOPENGLF_APIENTRYP TextureStorage2D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP TextureStorage1D)(GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width);
-    void (QOPENGLF_APIENTRYP TextureBufferRange)(GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizei size);
-    void (QOPENGLF_APIENTRYP TextureBuffer)(GLuint texture, GLenum internalformat, GLuint buffer);
-    void (QOPENGLF_APIENTRYP CreateTextures)(GLenum target, GLsizei n, GLuint *textures);
-    void (QOPENGLF_APIENTRYP GetNamedRenderbufferParameteriv)(GLuint renderbuffer, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP NamedRenderbufferStorageMultisample)(GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP NamedRenderbufferStorage)(GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP CreateRenderbuffers)(GLsizei n, GLuint *renderbuffers);
-    void (QOPENGLF_APIENTRYP GetNamedFramebufferAttachmentParameteriv)(GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetNamedFramebufferParameteriv)(GLuint framebuffer, GLenum pname, GLint *param);
-    GLenum (QOPENGLF_APIENTRYP CheckNamedFramebufferStatus)(GLuint framebuffer, GLenum target);
-    void (QOPENGLF_APIENTRYP BlitNamedFramebuffer)(GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-    void (QOPENGLF_APIENTRYP ClearNamedFramebufferfi)(GLuint framebuffer, GLenum buffer, GLfloat depth, GLint stencil);
-    void (QOPENGLF_APIENTRYP ClearNamedFramebufferfv)(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value);
-    void (QOPENGLF_APIENTRYP ClearNamedFramebufferuiv)(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value);
-    void (QOPENGLF_APIENTRYP ClearNamedFramebufferiv)(GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value);
-    void (QOPENGLF_APIENTRYP InvalidateNamedFramebufferSubData)(GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP InvalidateNamedFramebufferData)(GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments);
-    void (QOPENGLF_APIENTRYP NamedFramebufferReadBuffer)(GLuint framebuffer, GLenum src);
-    void (QOPENGLF_APIENTRYP NamedFramebufferDrawBuffers)(GLuint framebuffer, GLsizei n, const GLenum *bufs);
-    void (QOPENGLF_APIENTRYP NamedFramebufferDrawBuffer)(GLuint framebuffer, GLenum buf);
-    void (QOPENGLF_APIENTRYP NamedFramebufferTextureLayer)(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
-    void (QOPENGLF_APIENTRYP NamedFramebufferTexture)(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
-    void (QOPENGLF_APIENTRYP NamedFramebufferParameteri)(GLuint framebuffer, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP NamedFramebufferRenderbuffer)(GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-    void (QOPENGLF_APIENTRYP CreateFramebuffers)(GLsizei n, GLuint *framebuffers);
-    void (QOPENGLF_APIENTRYP GetNamedBufferSubData)(GLuint buffer, GLintptr offset, GLsizei size, void *data);
-    void (QOPENGLF_APIENTRYP GetNamedBufferPointerv)(GLuint buffer, GLenum pname, GLvoid* *params);
-    void (QOPENGLF_APIENTRYP GetNamedBufferParameteri64v)(GLuint buffer, GLenum pname, GLint64 *params);
-    void (QOPENGLF_APIENTRYP GetNamedBufferParameteriv)(GLuint buffer, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP FlushMappedNamedBufferRange)(GLuint buffer, GLintptr offset, GLsizei length);
-    GLboolean (QOPENGLF_APIENTRYP UnmapNamedBuffer)(GLuint buffer);
-    GLvoid* (QOPENGLF_APIENTRYP MapNamedBufferRange)(GLuint buffer, GLintptr offset, GLsizei length, GLbitfield access);
-    GLvoid* (QOPENGLF_APIENTRYP MapNamedBuffer)(GLuint buffer, GLenum access);
-    void (QOPENGLF_APIENTRYP ClearNamedBufferSubData)(GLuint buffer, GLenum internalformat, GLintptr offset, GLsizei size, GLenum format, GLenum type, const void *data);
-    void (QOPENGLF_APIENTRYP ClearNamedBufferData)(GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
-    void (QOPENGLF_APIENTRYP CopyNamedBufferSubData)(GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizei size);
-    void (QOPENGLF_APIENTRYP NamedBufferSubData)(GLuint buffer, GLintptr offset, GLsizei size, const void *data);
-    void (QOPENGLF_APIENTRYP NamedBufferData)(GLuint buffer, GLsizei size, const void *data, GLenum usage);
-    void (QOPENGLF_APIENTRYP NamedBufferStorage)(GLuint buffer, GLsizei size, const void *data, GLbitfield flags);
-    void (QOPENGLF_APIENTRYP CreateBuffers)(GLsizei n, GLuint *buffers);
-    void (QOPENGLF_APIENTRYP GetTransformFeedbacki64_v)(GLuint xfb, GLenum pname, GLuint index, GLint64 *param);
-    void (QOPENGLF_APIENTRYP GetTransformFeedbacki_v)(GLuint xfb, GLenum pname, GLuint index, GLint *param);
-    void (QOPENGLF_APIENTRYP GetTransformFeedbackiv)(GLuint xfb, GLenum pname, GLint *param);
-    void (QOPENGLF_APIENTRYP TransformFeedbackBufferRange)(GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizei size);
-    void (QOPENGLF_APIENTRYP TransformFeedbackBufferBase)(GLuint xfb, GLuint index, GLuint buffer);
-    void (QOPENGLF_APIENTRYP CreateTransformFeedbacks)(GLsizei n, GLuint *ids);
-    void (QOPENGLF_APIENTRYP ClipControl)(GLenum origin, GLenum depth);
-
+#define QT_OPENGL_4_5_FUNCTIONS(F) \
+    F(void, TextureBarrier, ()) \
+    F(void, ReadnPixels, (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data)) \
+    F(void, GetnUniformuiv, (GLuint program, GLint location, GLsizei bufSize, GLuint *params)) \
+    F(void, GetnUniformiv, (GLuint program, GLint location, GLsizei bufSize, GLint *params)) \
+    F(void, GetnUniformfv, (GLuint program, GLint location, GLsizei bufSize, GLfloat *params)) \
+    F(void, GetnUniformdv, (GLuint program, GLint location, GLsizei bufSize, GLdouble *params)) \
+    F(void, GetnTexImage, (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels)) \
+    F(void, GetnCompressedTexImage, (GLenum target, GLint lod, GLsizei bufSize, void *pixels)) \
+    F(GLenum, GetGraphicsResetStatus, ()) \
+    F(void, GetCompressedTextureSubImage, (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void *pixels)) \
+    F(void, GetTextureSubImage, (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels)) \
+    F(void, MemoryBarrierByRegion, (GLbitfield barriers)) \
+    F(void, CreateQueries, (GLenum target, GLsizei n, GLuint *ids)) \
+    F(void, CreateProgramPipelines, (GLsizei n, GLuint *pipelines)) \
+    F(void, CreateSamplers, (GLsizei n, GLuint *samplers)) \
+    F(void, GetVertexArrayIndexed64iv, (GLuint vaobj, GLuint index, GLenum pname, GLint64 *param)) \
+    F(void, GetVertexArrayIndexediv, (GLuint vaobj, GLuint index, GLenum pname, GLint *param)) \
+    F(void, GetVertexArrayiv, (GLuint vaobj, GLenum pname, GLint *param)) \
+    F(void, VertexArrayBindingDivisor, (GLuint vaobj, GLuint bindingindex, GLuint divisor)) \
+    F(void, VertexArrayAttribLFormat, (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)) \
+    F(void, VertexArrayAttribIFormat, (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset)) \
+    F(void, VertexArrayAttribFormat, (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset)) \
+    F(void, VertexArrayAttribBinding, (GLuint vaobj, GLuint attribindex, GLuint bindingindex)) \
+    F(void, VertexArrayVertexBuffers, (GLuint vaobj, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides)) \
+    F(void, VertexArrayVertexBuffer, (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride)) \
+    F(void, VertexArrayElementBuffer, (GLuint vaobj, GLuint buffer)) \
+    F(void, EnableVertexArrayAttrib, (GLuint vaobj, GLuint index)) \
+    F(void, DisableVertexArrayAttrib, (GLuint vaobj, GLuint index)) \
+    F(void, CreateVertexArrays, (GLsizei n, GLuint *arrays)) \
+    F(void, GetTextureParameteriv, (GLuint texture, GLenum pname, GLint *params)) \
+    F(void, GetTextureParameterIuiv, (GLuint texture, GLenum pname, GLuint *params)) \
+    F(void, GetTextureParameterIiv, (GLuint texture, GLenum pname, GLint *params)) \
+    F(void, GetTextureParameterfv, (GLuint texture, GLenum pname, GLfloat *params)) \
+    F(void, GetTextureLevelParameteriv, (GLuint texture, GLint level, GLenum pname, GLint *params)) \
+    F(void, GetTextureLevelParameterfv, (GLuint texture, GLint level, GLenum pname, GLfloat *params)) \
+    F(void, GetCompressedTextureImage, (GLuint texture, GLint level, GLsizei bufSize, void *pixels)) \
+    F(void, GetTextureImage, (GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels)) \
+    F(void, BindTextureUnit, (GLuint unit, GLuint texture)) \
+    F(void, GenerateTextureMipmap, (GLuint texture)) \
+    F(void, TextureParameteriv, (GLuint texture, GLenum pname, const GLint *param)) \
+    F(void, TextureParameterIuiv, (GLuint texture, GLenum pname, const GLuint *params)) \
+    F(void, TextureParameterIiv, (GLuint texture, GLenum pname, const GLint *params)) \
+    F(void, TextureParameteri, (GLuint texture, GLenum pname, GLint param)) \
+    F(void, TextureParameterfv, (GLuint texture, GLenum pname, const GLfloat *param)) \
+    F(void, TextureParameterf, (GLuint texture, GLenum pname, GLfloat param)) \
+    F(void, CopyTextureSubImage3D, (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)) \
+    F(void, CopyTextureSubImage2D, (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)) \
+    F(void, CopyTextureSubImage1D, (GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)) \
+    F(void, CompressedTextureSubImage3D, (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data)) \
+    F(void, CompressedTextureSubImage2D, (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data)) \
+    F(void, CompressedTextureSubImage1D, (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data)) \
+    F(void, TextureSubImage3D, (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels)) \
+    F(void, TextureSubImage2D, (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels)) \
+    F(void, TextureSubImage1D, (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels)) \
+    F(void, TextureStorage3DMultisample, (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations)) \
+    F(void, TextureStorage2DMultisample, (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations)) \
+    F(void, TextureStorage3D, (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)) \
+    F(void, TextureStorage2D, (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)) \
+    F(void, TextureStorage1D, (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width)) \
+    F(void, TextureBufferRange, (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizei size)) \
+    F(void, TextureBuffer, (GLuint texture, GLenum internalformat, GLuint buffer)) \
+    F(void, CreateTextures, (GLenum target, GLsizei n, GLuint *textures)) \
+    F(void, GetNamedRenderbufferParameteriv, (GLuint renderbuffer, GLenum pname, GLint *params)) \
+    F(void, NamedRenderbufferStorageMultisample, (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)) \
+    F(void, NamedRenderbufferStorage, (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height)) \
+    F(void, CreateRenderbuffers, (GLsizei n, GLuint *renderbuffers)) \
+    F(void, GetNamedFramebufferAttachmentParameteriv, (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params)) \
+    F(void, GetNamedFramebufferParameteriv, (GLuint framebuffer, GLenum pname, GLint *param)) \
+    F(GLenum, CheckNamedFramebufferStatus, (GLuint framebuffer, GLenum target)) \
+    F(void, BlitNamedFramebuffer, (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)) \
+    F(void, ClearNamedFramebufferfi, (GLuint framebuffer, GLenum buffer, GLfloat depth, GLint stencil)) \
+    F(void, ClearNamedFramebufferfv, (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLfloat *value)) \
+    F(void, ClearNamedFramebufferuiv, (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint *value)) \
+    F(void, ClearNamedFramebufferiv, (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint *value)) \
+    F(void, InvalidateNamedFramebufferSubData, (GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height)) \
+    F(void, InvalidateNamedFramebufferData, (GLuint framebuffer, GLsizei numAttachments, const GLenum *attachments)) \
+    F(void, NamedFramebufferReadBuffer, (GLuint framebuffer, GLenum src)) \
+    F(void, NamedFramebufferDrawBuffers, (GLuint framebuffer, GLsizei n, const GLenum *bufs)) \
+    F(void, NamedFramebufferDrawBuffer, (GLuint framebuffer, GLenum buf)) \
+    F(void, NamedFramebufferTextureLayer, (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer)) \
+    F(void, NamedFramebufferTexture, (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level)) \
+    F(void, NamedFramebufferParameteri, (GLuint framebuffer, GLenum pname, GLint param)) \
+    F(void, NamedFramebufferRenderbuffer, (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)) \
+    F(void, CreateFramebuffers, (GLsizei n, GLuint *framebuffers)) \
+    F(void, GetNamedBufferSubData, (GLuint buffer, GLintptr offset, GLsizei size, void *data)) \
+    F(void, GetNamedBufferPointerv, (GLuint buffer, GLenum pname, GLvoid* *params)) \
+    F(void, GetNamedBufferParameteri64v, (GLuint buffer, GLenum pname, GLint64 *params)) \
+    F(void, GetNamedBufferParameteriv, (GLuint buffer, GLenum pname, GLint *params)) \
+    F(void, FlushMappedNamedBufferRange, (GLuint buffer, GLintptr offset, GLsizei length)) \
+    F(GLboolean, UnmapNamedBuffer, (GLuint buffer)) \
+    F(GLvoid *, MapNamedBufferRange, (GLuint buffer, GLintptr offset, GLsizei length, GLbitfield access)) \
+    F(GLvoid *, MapNamedBuffer, (GLuint buffer, GLenum access)) \
+    F(void, ClearNamedBufferSubData, (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizei size, GLenum format, GLenum type, const void *data)) \
+    F(void, ClearNamedBufferData, (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data)) \
+    F(void, CopyNamedBufferSubData, (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizei size)) \
+    F(void, NamedBufferSubData, (GLuint buffer, GLintptr offset, GLsizei size, const void *data)) \
+    F(void, NamedBufferData, (GLuint buffer, GLsizei size, const void *data, GLenum usage)) \
+    F(void, NamedBufferStorage, (GLuint buffer, GLsizei size, const void *data, GLbitfield flags)) \
+    F(void, CreateBuffers, (GLsizei n, GLuint *buffers)) \
+    F(void, GetTransformFeedbacki64_v,(GLuint xfb, GLenum pname, GLuint index, GLint64 *param)) \
+    F(void, GetTransformFeedbacki_v,(GLuint xfb, GLenum pname, GLuint index, GLint *param)) \
+    F(void, GetTransformFeedbackiv, (GLuint xfb, GLenum pname, GLint *param)) \
+    F(void, TransformFeedbackBufferRange, (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizei size)) \
+    F(void, TransformFeedbackBufferBase, (GLuint xfb, GLuint index, GLuint buffer)) \
+    F(void, CreateTransformFeedbacks, (GLsizei n, GLuint *ids)) \
+    F(void, ClipControl, (GLenum origin, GLenum depth)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_4_5_FUNCTIONS);
 };
 
 class QOpenGLFunctions_1_0_DeprecatedBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_1_0_DeprecatedBackend(QOpenGLContext *context);
+    QOpenGLFunctions_1_0_DeprecatedBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_1_0_Deprecated; }
 
     // OpenGL 1.0 deprecated functions
-    void (QOPENGLF_APIENTRYP Translatef)(GLfloat x, GLfloat y, GLfloat z);
-    void (QOPENGLF_APIENTRYP Translated)(GLdouble x, GLdouble y, GLdouble z);
-    void (QOPENGLF_APIENTRYP Scalef)(GLfloat x, GLfloat y, GLfloat z);
-    void (QOPENGLF_APIENTRYP Scaled)(GLdouble x, GLdouble y, GLdouble z);
-    void (QOPENGLF_APIENTRYP Rotatef)(GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-    void (QOPENGLF_APIENTRYP Rotated)(GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-    void (QOPENGLF_APIENTRYP PushMatrix)();
-    void (QOPENGLF_APIENTRYP PopMatrix)();
-    void (QOPENGLF_APIENTRYP Ortho)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-    void (QOPENGLF_APIENTRYP MultMatrixd)(const GLdouble *m);
-    void (QOPENGLF_APIENTRYP MultMatrixf)(const GLfloat *m);
-    void (QOPENGLF_APIENTRYP MatrixMode)(GLenum mode);
-    void (QOPENGLF_APIENTRYP LoadMatrixd)(const GLdouble *m);
-    void (QOPENGLF_APIENTRYP LoadMatrixf)(const GLfloat *m);
-    void (QOPENGLF_APIENTRYP LoadIdentity)();
-    void (QOPENGLF_APIENTRYP Frustum)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-    GLboolean (QOPENGLF_APIENTRYP IsList)(GLuint list);
-    void (QOPENGLF_APIENTRYP GetTexGeniv)(GLenum coord, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetTexGenfv)(GLenum coord, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetTexGendv)(GLenum coord, GLenum pname, GLdouble *params);
-    void (QOPENGLF_APIENTRYP GetTexEnviv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetTexEnvfv)(GLenum target, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetPolygonStipple)(GLubyte *mask);
-    void (QOPENGLF_APIENTRYP GetPixelMapusv)(GLenum map, GLushort *values);
-    void (QOPENGLF_APIENTRYP GetPixelMapuiv)(GLenum map, GLuint *values);
-    void (QOPENGLF_APIENTRYP GetPixelMapfv)(GLenum map, GLfloat *values);
-    void (QOPENGLF_APIENTRYP GetMaterialiv)(GLenum face, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetMaterialfv)(GLenum face, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetMapiv)(GLenum target, GLenum query, GLint *v);
-    void (QOPENGLF_APIENTRYP GetMapfv)(GLenum target, GLenum query, GLfloat *v);
-    void (QOPENGLF_APIENTRYP GetMapdv)(GLenum target, GLenum query, GLdouble *v);
-    void (QOPENGLF_APIENTRYP GetLightiv)(GLenum light, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetLightfv)(GLenum light, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetClipPlane)(GLenum plane, GLdouble *equation);
-    void (QOPENGLF_APIENTRYP DrawPixels)(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-    void (QOPENGLF_APIENTRYP CopyPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type);
-    void (QOPENGLF_APIENTRYP PixelMapusv)(GLenum map, GLsizei mapsize, const GLushort *values);
-    void (QOPENGLF_APIENTRYP PixelMapuiv)(GLenum map, GLsizei mapsize, const GLuint *values);
-    void (QOPENGLF_APIENTRYP PixelMapfv)(GLenum map, GLsizei mapsize, const GLfloat *values);
-    void (QOPENGLF_APIENTRYP PixelTransferi)(GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP PixelTransferf)(GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP PixelZoom)(GLfloat xfactor, GLfloat yfactor);
-    void (QOPENGLF_APIENTRYP AlphaFunc)(GLenum func, GLfloat ref);
-    void (QOPENGLF_APIENTRYP EvalPoint2)(GLint i, GLint j);
-    void (QOPENGLF_APIENTRYP EvalMesh2)(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
-    void (QOPENGLF_APIENTRYP EvalPoint1)(GLint i);
-    void (QOPENGLF_APIENTRYP EvalMesh1)(GLenum mode, GLint i1, GLint i2);
-    void (QOPENGLF_APIENTRYP EvalCoord2fv)(const GLfloat *u);
-    void (QOPENGLF_APIENTRYP EvalCoord2f)(GLfloat u, GLfloat v);
-    void (QOPENGLF_APIENTRYP EvalCoord2dv)(const GLdouble *u);
-    void (QOPENGLF_APIENTRYP EvalCoord2d)(GLdouble u, GLdouble v);
-    void (QOPENGLF_APIENTRYP EvalCoord1fv)(const GLfloat *u);
-    void (QOPENGLF_APIENTRYP EvalCoord1f)(GLfloat u);
-    void (QOPENGLF_APIENTRYP EvalCoord1dv)(const GLdouble *u);
-    void (QOPENGLF_APIENTRYP EvalCoord1d)(GLdouble u);
-    void (QOPENGLF_APIENTRYP MapGrid2f)(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2);
-    void (QOPENGLF_APIENTRYP MapGrid2d)(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2);
-    void (QOPENGLF_APIENTRYP MapGrid1f)(GLint un, GLfloat u1, GLfloat u2);
-    void (QOPENGLF_APIENTRYP MapGrid1d)(GLint un, GLdouble u1, GLdouble u2);
-    void (QOPENGLF_APIENTRYP Map2f)(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
-    void (QOPENGLF_APIENTRYP Map2d)(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
-    void (QOPENGLF_APIENTRYP Map1f)(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
-    void (QOPENGLF_APIENTRYP Map1d)(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
-    void (QOPENGLF_APIENTRYP PushAttrib)(GLbitfield mask);
-    void (QOPENGLF_APIENTRYP PopAttrib)();
-    void (QOPENGLF_APIENTRYP Accum)(GLenum op, GLfloat value);
-    void (QOPENGLF_APIENTRYP IndexMask)(GLuint mask);
-    void (QOPENGLF_APIENTRYP ClearIndex)(GLfloat c);
-    void (QOPENGLF_APIENTRYP ClearAccum)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-    void (QOPENGLF_APIENTRYP PushName)(GLuint name);
-    void (QOPENGLF_APIENTRYP PopName)();
-    void (QOPENGLF_APIENTRYP PassThrough)(GLfloat token);
-    void (QOPENGLF_APIENTRYP LoadName)(GLuint name);
-    void (QOPENGLF_APIENTRYP InitNames)();
-    GLint (QOPENGLF_APIENTRYP RenderMode)(GLenum mode);
-    void (QOPENGLF_APIENTRYP SelectBuffer)(GLsizei size, GLuint *buffer);
-    void (QOPENGLF_APIENTRYP FeedbackBuffer)(GLsizei size, GLenum type, GLfloat *buffer);
-    void (QOPENGLF_APIENTRYP TexGeniv)(GLenum coord, GLenum pname, const GLint *params);
-    void (QOPENGLF_APIENTRYP TexGeni)(GLenum coord, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP TexGenfv)(GLenum coord, GLenum pname, const GLfloat *params);
-    void (QOPENGLF_APIENTRYP TexGenf)(GLenum coord, GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP TexGendv)(GLenum coord, GLenum pname, const GLdouble *params);
-    void (QOPENGLF_APIENTRYP TexGend)(GLenum coord, GLenum pname, GLdouble param);
-    void (QOPENGLF_APIENTRYP TexEnviv)(GLenum target, GLenum pname, const GLint *params);
-    void (QOPENGLF_APIENTRYP TexEnvi)(GLenum target, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP TexEnvfv)(GLenum target, GLenum pname, const GLfloat *params);
-    void (QOPENGLF_APIENTRYP TexEnvf)(GLenum target, GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP ShadeModel)(GLenum mode);
-    void (QOPENGLF_APIENTRYP PolygonStipple)(const GLubyte *mask);
-    void (QOPENGLF_APIENTRYP Materialiv)(GLenum face, GLenum pname, const GLint *params);
-    void (QOPENGLF_APIENTRYP Materiali)(GLenum face, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP Materialfv)(GLenum face, GLenum pname, const GLfloat *params);
-    void (QOPENGLF_APIENTRYP Materialf)(GLenum face, GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP LineStipple)(GLint factor, GLushort pattern);
-    void (QOPENGLF_APIENTRYP LightModeliv)(GLenum pname, const GLint *params);
-    void (QOPENGLF_APIENTRYP LightModeli)(GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP LightModelfv)(GLenum pname, const GLfloat *params);
-    void (QOPENGLF_APIENTRYP LightModelf)(GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP Lightiv)(GLenum light, GLenum pname, const GLint *params);
-    void (QOPENGLF_APIENTRYP Lighti)(GLenum light, GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP Lightfv)(GLenum light, GLenum pname, const GLfloat *params);
-    void (QOPENGLF_APIENTRYP Lightf)(GLenum light, GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP Fogiv)(GLenum pname, const GLint *params);
-    void (QOPENGLF_APIENTRYP Fogi)(GLenum pname, GLint param);
-    void (QOPENGLF_APIENTRYP Fogfv)(GLenum pname, const GLfloat *params);
-    void (QOPENGLF_APIENTRYP Fogf)(GLenum pname, GLfloat param);
-    void (QOPENGLF_APIENTRYP ColorMaterial)(GLenum face, GLenum mode);
-    void (QOPENGLF_APIENTRYP ClipPlane)(GLenum plane, const GLdouble *equation);
-    void (QOPENGLF_APIENTRYP Vertex4sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP Vertex4s)(GLshort x, GLshort y, GLshort z, GLshort w);
-    void (QOPENGLF_APIENTRYP Vertex4iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP Vertex4i)(GLint x, GLint y, GLint z, GLint w);
-    void (QOPENGLF_APIENTRYP Vertex4fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP Vertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void (QOPENGLF_APIENTRYP Vertex4dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP Vertex4d)(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-    void (QOPENGLF_APIENTRYP Vertex3sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP Vertex3s)(GLshort x, GLshort y, GLshort z);
-    void (QOPENGLF_APIENTRYP Vertex3iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP Vertex3i)(GLint x, GLint y, GLint z);
-    void (QOPENGLF_APIENTRYP Vertex3fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP Vertex3f)(GLfloat x, GLfloat y, GLfloat z);
-    void (QOPENGLF_APIENTRYP Vertex3dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP Vertex3d)(GLdouble x, GLdouble y, GLdouble z);
-    void (QOPENGLF_APIENTRYP Vertex2sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP Vertex2s)(GLshort x, GLshort y);
-    void (QOPENGLF_APIENTRYP Vertex2iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP Vertex2i)(GLint x, GLint y);
-    void (QOPENGLF_APIENTRYP Vertex2fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP Vertex2f)(GLfloat x, GLfloat y);
-    void (QOPENGLF_APIENTRYP Vertex2dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP Vertex2d)(GLdouble x, GLdouble y);
-    void (QOPENGLF_APIENTRYP TexCoord4sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP TexCoord4s)(GLshort s, GLshort t, GLshort r, GLshort q);
-    void (QOPENGLF_APIENTRYP TexCoord4iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP TexCoord4i)(GLint s, GLint t, GLint r, GLint q);
-    void (QOPENGLF_APIENTRYP TexCoord4fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP TexCoord4f)(GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-    void (QOPENGLF_APIENTRYP TexCoord4dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP TexCoord4d)(GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-    void (QOPENGLF_APIENTRYP TexCoord3sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP TexCoord3s)(GLshort s, GLshort t, GLshort r);
-    void (QOPENGLF_APIENTRYP TexCoord3iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP TexCoord3i)(GLint s, GLint t, GLint r);
-    void (QOPENGLF_APIENTRYP TexCoord3fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP TexCoord3f)(GLfloat s, GLfloat t, GLfloat r);
-    void (QOPENGLF_APIENTRYP TexCoord3dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP TexCoord3d)(GLdouble s, GLdouble t, GLdouble r);
-    void (QOPENGLF_APIENTRYP TexCoord2sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP TexCoord2s)(GLshort s, GLshort t);
-    void (QOPENGLF_APIENTRYP TexCoord2iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP TexCoord2i)(GLint s, GLint t);
-    void (QOPENGLF_APIENTRYP TexCoord2fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP TexCoord2f)(GLfloat s, GLfloat t);
-    void (QOPENGLF_APIENTRYP TexCoord2dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP TexCoord2d)(GLdouble s, GLdouble t);
-    void (QOPENGLF_APIENTRYP TexCoord1sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP TexCoord1s)(GLshort s);
-    void (QOPENGLF_APIENTRYP TexCoord1iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP TexCoord1i)(GLint s);
-    void (QOPENGLF_APIENTRYP TexCoord1fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP TexCoord1f)(GLfloat s);
-    void (QOPENGLF_APIENTRYP TexCoord1dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP TexCoord1d)(GLdouble s);
-    void (QOPENGLF_APIENTRYP Rectsv)(const GLshort *v1, const GLshort *v2);
-    void (QOPENGLF_APIENTRYP Rects)(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
-    void (QOPENGLF_APIENTRYP Rectiv)(const GLint *v1, const GLint *v2);
-    void (QOPENGLF_APIENTRYP Recti)(GLint x1, GLint y1, GLint x2, GLint y2);
-    void (QOPENGLF_APIENTRYP Rectfv)(const GLfloat *v1, const GLfloat *v2);
-    void (QOPENGLF_APIENTRYP Rectf)(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
-    void (QOPENGLF_APIENTRYP Rectdv)(const GLdouble *v1, const GLdouble *v2);
-    void (QOPENGLF_APIENTRYP Rectd)(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
-    void (QOPENGLF_APIENTRYP RasterPos4sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP RasterPos4s)(GLshort x, GLshort y, GLshort z, GLshort w);
-    void (QOPENGLF_APIENTRYP RasterPos4iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP RasterPos4i)(GLint x, GLint y, GLint z, GLint w);
-    void (QOPENGLF_APIENTRYP RasterPos4fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP RasterPos4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void (QOPENGLF_APIENTRYP RasterPos4dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP RasterPos4d)(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-    void (QOPENGLF_APIENTRYP RasterPos3sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP RasterPos3s)(GLshort x, GLshort y, GLshort z);
-    void (QOPENGLF_APIENTRYP RasterPos3iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP RasterPos3i)(GLint x, GLint y, GLint z);
-    void (QOPENGLF_APIENTRYP RasterPos3fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP RasterPos3f)(GLfloat x, GLfloat y, GLfloat z);
-    void (QOPENGLF_APIENTRYP RasterPos3dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP RasterPos3d)(GLdouble x, GLdouble y, GLdouble z);
-    void (QOPENGLF_APIENTRYP RasterPos2sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP RasterPos2s)(GLshort x, GLshort y);
-    void (QOPENGLF_APIENTRYP RasterPos2iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP RasterPos2i)(GLint x, GLint y);
-    void (QOPENGLF_APIENTRYP RasterPos2fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP RasterPos2f)(GLfloat x, GLfloat y);
-    void (QOPENGLF_APIENTRYP RasterPos2dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP RasterPos2d)(GLdouble x, GLdouble y);
-    void (QOPENGLF_APIENTRYP Normal3sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP Normal3s)(GLshort nx, GLshort ny, GLshort nz);
-    void (QOPENGLF_APIENTRYP Normal3iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP Normal3i)(GLint nx, GLint ny, GLint nz);
-    void (QOPENGLF_APIENTRYP Normal3fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP Normal3f)(GLfloat nx, GLfloat ny, GLfloat nz);
-    void (QOPENGLF_APIENTRYP Normal3dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP Normal3d)(GLdouble nx, GLdouble ny, GLdouble nz);
-    void (QOPENGLF_APIENTRYP Normal3bv)(const GLbyte *v);
-    void (QOPENGLF_APIENTRYP Normal3b)(GLbyte nx, GLbyte ny, GLbyte nz);
-    void (QOPENGLF_APIENTRYP Indexsv)(const GLshort *c);
-    void (QOPENGLF_APIENTRYP Indexs)(GLshort c);
-    void (QOPENGLF_APIENTRYP Indexiv)(const GLint *c);
-    void (QOPENGLF_APIENTRYP Indexi)(GLint c);
-    void (QOPENGLF_APIENTRYP Indexfv)(const GLfloat *c);
-    void (QOPENGLF_APIENTRYP Indexf)(GLfloat c);
-    void (QOPENGLF_APIENTRYP Indexdv)(const GLdouble *c);
-    void (QOPENGLF_APIENTRYP Indexd)(GLdouble c);
-    void (QOPENGLF_APIENTRYP End)();
-    void (QOPENGLF_APIENTRYP EdgeFlagv)(const GLboolean *flag);
-    void (QOPENGLF_APIENTRYP EdgeFlag)(GLboolean flag);
-    void (QOPENGLF_APIENTRYP Color4usv)(const GLushort *v);
-    void (QOPENGLF_APIENTRYP Color4us)(GLushort red, GLushort green, GLushort blue, GLushort alpha);
-    void (QOPENGLF_APIENTRYP Color4uiv)(const GLuint *v);
-    void (QOPENGLF_APIENTRYP Color4ui)(GLuint red, GLuint green, GLuint blue, GLuint alpha);
-    void (QOPENGLF_APIENTRYP Color4ubv)(const GLubyte *v);
-    void (QOPENGLF_APIENTRYP Color4ub)(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
-    void (QOPENGLF_APIENTRYP Color4sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP Color4s)(GLshort red, GLshort green, GLshort blue, GLshort alpha);
-    void (QOPENGLF_APIENTRYP Color4iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP Color4i)(GLint red, GLint green, GLint blue, GLint alpha);
-    void (QOPENGLF_APIENTRYP Color4fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP Color4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-    void (QOPENGLF_APIENTRYP Color4dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP Color4d)(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha);
-    void (QOPENGLF_APIENTRYP Color4bv)(const GLbyte *v);
-    void (QOPENGLF_APIENTRYP Color4b)(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha);
-    void (QOPENGLF_APIENTRYP Color3usv)(const GLushort *v);
-    void (QOPENGLF_APIENTRYP Color3us)(GLushort red, GLushort green, GLushort blue);
-    void (QOPENGLF_APIENTRYP Color3uiv)(const GLuint *v);
-    void (QOPENGLF_APIENTRYP Color3ui)(GLuint red, GLuint green, GLuint blue);
-    void (QOPENGLF_APIENTRYP Color3ubv)(const GLubyte *v);
-    void (QOPENGLF_APIENTRYP Color3ub)(GLubyte red, GLubyte green, GLubyte blue);
-    void (QOPENGLF_APIENTRYP Color3sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP Color3s)(GLshort red, GLshort green, GLshort blue);
-    void (QOPENGLF_APIENTRYP Color3iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP Color3i)(GLint red, GLint green, GLint blue);
-    void (QOPENGLF_APIENTRYP Color3fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP Color3f)(GLfloat red, GLfloat green, GLfloat blue);
-    void (QOPENGLF_APIENTRYP Color3dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP Color3d)(GLdouble red, GLdouble green, GLdouble blue);
-    void (QOPENGLF_APIENTRYP Color3bv)(const GLbyte *v);
-    void (QOPENGLF_APIENTRYP Color3b)(GLbyte red, GLbyte green, GLbyte blue);
-    void (QOPENGLF_APIENTRYP Bitmap)(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap);
-    void (QOPENGLF_APIENTRYP Begin)(GLenum mode);
-    void (QOPENGLF_APIENTRYP ListBase)(GLuint base);
-    GLuint (QOPENGLF_APIENTRYP GenLists)(GLsizei range);
-    void (QOPENGLF_APIENTRYP DeleteLists)(GLuint list, GLsizei range);
-    void (QOPENGLF_APIENTRYP CallLists)(GLsizei n, GLenum type, const GLvoid *lists);
-    void (QOPENGLF_APIENTRYP CallList)(GLuint list);
-    void (QOPENGLF_APIENTRYP EndList)();
-    void (QOPENGLF_APIENTRYP NewList)(GLuint list, GLenum mode);
-
+#define QT_OPENGL_1_0_DEPRECATED_FUNCTIONS(F) \
+    F(void, Translatef, (GLfloat x, GLfloat y, GLfloat z)) \
+    F(void, Translated, (GLdouble x, GLdouble y, GLdouble z)) \
+    F(void, Scalef, (GLfloat x, GLfloat y, GLfloat z)) \
+    F(void, Scaled, (GLdouble x, GLdouble y, GLdouble z)) \
+    F(void, Rotatef, (GLfloat angle, GLfloat x, GLfloat y, GLfloat z)) \
+    F(void, Rotated, (GLdouble angle, GLdouble x, GLdouble y, GLdouble z)) \
+    F(void, PushMatrix, ()) \
+    F(void, PopMatrix, ()) \
+    F(void, Ortho, (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)) \
+    F(void, MultMatrixd, (const GLdouble *m)) \
+    F(void, MultMatrixf, (const GLfloat *m)) \
+    F(void, MatrixMode, (GLenum mode)) \
+    F(void, LoadMatrixd, (const GLdouble *m)) \
+    F(void, LoadMatrixf, (const GLfloat *m)) \
+    F(void, LoadIdentity, ()) \
+    F(void, Frustum, (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)) \
+    F(GLboolean, IsList, (GLuint list)) \
+    F(void, GetTexGeniv, (GLenum coord, GLenum pname, GLint *params)) \
+    F(void, GetTexGenfv, (GLenum coord, GLenum pname, GLfloat *params)) \
+    F(void, GetTexGendv, (GLenum coord, GLenum pname, GLdouble *params)) \
+    F(void, GetTexEnviv, (GLenum target, GLenum pname, GLint *params)) \
+    F(void, GetTexEnvfv, (GLenum target, GLenum pname, GLfloat *params)) \
+    F(void, GetPolygonStipple, (GLubyte *mask)) \
+    F(void, GetPixelMapusv, (GLenum map, GLushort *values)) \
+    F(void, GetPixelMapuiv, (GLenum map, GLuint *values)) \
+    F(void, GetPixelMapfv, (GLenum map, GLfloat *values)) \
+    F(void, GetMaterialiv, (GLenum face, GLenum pname, GLint *params)) \
+    F(void, GetMaterialfv, (GLenum face, GLenum pname, GLfloat *params)) \
+    F(void, GetMapiv, (GLenum target, GLenum query, GLint *v)) \
+    F(void, GetMapfv, (GLenum target, GLenum query, GLfloat *v)) \
+    F(void, GetMapdv, (GLenum target, GLenum query, GLdouble *v)) \
+    F(void, GetLightiv, (GLenum light, GLenum pname, GLint *params)) \
+    F(void, GetLightfv, (GLenum light, GLenum pname, GLfloat *params)) \
+    F(void, GetClipPlane, (GLenum plane, GLdouble *equation)) \
+    F(void, DrawPixels, (GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)) \
+    F(void, CopyPixels, (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)) \
+    F(void, PixelMapusv, (GLenum map, GLsizei mapsize, const GLushort *values)) \
+    F(void, PixelMapuiv, (GLenum map, GLsizei mapsize, const GLuint *values)) \
+    F(void, PixelMapfv, (GLenum map, GLsizei mapsize, const GLfloat *values)) \
+    F(void, PixelTransferi, (GLenum pname, GLint param)) \
+    F(void, PixelTransferf, (GLenum pname, GLfloat param)) \
+    F(void, PixelZoom, (GLfloat xfactor, GLfloat yfactor)) \
+    F(void, AlphaFunc, (GLenum func, GLfloat ref)) \
+    F(void, EvalPoint2, (GLint i, GLint j)) \
+    F(void, EvalMesh2, (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)) \
+    F(void, EvalPoint1, (GLint i)) \
+    F(void, EvalMesh1, (GLenum mode, GLint i1, GLint i2)) \
+    F(void, EvalCoord2fv, (const GLfloat *u)) \
+    F(void, EvalCoord2f, (GLfloat u, GLfloat v)) \
+    F(void, EvalCoord2dv, (const GLdouble *u)) \
+    F(void, EvalCoord2d, (GLdouble u, GLdouble v)) \
+    F(void, EvalCoord1fv, (const GLfloat *u)) \
+    F(void, EvalCoord1f, (GLfloat u)) \
+    F(void, EvalCoord1dv, (const GLdouble *u)) \
+    F(void, EvalCoord1d, (GLdouble u)) \
+    F(void, MapGrid2f, (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)) \
+    F(void, MapGrid2d, (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)) \
+    F(void, MapGrid1f, (GLint un, GLfloat u1, GLfloat u2)) \
+    F(void, MapGrid1d, (GLint un, GLdouble u1, GLdouble u2)) \
+    F(void, Map2f, (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)) \
+    F(void, Map2d, (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)) \
+    F(void, Map1f, (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)) \
+    F(void, Map1d, (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)) \
+    F(void, PushAttrib, (GLbitfield mask)) \
+    F(void, PopAttrib, ()) \
+    F(void, Accum, (GLenum op, GLfloat value)) \
+    F(void, IndexMask, (GLuint mask)) \
+    F(void, ClearIndex, (GLfloat c)) \
+    F(void, ClearAccum, (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)) \
+    F(void, PushName, (GLuint name)) \
+    F(void, PopName, ()) \
+    F(void, PassThrough, (GLfloat token)) \
+    F(void, LoadName, (GLuint name)) \
+    F(void, InitNames, ()) \
+    F(GLint, RenderMode, (GLenum mode)) \
+    F(void, SelectBuffer, (GLsizei size, GLuint *buffer)) \
+    F(void, FeedbackBuffer, (GLsizei size, GLenum type, GLfloat *buffer)) \
+    F(void, TexGeniv, (GLenum coord, GLenum pname, const GLint *params)) \
+    F(void, TexGeni, (GLenum coord, GLenum pname, GLint param)) \
+    F(void, TexGenfv, (GLenum coord, GLenum pname, const GLfloat *params)) \
+    F(void, TexGenf, (GLenum coord, GLenum pname, GLfloat param)) \
+    F(void, TexGendv, (GLenum coord, GLenum pname, const GLdouble *params)) \
+    F(void, TexGend, (GLenum coord, GLenum pname, GLdouble param)) \
+    F(void, TexEnviv, (GLenum target, GLenum pname, const GLint *params)) \
+    F(void, TexEnvi, (GLenum target, GLenum pname, GLint param)) \
+    F(void, TexEnvfv, (GLenum target, GLenum pname, const GLfloat *params)) \
+    F(void, TexEnvf, (GLenum target, GLenum pname, GLfloat param)) \
+    F(void, ShadeModel, (GLenum mode)) \
+    F(void, PolygonStipple, (const GLubyte *mask)) \
+    F(void, Materialiv, (GLenum face, GLenum pname, const GLint *params)) \
+    F(void, Materiali, (GLenum face, GLenum pname, GLint param)) \
+    F(void, Materialfv, (GLenum face, GLenum pname, const GLfloat *params)) \
+    F(void, Materialf, (GLenum face, GLenum pname, GLfloat param)) \
+    F(void, LineStipple, (GLint factor, GLushort pattern)) \
+    F(void, LightModeliv, (GLenum pname, const GLint *params)) \
+    F(void, LightModeli, (GLenum pname, GLint param)) \
+    F(void, LightModelfv, (GLenum pname, const GLfloat *params)) \
+    F(void, LightModelf, (GLenum pname, GLfloat param)) \
+    F(void, Lightiv, (GLenum light, GLenum pname, const GLint *params)) \
+    F(void, Lighti, (GLenum light, GLenum pname, GLint param)) \
+    F(void, Lightfv, (GLenum light, GLenum pname, const GLfloat *params)) \
+    F(void, Lightf, (GLenum light, GLenum pname, GLfloat param)) \
+    F(void, Fogiv, (GLenum pname, const GLint *params)) \
+    F(void, Fogi, (GLenum pname, GLint param)) \
+    F(void, Fogfv, (GLenum pname, const GLfloat *params)) \
+    F(void, Fogf, (GLenum pname, GLfloat param)) \
+    F(void, ColorMaterial, (GLenum face, GLenum mode)) \
+    F(void, ClipPlane, (GLenum plane, const GLdouble *equation)) \
+    F(void, Vertex4sv, (const GLshort *v)) \
+    F(void, Vertex4s, (GLshort x, GLshort y, GLshort z, GLshort w)) \
+    F(void, Vertex4iv, (const GLint *v)) \
+    F(void, Vertex4i, (GLint x, GLint y, GLint z, GLint w)) \
+    F(void, Vertex4fv, (const GLfloat *v)) \
+    F(void, Vertex4f, (GLfloat x, GLfloat y, GLfloat z, GLfloat w)) \
+    F(void, Vertex4dv, (const GLdouble *v)) \
+    F(void, Vertex4d, (GLdouble x, GLdouble y, GLdouble z, GLdouble w)) \
+    F(void, Vertex3sv, (const GLshort *v)) \
+    F(void, Vertex3s, (GLshort x, GLshort y, GLshort z)) \
+    F(void, Vertex3iv, (const GLint *v)) \
+    F(void, Vertex3i, (GLint x, GLint y, GLint z)) \
+    F(void, Vertex3fv, (const GLfloat *v)) \
+    F(void, Vertex3f, (GLfloat x, GLfloat y, GLfloat z)) \
+    F(void, Vertex3dv, (const GLdouble *v)) \
+    F(void, Vertex3d, (GLdouble x, GLdouble y, GLdouble z)) \
+    F(void, Vertex2sv, (const GLshort *v)) \
+    F(void, Vertex2s, (GLshort x, GLshort y)) \
+    F(void, Vertex2iv, (const GLint *v)) \
+    F(void, Vertex2i, (GLint x, GLint y)) \
+    F(void, Vertex2fv, (const GLfloat *v)) \
+    F(void, Vertex2f, (GLfloat x, GLfloat y)) \
+    F(void, Vertex2dv, (const GLdouble *v)) \
+    F(void, Vertex2d, (GLdouble x, GLdouble y)) \
+    F(void, TexCoord4sv, (const GLshort *v)) \
+    F(void, TexCoord4s, (GLshort s, GLshort t, GLshort r, GLshort q)) \
+    F(void, TexCoord4iv, (const GLint *v)) \
+    F(void, TexCoord4i, (GLint s, GLint t, GLint r, GLint q)) \
+    F(void, TexCoord4fv, (const GLfloat *v)) \
+    F(void, TexCoord4f, (GLfloat s, GLfloat t, GLfloat r, GLfloat q)) \
+    F(void, TexCoord4dv, (const GLdouble *v)) \
+    F(void, TexCoord4d, (GLdouble s, GLdouble t, GLdouble r, GLdouble q)) \
+    F(void, TexCoord3sv, (const GLshort *v)) \
+    F(void, TexCoord3s, (GLshort s, GLshort t, GLshort r)) \
+    F(void, TexCoord3iv, (const GLint *v)) \
+    F(void, TexCoord3i, (GLint s, GLint t, GLint r)) \
+    F(void, TexCoord3fv, (const GLfloat *v)) \
+    F(void, TexCoord3f, (GLfloat s, GLfloat t, GLfloat r)) \
+    F(void, TexCoord3dv, (const GLdouble *v)) \
+    F(void, TexCoord3d, (GLdouble s, GLdouble t, GLdouble r)) \
+    F(void, TexCoord2sv, (const GLshort *v)) \
+    F(void, TexCoord2s, (GLshort s, GLshort t)) \
+    F(void, TexCoord2iv, (const GLint *v)) \
+    F(void, TexCoord2i, (GLint s, GLint t)) \
+    F(void, TexCoord2fv, (const GLfloat *v)) \
+    F(void, TexCoord2f, (GLfloat s, GLfloat t)) \
+    F(void, TexCoord2dv, (const GLdouble *v)) \
+    F(void, TexCoord2d, (GLdouble s, GLdouble t)) \
+    F(void, TexCoord1sv, (const GLshort *v)) \
+    F(void, TexCoord1s, (GLshort s)) \
+    F(void, TexCoord1iv, (const GLint *v)) \
+    F(void, TexCoord1i, (GLint s)) \
+    F(void, TexCoord1fv, (const GLfloat *v)) \
+    F(void, TexCoord1f, (GLfloat s)) \
+    F(void, TexCoord1dv, (const GLdouble *v)) \
+    F(void, TexCoord1d, (GLdouble s)) \
+    F(void, Rectsv, (const GLshort *v1, const GLshort *v2)) \
+    F(void, Rects, (GLshort x1, GLshort y1, GLshort x2, GLshort y2)) \
+    F(void, Rectiv, (const GLint *v1, const GLint *v2)) \
+    F(void, Recti, (GLint x1, GLint y1, GLint x2, GLint y2)) \
+    F(void, Rectfv, (const GLfloat *v1, const GLfloat *v2)) \
+    F(void, Rectf, (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)) \
+    F(void, Rectdv, (const GLdouble *v1, const GLdouble *v2)) \
+    F(void, Rectd, (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)) \
+    F(void, RasterPos4sv, (const GLshort *v)) \
+    F(void, RasterPos4s, (GLshort x, GLshort y, GLshort z, GLshort w)) \
+    F(void, RasterPos4iv, (const GLint *v)) \
+    F(void, RasterPos4i, (GLint x, GLint y, GLint z, GLint w)) \
+    F(void, RasterPos4fv, (const GLfloat *v)) \
+    F(void, RasterPos4f, (GLfloat x, GLfloat y, GLfloat z, GLfloat w)) \
+    F(void, RasterPos4dv, (const GLdouble *v)) \
+    F(void, RasterPos4d, (GLdouble x, GLdouble y, GLdouble z, GLdouble w)) \
+    F(void, RasterPos3sv, (const GLshort *v)) \
+    F(void, RasterPos3s, (GLshort x, GLshort y, GLshort z)) \
+    F(void, RasterPos3iv, (const GLint *v)) \
+    F(void, RasterPos3i, (GLint x, GLint y, GLint z)) \
+    F(void, RasterPos3fv, (const GLfloat *v)) \
+    F(void, RasterPos3f, (GLfloat x, GLfloat y, GLfloat z)) \
+    F(void, RasterPos3dv, (const GLdouble *v)) \
+    F(void, RasterPos3d, (GLdouble x, GLdouble y, GLdouble z)) \
+    F(void, RasterPos2sv, (const GLshort *v)) \
+    F(void, RasterPos2s, (GLshort x, GLshort y)) \
+    F(void, RasterPos2iv, (const GLint *v)) \
+    F(void, RasterPos2i, (GLint x, GLint y)) \
+    F(void, RasterPos2fv, (const GLfloat *v)) \
+    F(void, RasterPos2f, (GLfloat x, GLfloat y)) \
+    F(void, RasterPos2dv, (const GLdouble *v)) \
+    F(void, RasterPos2d, (GLdouble x, GLdouble y)) \
+    F(void, Normal3sv, (const GLshort *v)) \
+    F(void, Normal3s, (GLshort nx, GLshort ny, GLshort nz)) \
+    F(void, Normal3iv, (const GLint *v)) \
+    F(void, Normal3i, (GLint nx, GLint ny, GLint nz)) \
+    F(void, Normal3fv, (const GLfloat *v)) \
+    F(void, Normal3f, (GLfloat nx, GLfloat ny, GLfloat nz)) \
+    F(void, Normal3dv, (const GLdouble *v)) \
+    F(void, Normal3d, (GLdouble nx, GLdouble ny, GLdouble nz)) \
+    F(void, Normal3bv, (const GLbyte *v)) \
+    F(void, Normal3b, (GLbyte nx, GLbyte ny, GLbyte nz)) \
+    F(void, Indexsv, (const GLshort *c)) \
+    F(void, Indexs, (GLshort c)) \
+    F(void, Indexiv, (const GLint *c)) \
+    F(void, Indexi, (GLint c)) \
+    F(void, Indexfv, (const GLfloat *c)) \
+    F(void, Indexf, (GLfloat c)) \
+    F(void, Indexdv, (const GLdouble *c)) \
+    F(void, Indexd, (GLdouble c)) \
+    F(void, End, ()) \
+    F(void, EdgeFlagv, (const GLboolean *flag)) \
+    F(void, EdgeFlag, (GLboolean flag)) \
+    F(void, Color4usv, (const GLushort *v)) \
+    F(void, Color4us, (GLushort red, GLushort green, GLushort blue, GLushort alpha)) \
+    F(void, Color4uiv, (const GLuint *v)) \
+    F(void, Color4ui, (GLuint red, GLuint green, GLuint blue, GLuint alpha)) \
+    F(void, Color4ubv, (const GLubyte *v)) \
+    F(void, Color4ub, (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)) \
+    F(void, Color4sv, (const GLshort *v)) \
+    F(void, Color4s, (GLshort red, GLshort green, GLshort blue, GLshort alpha)) \
+    F(void, Color4iv, (const GLint *v)) \
+    F(void, Color4i, (GLint red, GLint green, GLint blue, GLint alpha)) \
+    F(void, Color4fv, (const GLfloat *v)) \
+    F(void, Color4f, (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)) \
+    F(void, Color4dv, (const GLdouble *v)) \
+    F(void, Color4d, (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)) \
+    F(void, Color4bv, (const GLbyte *v)) \
+    F(void, Color4b, (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)) \
+    F(void, Color3usv, (const GLushort *v)) \
+    F(void, Color3us, (GLushort red, GLushort green, GLushort blue)) \
+    F(void, Color3uiv, (const GLuint *v)) \
+    F(void, Color3ui, (GLuint red, GLuint green, GLuint blue)) \
+    F(void, Color3ubv, (const GLubyte *v)) \
+    F(void, Color3ub, (GLubyte red, GLubyte green, GLubyte blue)) \
+    F(void, Color3sv, (const GLshort *v)) \
+    F(void, Color3s, (GLshort red, GLshort green, GLshort blue)) \
+    F(void, Color3iv, (const GLint *v)) \
+    F(void, Color3i, (GLint red, GLint green, GLint blue)) \
+    F(void, Color3fv, (const GLfloat *v)) \
+    F(void, Color3f, (GLfloat red, GLfloat green, GLfloat blue)) \
+    F(void, Color3dv, (const GLdouble *v)) \
+    F(void, Color3d, (GLdouble red, GLdouble green, GLdouble blue)) \
+    F(void, Color3bv, (const GLbyte *v)) \
+    F(void, Color3b, (GLbyte red, GLbyte green, GLbyte blue)) \
+    F(void, Bitmap, (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)) \
+    F(void, Begin, (GLenum mode)) \
+    F(void, ListBase, (GLuint base)) \
+    F(GLuint, GenLists, (GLsizei range)) \
+    F(void, DeleteLists, (GLuint list, GLsizei range)) \
+    F(void, CallLists, (GLsizei n, GLenum type, const GLvoid *lists)) \
+    F(void, CallList, (GLuint list)) \
+    F(void, EndList, ()) \
+    F(void, NewList, (GLuint list, GLenum mode)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_1_0_DEPRECATED_FUNCTIONS);
 };
 
 class QOpenGLFunctions_1_1_DeprecatedBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_1_1_DeprecatedBackend(QOpenGLContext *context);
+    QOpenGLFunctions_1_1_DeprecatedBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_1_1_Deprecated; }
 
     // OpenGL 1.1 deprecated functions
-    void (QOPENGLF_APIENTRYP PushClientAttrib)(GLbitfield mask);
-    void (QOPENGLF_APIENTRYP PopClientAttrib)();
-    void (QOPENGLF_APIENTRYP PrioritizeTextures)(GLsizei n, const GLuint *textures, const GLfloat *priorities);
-    GLboolean (QOPENGLF_APIENTRYP AreTexturesResident)(GLsizei n, const GLuint *textures, GLboolean *residences);
-    void (QOPENGLF_APIENTRYP VertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-    void (QOPENGLF_APIENTRYP TexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-    void (QOPENGLF_APIENTRYP NormalPointer)(GLenum type, GLsizei stride, const GLvoid *pointer);
-    void (QOPENGLF_APIENTRYP InterleavedArrays)(GLenum format, GLsizei stride, const GLvoid *pointer);
-    void (QOPENGLF_APIENTRYP IndexPointer)(GLenum type, GLsizei stride, const GLvoid *pointer);
-    void (QOPENGLF_APIENTRYP EnableClientState)(GLenum array);
-    void (QOPENGLF_APIENTRYP EdgeFlagPointer)(GLsizei stride, const GLvoid *pointer);
-    void (QOPENGLF_APIENTRYP DisableClientState)(GLenum array);
-    void (QOPENGLF_APIENTRYP ColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-    void (QOPENGLF_APIENTRYP ArrayElement)(GLint i);
-    void (QOPENGLF_APIENTRYP Indexubv)(const GLubyte *c);
-    void (QOPENGLF_APIENTRYP Indexub)(GLubyte c);
-    void (QOPENGLF_APIENTRYP GetPointerv)(GLenum pname, GLvoid* *params);
+#define QT_OPENGL_1_1_DEPRECATED_FUNCTIONS(F) \
+    F(void, PushClientAttrib, (GLbitfield mask)) \
+    F(void, PopClientAttrib, ()) \
+    F(void, PrioritizeTextures, (GLsizei n, const GLuint *textures, const GLfloat *priorities)) \
+    F(GLboolean, AreTexturesResident, (GLsizei n, const GLuint *textures, GLboolean *residences)) \
+    F(void, VertexPointer, (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) \
+    F(void, TexCoordPointer, (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) \
+    F(void, NormalPointer, (GLenum type, GLsizei stride, const GLvoid *pointer)) \
+    F(void, InterleavedArrays, (GLenum format, GLsizei stride, const GLvoid *pointer)) \
+    F(void, IndexPointer, (GLenum type, GLsizei stride, const GLvoid *pointer)) \
+    F(void, EnableClientState, (GLenum array)) \
+    F(void, EdgeFlagPointer, (GLsizei stride, const GLvoid *pointer)) \
+    F(void, DisableClientState, (GLenum array)) \
+    F(void, ColorPointer, (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) \
+    F(void, ArrayElement, (GLint i)) \
+    F(void, Indexubv, (const GLubyte *c)) \
+    F(void, Indexub, (GLubyte c)) \
+    F(void, GetPointerv, (GLenum pname, GLvoid* *params)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_1_1_DEPRECATED_FUNCTIONS);
 };
 
 class QOpenGLFunctions_1_2_DeprecatedBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_1_2_DeprecatedBackend(QOpenGLContext *context);
+    QOpenGLFunctions_1_2_DeprecatedBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_1_2_Deprecated; }
 
     // OpenGL 1.2 deprecated functions
-    void (QOPENGLF_APIENTRYP ColorTableParameterfv)(GLenum target, GLenum pname, const GLfloat *params);
-    void (QOPENGLF_APIENTRYP ColorTableParameteriv)(GLenum target, GLenum pname, const GLint *params);
-    void (QOPENGLF_APIENTRYP CopyColorTable)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-    void (QOPENGLF_APIENTRYP GetColorTable)(GLenum target, GLenum format, GLenum type, GLvoid *table);
-    void (QOPENGLF_APIENTRYP GetColorTableParameterfv)(GLenum target, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetColorTableParameteriv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP ColorSubTable)(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data);
-    void (QOPENGLF_APIENTRYP CopyColorSubTable)(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
-    void (QOPENGLF_APIENTRYP ConvolutionFilter1D)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image);
-    void (QOPENGLF_APIENTRYP ConvolutionFilter2D)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image);
-    void (QOPENGLF_APIENTRYP ConvolutionParameterf)(GLenum target, GLenum pname, GLfloat params);
-    void (QOPENGLF_APIENTRYP ConvolutionParameterfv)(GLenum target, GLenum pname, const GLfloat *params);
-    void (QOPENGLF_APIENTRYP ConvolutionParameteri)(GLenum target, GLenum pname, GLint params);
-    void (QOPENGLF_APIENTRYP ConvolutionParameteriv)(GLenum target, GLenum pname, const GLint *params);
-    void (QOPENGLF_APIENTRYP CopyConvolutionFilter1D)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
-    void (QOPENGLF_APIENTRYP CopyConvolutionFilter2D)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
-    void (QOPENGLF_APIENTRYP GetConvolutionFilter)(GLenum target, GLenum format, GLenum type, GLvoid *image);
-    void (QOPENGLF_APIENTRYP GetConvolutionParameterfv)(GLenum target, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetConvolutionParameteriv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetSeparableFilter)(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span);
-    void (QOPENGLF_APIENTRYP SeparableFilter2D)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column);
-    void (QOPENGLF_APIENTRYP GetHistogram)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-    void (QOPENGLF_APIENTRYP GetHistogramParameterfv)(GLenum target, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetHistogramParameteriv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP GetMinmax)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-    void (QOPENGLF_APIENTRYP GetMinmaxParameterfv)(GLenum target, GLenum pname, GLfloat *params);
-    void (QOPENGLF_APIENTRYP GetMinmaxParameteriv)(GLenum target, GLenum pname, GLint *params);
-    void (QOPENGLF_APIENTRYP Histogram)(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-    void (QOPENGLF_APIENTRYP Minmax)(GLenum target, GLenum internalformat, GLboolean sink);
-    void (QOPENGLF_APIENTRYP ResetHistogram)(GLenum target);
-    void (QOPENGLF_APIENTRYP ResetMinmax)(GLenum target);
-    void (QOPENGLF_APIENTRYP ColorTable)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table);
-
+#define QT_OPENGL_1_2_DEPRECATED_FUNCTIONS(F) \
+    F(void, ColorTableParameterfv, (GLenum target, GLenum pname, const GLfloat *params)) \
+    F(void, ColorTableParameteriv, (GLenum target, GLenum pname, const GLint *params)) \
+    F(void, CopyColorTable, (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)) \
+    F(void, GetColorTable, (GLenum target, GLenum format, GLenum type, GLvoid *table)) \
+    F(void, GetColorTableParameterfv, (GLenum target, GLenum pname, GLfloat *params)) \
+    F(void, GetColorTableParameteriv, (GLenum target, GLenum pname, GLint *params)) \
+    F(void, ColorSubTable, (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)) \
+    F(void, CopyColorSubTable, (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)) \
+    F(void, ConvolutionFilter1D, (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)) \
+    F(void, ConvolutionFilter2D, (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)) \
+    F(void, ConvolutionParameterf, (GLenum target, GLenum pname, GLfloat params)) \
+    F(void, ConvolutionParameterfv, (GLenum target, GLenum pname, const GLfloat *params)) \
+    F(void, ConvolutionParameteri, (GLenum target, GLenum pname, GLint params)) \
+    F(void, ConvolutionParameteriv, (GLenum target, GLenum pname, const GLint *params)) \
+    F(void, CopyConvolutionFilter1D, (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)) \
+    F(void, CopyConvolutionFilter2D, (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)) \
+    F(void, GetConvolutionFilter, (GLenum target, GLenum format, GLenum type, GLvoid *image)) \
+    F(void, GetConvolutionParameterfv, (GLenum target, GLenum pname, GLfloat *params)) \
+    F(void, GetConvolutionParameteriv, (GLenum target, GLenum pname, GLint *params)) \
+    F(void, GetSeparableFilter, (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)) \
+    F(void, SeparableFilter2D, (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)) \
+    F(void, GetHistogram, (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)) \
+    F(void, GetHistogramParameterfv, (GLenum target, GLenum pname, GLfloat *params)) \
+    F(void, GetHistogramParameteriv, (GLenum target, GLenum pname, GLint *params)) \
+    F(void, GetMinmax, (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)) \
+    F(void, GetMinmaxParameterfv, (GLenum target, GLenum pname, GLfloat *params)) \
+    F(void, GetMinmaxParameteriv, (GLenum target, GLenum pname, GLint *params)) \
+    F(void, Histogram, (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)) \
+    F(void, Minmax, (GLenum target, GLenum internalformat, GLboolean sink)) \
+    F(void, ResetHistogram, (GLenum target)) \
+    F(void, ResetMinmax, (GLenum target)) \
+    F(void, ColorTable, (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_1_2_DEPRECATED_FUNCTIONS);
 };
 
 class QOpenGLFunctions_1_3_DeprecatedBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_1_3_DeprecatedBackend(QOpenGLContext *context);
+    QOpenGLFunctions_1_3_DeprecatedBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_1_3_Deprecated; }
 
     // OpenGL 1.3 deprecated functions
-    void (QOPENGLF_APIENTRYP MultTransposeMatrixd)(const GLdouble *m);
-    void (QOPENGLF_APIENTRYP MultTransposeMatrixf)(const GLfloat *m);
-    void (QOPENGLF_APIENTRYP LoadTransposeMatrixd)(const GLdouble *m);
-    void (QOPENGLF_APIENTRYP LoadTransposeMatrixf)(const GLfloat *m);
-    void (QOPENGLF_APIENTRYP MultiTexCoord4sv)(GLenum target, const GLshort *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord4s)(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
-    void (QOPENGLF_APIENTRYP MultiTexCoord4iv)(GLenum target, const GLint *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord4i)(GLenum target, GLint s, GLint t, GLint r, GLint q);
-    void (QOPENGLF_APIENTRYP MultiTexCoord4fv)(GLenum target, const GLfloat *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord4f)(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-    void (QOPENGLF_APIENTRYP MultiTexCoord4dv)(GLenum target, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord4d)(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-    void (QOPENGLF_APIENTRYP MultiTexCoord3sv)(GLenum target, const GLshort *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord3s)(GLenum target, GLshort s, GLshort t, GLshort r);
-    void (QOPENGLF_APIENTRYP MultiTexCoord3iv)(GLenum target, const GLint *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord3i)(GLenum target, GLint s, GLint t, GLint r);
-    void (QOPENGLF_APIENTRYP MultiTexCoord3fv)(GLenum target, const GLfloat *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord3f)(GLenum target, GLfloat s, GLfloat t, GLfloat r);
-    void (QOPENGLF_APIENTRYP MultiTexCoord3dv)(GLenum target, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord3d)(GLenum target, GLdouble s, GLdouble t, GLdouble r);
-    void (QOPENGLF_APIENTRYP MultiTexCoord2sv)(GLenum target, const GLshort *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord2s)(GLenum target, GLshort s, GLshort t);
-    void (QOPENGLF_APIENTRYP MultiTexCoord2iv)(GLenum target, const GLint *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord2i)(GLenum target, GLint s, GLint t);
-    void (QOPENGLF_APIENTRYP MultiTexCoord2fv)(GLenum target, const GLfloat *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord2f)(GLenum target, GLfloat s, GLfloat t);
-    void (QOPENGLF_APIENTRYP MultiTexCoord2dv)(GLenum target, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord2d)(GLenum target, GLdouble s, GLdouble t);
-    void (QOPENGLF_APIENTRYP MultiTexCoord1sv)(GLenum target, const GLshort *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord1s)(GLenum target, GLshort s);
-    void (QOPENGLF_APIENTRYP MultiTexCoord1iv)(GLenum target, const GLint *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord1i)(GLenum target, GLint s);
-    void (QOPENGLF_APIENTRYP MultiTexCoord1fv)(GLenum target, const GLfloat *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord1f)(GLenum target, GLfloat s);
-    void (QOPENGLF_APIENTRYP MultiTexCoord1dv)(GLenum target, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP MultiTexCoord1d)(GLenum target, GLdouble s);
-    void (QOPENGLF_APIENTRYP ClientActiveTexture)(GLenum texture);
-
+#define QT_OPENGL_1_3_DEPRECATED_FUNCTIONS(F) \
+    F(void, MultTransposeMatrixd, (const GLdouble *m)) \
+    F(void, MultTransposeMatrixf, (const GLfloat *m)) \
+    F(void, LoadTransposeMatrixd, (const GLdouble *m)) \
+    F(void, LoadTransposeMatrixf, (const GLfloat *m)) \
+    F(void, MultiTexCoord4sv, (GLenum target, const GLshort *v)) \
+    F(void, MultiTexCoord4s, (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)) \
+    F(void, MultiTexCoord4iv, (GLenum target, const GLint *v)) \
+    F(void, MultiTexCoord4i, (GLenum target, GLint s, GLint t, GLint r, GLint q)) \
+    F(void, MultiTexCoord4fv, (GLenum target, const GLfloat *v)) \
+    F(void, MultiTexCoord4f, (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)) \
+    F(void, MultiTexCoord4dv, (GLenum target, const GLdouble *v)) \
+    F(void, MultiTexCoord4d, (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)) \
+    F(void, MultiTexCoord3sv, (GLenum target, const GLshort *v)) \
+    F(void, MultiTexCoord3s, (GLenum target, GLshort s, GLshort t, GLshort r)) \
+    F(void, MultiTexCoord3iv, (GLenum target, const GLint *v)) \
+    F(void, MultiTexCoord3i, (GLenum target, GLint s, GLint t, GLint r)) \
+    F(void, MultiTexCoord3fv, (GLenum target, const GLfloat *v)) \
+    F(void, MultiTexCoord3f, (GLenum target, GLfloat s, GLfloat t, GLfloat r)) \
+    F(void, MultiTexCoord3dv, (GLenum target, const GLdouble *v)) \
+    F(void, MultiTexCoord3d, (GLenum target, GLdouble s, GLdouble t, GLdouble r)) \
+    F(void, MultiTexCoord2sv, (GLenum target, const GLshort *v)) \
+    F(void, MultiTexCoord2s, (GLenum target, GLshort s, GLshort t)) \
+    F(void, MultiTexCoord2iv, (GLenum target, const GLint *v)) \
+    F(void, MultiTexCoord2i, (GLenum target, GLint s, GLint t)) \
+    F(void, MultiTexCoord2fv, (GLenum target, const GLfloat *v)) \
+    F(void, MultiTexCoord2f, (GLenum target, GLfloat s, GLfloat t)) \
+    F(void, MultiTexCoord2dv, (GLenum target, const GLdouble *v)) \
+    F(void, MultiTexCoord2d, (GLenum target, GLdouble s, GLdouble t)) \
+    F(void, MultiTexCoord1sv, (GLenum target, const GLshort *v)) \
+    F(void, MultiTexCoord1s, (GLenum target, GLshort s)) \
+    F(void, MultiTexCoord1iv, (GLenum target, const GLint *v)) \
+    F(void, MultiTexCoord1i, (GLenum target, GLint s)) \
+    F(void, MultiTexCoord1fv, (GLenum target, const GLfloat *v)) \
+    F(void, MultiTexCoord1f, (GLenum target, GLfloat s)) \
+    F(void, MultiTexCoord1dv, (GLenum target, const GLdouble *v)) \
+    F(void, MultiTexCoord1d, (GLenum target, GLdouble s)) \
+    F(void, ClientActiveTexture, (GLenum texture)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_1_3_DEPRECATED_FUNCTIONS);
 };
 
 class QOpenGLFunctions_1_4_DeprecatedBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_1_4_DeprecatedBackend(QOpenGLContext *context);
+    QOpenGLFunctions_1_4_DeprecatedBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_1_4_Deprecated; }
 
     // OpenGL 1.4 deprecated functions
-    void (QOPENGLF_APIENTRYP WindowPos3sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP WindowPos3s)(GLshort x, GLshort y, GLshort z);
-    void (QOPENGLF_APIENTRYP WindowPos3iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP WindowPos3i)(GLint x, GLint y, GLint z);
-    void (QOPENGLF_APIENTRYP WindowPos3fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP WindowPos3f)(GLfloat x, GLfloat y, GLfloat z);
-    void (QOPENGLF_APIENTRYP WindowPos3dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP WindowPos3d)(GLdouble x, GLdouble y, GLdouble z);
-    void (QOPENGLF_APIENTRYP WindowPos2sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP WindowPos2s)(GLshort x, GLshort y);
-    void (QOPENGLF_APIENTRYP WindowPos2iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP WindowPos2i)(GLint x, GLint y);
-    void (QOPENGLF_APIENTRYP WindowPos2fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP WindowPos2f)(GLfloat x, GLfloat y);
-    void (QOPENGLF_APIENTRYP WindowPos2dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP WindowPos2d)(GLdouble x, GLdouble y);
-    void (QOPENGLF_APIENTRYP SecondaryColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-    void (QOPENGLF_APIENTRYP SecondaryColor3usv)(const GLushort *v);
-    void (QOPENGLF_APIENTRYP SecondaryColor3us)(GLushort red, GLushort green, GLushort blue);
-    void (QOPENGLF_APIENTRYP SecondaryColor3uiv)(const GLuint *v);
-    void (QOPENGLF_APIENTRYP SecondaryColor3ui)(GLuint red, GLuint green, GLuint blue);
-    void (QOPENGLF_APIENTRYP SecondaryColor3ubv)(const GLubyte *v);
-    void (QOPENGLF_APIENTRYP SecondaryColor3ub)(GLubyte red, GLubyte green, GLubyte blue);
-    void (QOPENGLF_APIENTRYP SecondaryColor3sv)(const GLshort *v);
-    void (QOPENGLF_APIENTRYP SecondaryColor3s)(GLshort red, GLshort green, GLshort blue);
-    void (QOPENGLF_APIENTRYP SecondaryColor3iv)(const GLint *v);
-    void (QOPENGLF_APIENTRYP SecondaryColor3i)(GLint red, GLint green, GLint blue);
-    void (QOPENGLF_APIENTRYP SecondaryColor3fv)(const GLfloat *v);
-    void (QOPENGLF_APIENTRYP SecondaryColor3f)(GLfloat red, GLfloat green, GLfloat blue);
-    void (QOPENGLF_APIENTRYP SecondaryColor3dv)(const GLdouble *v);
-    void (QOPENGLF_APIENTRYP SecondaryColor3d)(GLdouble red, GLdouble green, GLdouble blue);
-    void (QOPENGLF_APIENTRYP SecondaryColor3bv)(const GLbyte *v);
-    void (QOPENGLF_APIENTRYP SecondaryColor3b)(GLbyte red, GLbyte green, GLbyte blue);
-    void (QOPENGLF_APIENTRYP FogCoordPointer)(GLenum type, GLsizei stride, const GLvoid *pointer);
-    void (QOPENGLF_APIENTRYP FogCoorddv)(const GLdouble *coord);
-    void (QOPENGLF_APIENTRYP FogCoordd)(GLdouble coord);
-    void (QOPENGLF_APIENTRYP FogCoordfv)(const GLfloat *coord);
-    void (QOPENGLF_APIENTRYP FogCoordf)(GLfloat coord);
-
+#define QT_OPENGL_1_4_DEPRECATED_FUNCTIONS(F) \
+    F(void, WindowPos3sv, (const GLshort *v)) \
+    F(void, WindowPos3s, (GLshort x, GLshort y, GLshort z)) \
+    F(void, WindowPos3iv, (const GLint *v)) \
+    F(void, WindowPos3i, (GLint x, GLint y, GLint z)) \
+    F(void, WindowPos3fv, (const GLfloat *v)) \
+    F(void, WindowPos3f, (GLfloat x, GLfloat y, GLfloat z)) \
+    F(void, WindowPos3dv, (const GLdouble *v)) \
+    F(void, WindowPos3d, (GLdouble x, GLdouble y, GLdouble z)) \
+    F(void, WindowPos2sv, (const GLshort *v)) \
+    F(void, WindowPos2s, (GLshort x, GLshort y)) \
+    F(void, WindowPos2iv, (const GLint *v)) \
+    F(void, WindowPos2i, (GLint x, GLint y)) \
+    F(void, WindowPos2fv, (const GLfloat *v)) \
+    F(void, WindowPos2f, (GLfloat x, GLfloat y)) \
+    F(void, WindowPos2dv, (const GLdouble *v)) \
+    F(void, WindowPos2d, (GLdouble x, GLdouble y)) \
+    F(void, SecondaryColorPointer, (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) \
+    F(void, SecondaryColor3usv, (const GLushort *v)) \
+    F(void, SecondaryColor3us, (GLushort red, GLushort green, GLushort blue)) \
+    F(void, SecondaryColor3uiv, (const GLuint *v)) \
+    F(void, SecondaryColor3ui, (GLuint red, GLuint green, GLuint blue)) \
+    F(void, SecondaryColor3ubv, (const GLubyte *v)) \
+    F(void, SecondaryColor3ub, (GLubyte red, GLubyte green, GLubyte blue)) \
+    F(void, SecondaryColor3sv, (const GLshort *v)) \
+    F(void, SecondaryColor3s, (GLshort red, GLshort green, GLshort blue)) \
+    F(void, SecondaryColor3iv, (const GLint *v)) \
+    F(void, SecondaryColor3i, (GLint red, GLint green, GLint blue)) \
+    F(void, SecondaryColor3fv, (const GLfloat *v)) \
+    F(void, SecondaryColor3f, (GLfloat red, GLfloat green, GLfloat blue)) \
+    F(void, SecondaryColor3dv, (const GLdouble *v)) \
+    F(void, SecondaryColor3d, (GLdouble red, GLdouble green, GLdouble blue)) \
+    F(void, SecondaryColor3bv, (const GLbyte *v)) \
+    F(void, SecondaryColor3b, (GLbyte red, GLbyte green, GLbyte blue)) \
+    F(void, FogCoordPointer, (GLenum type, GLsizei stride, const GLvoid *pointer)) \
+    F(void, FogCoorddv, (const GLdouble *coord)) \
+    F(void, FogCoordd, (GLdouble coord)) \
+    F(void, FogCoordfv, (const GLfloat *coord)) \
+    F(void, FogCoordf, (GLfloat coord)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_1_4_DEPRECATED_FUNCTIONS);
 };
 
 class QOpenGLFunctions_2_0_DeprecatedBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_2_0_DeprecatedBackend(QOpenGLContext *context);
+    QOpenGLFunctions_2_0_DeprecatedBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_2_0_Deprecated; }
 
     // OpenGL 2.0 deprecated functions
-    void (QOPENGLF_APIENTRYP VertexAttrib4usv)(GLuint index, const GLushort *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4uiv)(GLuint index, const GLuint *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4ubv)(GLuint index, const GLubyte *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4sv)(GLuint index, const GLshort *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4s)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
-    void (QOPENGLF_APIENTRYP VertexAttrib4iv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4fv)(GLuint index, const GLfloat *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4f)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-    void (QOPENGLF_APIENTRYP VertexAttrib4dv)(GLuint index, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4d)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-    void (QOPENGLF_APIENTRYP VertexAttrib4bv)(GLuint index, const GLbyte *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4Nusv)(GLuint index, const GLushort *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4Nuiv)(GLuint index, const GLuint *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4Nubv)(GLuint index, const GLubyte *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4Nub)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
-    void (QOPENGLF_APIENTRYP VertexAttrib4Nsv)(GLuint index, const GLshort *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4Niv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib4Nbv)(GLuint index, const GLbyte *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib3sv)(GLuint index, const GLshort *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib3s)(GLuint index, GLshort x, GLshort y, GLshort z);
-    void (QOPENGLF_APIENTRYP VertexAttrib3fv)(GLuint index, const GLfloat *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib3f)(GLuint index, GLfloat x, GLfloat y, GLfloat z);
-    void (QOPENGLF_APIENTRYP VertexAttrib3dv)(GLuint index, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib3d)(GLuint index, GLdouble x, GLdouble y, GLdouble z);
-    void (QOPENGLF_APIENTRYP VertexAttrib2sv)(GLuint index, const GLshort *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib2s)(GLuint index, GLshort x, GLshort y);
-    void (QOPENGLF_APIENTRYP VertexAttrib2fv)(GLuint index, const GLfloat *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib2f)(GLuint index, GLfloat x, GLfloat y);
-    void (QOPENGLF_APIENTRYP VertexAttrib2dv)(GLuint index, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib2d)(GLuint index, GLdouble x, GLdouble y);
-    void (QOPENGLF_APIENTRYP VertexAttrib1sv)(GLuint index, const GLshort *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib1s)(GLuint index, GLshort x);
-    void (QOPENGLF_APIENTRYP VertexAttrib1fv)(GLuint index, const GLfloat *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib1f)(GLuint index, GLfloat x);
-    void (QOPENGLF_APIENTRYP VertexAttrib1dv)(GLuint index, const GLdouble *v);
-    void (QOPENGLF_APIENTRYP VertexAttrib1d)(GLuint index, GLdouble x);
-
+#define QT_OPENGL_2_0_DEPRECATED_FUNCTIONS(F) \
+    F(void, VertexAttrib4usv, (GLuint index, const GLushort *v)) \
+    F(void, VertexAttrib4uiv, (GLuint index, const GLuint *v)) \
+    F(void, VertexAttrib4ubv, (GLuint index, const GLubyte *v)) \
+    F(void, VertexAttrib4sv, (GLuint index, const GLshort *v)) \
+    F(void, VertexAttrib4s, (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)) \
+    F(void, VertexAttrib4iv, (GLuint index, const GLint *v)) \
+    F(void, VertexAttrib4fv, (GLuint index, const GLfloat *v)) \
+    F(void, VertexAttrib4f, (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) \
+    F(void, VertexAttrib4dv, (GLuint index, const GLdouble *v)) \
+    F(void, VertexAttrib4d, (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) \
+    F(void, VertexAttrib4bv, (GLuint index, const GLbyte *v)) \
+    F(void, VertexAttrib4Nusv, (GLuint index, const GLushort *v)) \
+    F(void, VertexAttrib4Nuiv, (GLuint index, const GLuint *v)) \
+    F(void, VertexAttrib4Nubv, (GLuint index, const GLubyte *v)) \
+    F(void, VertexAttrib4Nub, (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)) \
+    F(void, VertexAttrib4Nsv, (GLuint index, const GLshort *v)) \
+    F(void, VertexAttrib4Niv, (GLuint index, const GLint *v)) \
+    F(void, VertexAttrib4Nbv, (GLuint index, const GLbyte *v)) \
+    F(void, VertexAttrib3sv, (GLuint index, const GLshort *v)) \
+    F(void, VertexAttrib3s, (GLuint index, GLshort x, GLshort y, GLshort z)) \
+    F(void, VertexAttrib3fv, (GLuint index, const GLfloat *v)) \
+    F(void, VertexAttrib3f, (GLuint index, GLfloat x, GLfloat y, GLfloat z)) \
+    F(void, VertexAttrib3dv, (GLuint index, const GLdouble *v)) \
+    F(void, VertexAttrib3d, (GLuint index, GLdouble x, GLdouble y, GLdouble z)) \
+    F(void, VertexAttrib2sv, (GLuint index, const GLshort *v)) \
+    F(void, VertexAttrib2s, (GLuint index, GLshort x, GLshort y)) \
+    F(void, VertexAttrib2fv, (GLuint index, const GLfloat *v)) \
+    F(void, VertexAttrib2f, (GLuint index, GLfloat x, GLfloat y)) \
+    F(void, VertexAttrib2dv, (GLuint index, const GLdouble *v)) \
+    F(void, VertexAttrib2d, (GLuint index, GLdouble x, GLdouble y)) \
+    F(void, VertexAttrib1sv, (GLuint index, const GLshort *v)) \
+    F(void, VertexAttrib1s, (GLuint index, GLshort x)) \
+    F(void, VertexAttrib1fv, (GLuint index, const GLfloat *v)) \
+    F(void, VertexAttrib1f, (GLuint index, GLfloat x)) \
+    F(void, VertexAttrib1dv, (GLuint index, const GLdouble *v)) \
+    F(void, VertexAttrib1d, (GLuint index, GLdouble x)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_2_0_DEPRECATED_FUNCTIONS);
 };
 
 class QOpenGLFunctions_3_0_DeprecatedBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_3_0_DeprecatedBackend(QOpenGLContext *context);
+    QOpenGLFunctions_3_0_DeprecatedBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_3_0_Deprecated; }
 
     // OpenGL 3.0 deprecated functions
-    void (QOPENGLF_APIENTRYP VertexAttribI4usv)(GLuint index, const GLushort *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI4ubv)(GLuint index, const GLubyte *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI4sv)(GLuint index, const GLshort *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI4bv)(GLuint index, const GLbyte *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI4uiv)(GLuint index, const GLuint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI3uiv)(GLuint index, const GLuint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI2uiv)(GLuint index, const GLuint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI1uiv)(GLuint index, const GLuint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI4iv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI3iv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI2iv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI1iv)(GLuint index, const GLint *v);
-    void (QOPENGLF_APIENTRYP VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-    void (QOPENGLF_APIENTRYP VertexAttribI3ui)(GLuint index, GLuint x, GLuint y, GLuint z);
-    void (QOPENGLF_APIENTRYP VertexAttribI2ui)(GLuint index, GLuint x, GLuint y);
-    void (QOPENGLF_APIENTRYP VertexAttribI1ui)(GLuint index, GLuint x);
-    void (QOPENGLF_APIENTRYP VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w);
-    void (QOPENGLF_APIENTRYP VertexAttribI3i)(GLuint index, GLint x, GLint y, GLint z);
-    void (QOPENGLF_APIENTRYP VertexAttribI2i)(GLuint index, GLint x, GLint y);
-    void (QOPENGLF_APIENTRYP VertexAttribI1i)(GLuint index, GLint x);
-
+#define QT_OPENGL_3_0_DEPRECATED_FUNCTIONS(F) \
+    F(void, VertexAttribI4usv, (GLuint index, const GLushort *v)) \
+    F(void, VertexAttribI4ubv, (GLuint index, const GLubyte *v)) \
+    F(void, VertexAttribI4sv, (GLuint index, const GLshort *v)) \
+    F(void, VertexAttribI4bv, (GLuint index, const GLbyte *v)) \
+    F(void, VertexAttribI4uiv, (GLuint index, const GLuint *v)) \
+    F(void, VertexAttribI3uiv, (GLuint index, const GLuint *v)) \
+    F(void, VertexAttribI2uiv, (GLuint index, const GLuint *v)) \
+    F(void, VertexAttribI1uiv, (GLuint index, const GLuint *v)) \
+    F(void, VertexAttribI4iv, (GLuint index, const GLint *v)) \
+    F(void, VertexAttribI3iv, (GLuint index, const GLint *v)) \
+    F(void, VertexAttribI2iv, (GLuint index, const GLint *v)) \
+    F(void, VertexAttribI1iv, (GLuint index, const GLint *v)) \
+    F(void, VertexAttribI4ui, (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)) \
+    F(void, VertexAttribI3ui, (GLuint index, GLuint x, GLuint y, GLuint z)) \
+    F(void, VertexAttribI2ui, (GLuint index, GLuint x, GLuint y)) \
+    F(void, VertexAttribI1ui, (GLuint index, GLuint x)) \
+    F(void, VertexAttribI4i, (GLuint index, GLint x, GLint y, GLint z, GLint w)) \
+    F(void, VertexAttribI3i, (GLuint index, GLint x, GLint y, GLint z)) \
+    F(void, VertexAttribI2i, (GLuint index, GLint x, GLint y)) \
+    F(void, VertexAttribI1i, (GLuint index, GLint x)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_3_0_DEPRECATED_FUNCTIONS);
 };
 
 class QOpenGLFunctions_3_3_DeprecatedBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_3_3_DeprecatedBackend(QOpenGLContext *context);
+    QOpenGLFunctions_3_3_DeprecatedBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_3_3_Deprecated; }
 
     // OpenGL 3.3 deprecated functions
-    void (QOPENGLF_APIENTRYP SecondaryColorP3uiv)(GLenum type, const GLuint *color);
-    void (QOPENGLF_APIENTRYP SecondaryColorP3ui)(GLenum type, GLuint color);
-    void (QOPENGLF_APIENTRYP ColorP4uiv)(GLenum type, const GLuint *color);
-    void (QOPENGLF_APIENTRYP ColorP4ui)(GLenum type, GLuint color);
-    void (QOPENGLF_APIENTRYP ColorP3uiv)(GLenum type, const GLuint *color);
-    void (QOPENGLF_APIENTRYP ColorP3ui)(GLenum type, GLuint color);
-    void (QOPENGLF_APIENTRYP NormalP3uiv)(GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP NormalP3ui)(GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP4uiv)(GLenum texture, GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP4ui)(GLenum texture, GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP3uiv)(GLenum texture, GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP3ui)(GLenum texture, GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP2uiv)(GLenum texture, GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP2ui)(GLenum texture, GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP1uiv)(GLenum texture, GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP MultiTexCoordP1ui)(GLenum texture, GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP TexCoordP4uiv)(GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP TexCoordP4ui)(GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP TexCoordP3uiv)(GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP TexCoordP3ui)(GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP TexCoordP2uiv)(GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP TexCoordP2ui)(GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP TexCoordP1uiv)(GLenum type, const GLuint *coords);
-    void (QOPENGLF_APIENTRYP TexCoordP1ui)(GLenum type, GLuint coords);
-    void (QOPENGLF_APIENTRYP VertexP4uiv)(GLenum type, const GLuint *value);
-    void (QOPENGLF_APIENTRYP VertexP4ui)(GLenum type, GLuint value);
-    void (QOPENGLF_APIENTRYP VertexP3uiv)(GLenum type, const GLuint *value);
-    void (QOPENGLF_APIENTRYP VertexP3ui)(GLenum type, GLuint value);
-    void (QOPENGLF_APIENTRYP VertexP2uiv)(GLenum type, const GLuint *value);
-    void (QOPENGLF_APIENTRYP VertexP2ui)(GLenum type, GLuint value);
-
+#define QT_OPENGL_3_3_DEPRECATED_FUNCTIONS(F) \
+    F(void, SecondaryColorP3uiv, (GLenum type, const GLuint *color)) \
+    F(void, SecondaryColorP3ui, (GLenum type, GLuint color)) \
+    F(void, ColorP4uiv, (GLenum type, const GLuint *color)) \
+    F(void, ColorP4ui, (GLenum type, GLuint color)) \
+    F(void, ColorP3uiv, (GLenum type, const GLuint *color)) \
+    F(void, ColorP3ui, (GLenum type, GLuint color)) \
+    F(void, NormalP3uiv, (GLenum type, const GLuint *coords)) \
+    F(void, NormalP3ui, (GLenum type, GLuint coords)) \
+    F(void, MultiTexCoordP4uiv, (GLenum texture, GLenum type, const GLuint *coords)) \
+    F(void, MultiTexCoordP4ui, (GLenum texture, GLenum type, GLuint coords)) \
+    F(void, MultiTexCoordP3uiv, (GLenum texture, GLenum type, const GLuint *coords)) \
+    F(void, MultiTexCoordP3ui, (GLenum texture, GLenum type, GLuint coords)) \
+    F(void, MultiTexCoordP2uiv, (GLenum texture, GLenum type, const GLuint *coords)) \
+    F(void, MultiTexCoordP2ui, (GLenum texture, GLenum type, GLuint coords)) \
+    F(void, MultiTexCoordP1uiv, (GLenum texture, GLenum type, const GLuint *coords)) \
+    F(void, MultiTexCoordP1ui, (GLenum texture, GLenum type, GLuint coords)) \
+    F(void, TexCoordP4uiv, (GLenum type, const GLuint *coords)) \
+    F(void, TexCoordP4ui, (GLenum type, GLuint coords)) \
+    F(void, TexCoordP3uiv, (GLenum type, const GLuint *coords)) \
+    F(void, TexCoordP3ui, (GLenum type, GLuint coords)) \
+    F(void, TexCoordP2uiv, (GLenum type, const GLuint *coords)) \
+    F(void, TexCoordP2ui, (GLenum type, GLuint coords)) \
+    F(void, TexCoordP1uiv, (GLenum type, const GLuint *coords)) \
+    F(void, TexCoordP1ui, (GLenum type, GLuint coords)) \
+    F(void, VertexP4uiv, (GLenum type, const GLuint *value)) \
+    F(void, VertexP4ui, (GLenum type, GLuint value)) \
+    F(void, VertexP3uiv, (GLenum type, const GLuint *value)) \
+    F(void, VertexP3ui, (GLenum type, GLuint value)) \
+    F(void, VertexP2uiv, (GLenum type, const GLuint *value)) \
+    F(void, VertexP2ui, (GLenum type, GLuint value)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_3_3_DEPRECATED_FUNCTIONS);
 };
 
 class QOpenGLFunctions_4_5_DeprecatedBackend : public QOpenGLVersionFunctionsBackend
 {
 public:
-    QOpenGLFunctions_4_5_DeprecatedBackend(QOpenGLContext *context);
+    QOpenGLFunctions_4_5_DeprecatedBackend(QOpenGLContext *c)
+        : QOpenGLVersionFunctionsBackend(c)
+    {
+        init();
+    }
 
-    static QOpenGLVersionStatus versionStatus();
+    Q_DECL_CONSTEXPR static Version versionStatus()
+    { return OpenGL_4_5_Deprecated; }
 
     // OpenGL 4.5 deprecated functions
-    void (QOPENGLF_APIENTRYP GetnMinmax)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values);
-    void (QOPENGLF_APIENTRYP GetnHistogram)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values);
-    void (QOPENGLF_APIENTRYP GetnSeparableFilter)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span);
-    void (QOPENGLF_APIENTRYP GetnConvolutionFilter)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image);
-    void (QOPENGLF_APIENTRYP GetnColorTable)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table);
-    void (QOPENGLF_APIENTRYP GetnPolygonStipple)(GLsizei bufSize, GLubyte *pattern);
-    void (QOPENGLF_APIENTRYP GetnPixelMapusv)(GLenum map, GLsizei bufSize, GLushort *values);
-    void (QOPENGLF_APIENTRYP GetnPixelMapuiv)(GLenum map, GLsizei bufSize, GLuint *values);
-    void (QOPENGLF_APIENTRYP GetnPixelMapfv)(GLenum map, GLsizei bufSize, GLfloat *values);
-    void (QOPENGLF_APIENTRYP GetnMapiv)(GLenum target, GLenum query, GLsizei bufSize, GLint *v);
-    void (QOPENGLF_APIENTRYP GetnMapfv)(GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
-    void (QOPENGLF_APIENTRYP GetnMapdv)(GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
-
+#define QT_OPENGL_4_5_DEPRECATED_FUNCTIONS(F) \
+    F(void, GetnMinmax, (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values)) \
+    F(void, GetnHistogram, (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values)) \
+    F(void, GetnSeparableFilter, (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span)) \
+    F(void, GetnConvolutionFilter, (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image)) \
+    F(void, GetnColorTable, (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table)) \
+    F(void, GetnPolygonStipple, (GLsizei bufSize, GLubyte *pattern)) \
+    F(void, GetnPixelMapusv, (GLenum map, GLsizei bufSize, GLushort *values)) \
+    F(void, GetnPixelMapuiv, (GLenum map, GLsizei bufSize, GLuint *values)) \
+    F(void, GetnPixelMapfv, (GLenum map, GLsizei bufSize, GLfloat *values)) \
+    F(void, GetnMapiv, (GLenum target, GLenum query, GLsizei bufSize, GLint *v)) \
+    F(void, GetnMapfv, (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v)) \
+    F(void, GetnMapdv, (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v)) \
+
+    QT_OPENGL_DECLARE(QT_OPENGL_4_5_DEPRECATED_FUNCTIONS);
 };
 
 #else
@@ -1632,6 +1889,11 @@ public:
 
 #endif // !QT_OPENGL_ES_2
 
+#undef QT_OPENGL_DECLARE_FUNCTIONS
+#undef QT_OPENGL_COUNT_FUNCTIONS
+#undef QT_OPENGL_DECLARE
+
+
 QT_END_NAMESPACE
 
 #endif // QT_NO_OPENGL
diff --git a/src/gui/opengl/qopenglversionfunctionsfactory.cpp b/src/gui/opengl/qopenglversionfunctionsfactory.cpp
index ef9fcd4acd..fff5eea29c 100644
--- a/src/gui/opengl/qopenglversionfunctionsfactory.cpp
+++ b/src/gui/opengl/qopenglversionfunctionsfactory.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglversionfunctionsfactory_p.h b/src/gui/opengl/qopenglversionfunctionsfactory_p.h
index 4795a42658..0af2e4d572 100644
--- a/src/gui/opengl/qopenglversionfunctionsfactory_p.h
+++ b/src/gui/opengl/qopenglversionfunctionsfactory_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB)
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglvertexarrayobject.cpp b/src/gui/opengl/qopenglvertexarrayobject.cpp
index 33c38519cc..babe52aa83 100644
--- a/src/gui/opengl/qopenglvertexarrayobject.cpp
+++ b/src/gui/opengl/qopenglvertexarrayobject.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -57,33 +63,33 @@ void qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper,
 
     if (context->isOpenGLES()) {
         if (context->format().majorVersion() >= 3) {
-            QOpenGLES3Helper *es3 = static_cast<QOpenGLExtensions *>(context->functions())->gles3Helper();
-            helper->GenVertexArrays = es3->GenVertexArrays;
-            helper->DeleteVertexArrays = es3->DeleteVertexArrays;
-            helper->BindVertexArray = es3->BindVertexArray;
-            helper->IsVertexArray = es3->IsVertexArray;
+            QOpenGLExtraFunctionsPrivate *extra = static_cast<QOpenGLExtensions *>(context->extraFunctions())->d();
+            helper->GenVertexArrays = extra->f.GenVertexArrays;
+            helper->DeleteVertexArrays = extra->f.DeleteVertexArrays;
+            helper->BindVertexArray = extra->f.BindVertexArray;
+            helper->IsVertexArray = extra->f.IsVertexArray;
             tryARB = false;
         } else if (context->hasExtension(QByteArrayLiteral("GL_OES_vertex_array_object"))) {
-            helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress(QByteArrayLiteral("glGenVertexArraysOES")));
-            helper->DeleteVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_DeleteVertexArrays_t>(context->getProcAddress(QByteArrayLiteral("glDeleteVertexArraysOES")));
-            helper->BindVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_BindVertexArray_t>(context->getProcAddress(QByteArrayLiteral("glBindVertexArrayOES")));
-            helper->IsVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_IsVertexArray_t>(context->getProcAddress(QByteArrayLiteral("glIsVertexArrayOES")));
+            helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress("glGenVertexArraysOES"));
+            helper->DeleteVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_DeleteVertexArrays_t>(context->getProcAddress("glDeleteVertexArraysOES"));
+            helper->BindVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_BindVertexArray_t>(context->getProcAddress("glBindVertexArrayOES"));
+            helper->IsVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_IsVertexArray_t>(context->getProcAddress("glIsVertexArrayOES"));
             tryARB = false;
         }
     } else if (context->hasExtension(QByteArrayLiteral("GL_APPLE_vertex_array_object")) &&
                !context->hasExtension(QByteArrayLiteral("GL_ARB_vertex_array_object"))) {
-        helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress(QByteArrayLiteral("glGenVertexArraysAPPLE")));
-        helper->DeleteVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_DeleteVertexArrays_t>(context->getProcAddress(QByteArrayLiteral("glDeleteVertexArraysAPPLE")));
-        helper->BindVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_BindVertexArray_t>(context->getProcAddress(QByteArrayLiteral("glBindVertexArrayAPPLE")));
-        helper->IsVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_IsVertexArray_t>(context->getProcAddress(QByteArrayLiteral("glIsVertexArrayAPPLE")));
+        helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress("glGenVertexArraysAPPLE"));
+        helper->DeleteVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_DeleteVertexArrays_t>(context->getProcAddress("glDeleteVertexArraysAPPLE"));
+        helper->BindVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_BindVertexArray_t>(context->getProcAddress("glBindVertexArrayAPPLE"));
+        helper->IsVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_IsVertexArray_t>(context->getProcAddress("glIsVertexArrayAPPLE"));
         tryARB = false;
     }
 
     if (tryARB && context->hasExtension(QByteArrayLiteral("GL_ARB_vertex_array_object"))) {
-        helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress(QByteArrayLiteral("glGenVertexArrays")));
-        helper->DeleteVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_DeleteVertexArrays_t>(context->getProcAddress(QByteArrayLiteral("glDeleteVertexArrays")));
-        helper->BindVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_BindVertexArray_t>(context->getProcAddress(QByteArrayLiteral("glBindVertexArray")));
-        helper->IsVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_IsVertexArray_t>(context->getProcAddress(QByteArrayLiteral("glIsVertexArray")));
+        helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress("glGenVertexArrays"));
+        helper->DeleteVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_DeleteVertexArrays_t>(context->getProcAddress("glDeleteVertexArrays"));
+        helper->BindVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_BindVertexArray_t>(context->getProcAddress("glBindVertexArray"));
+        helper->IsVertexArray = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_IsVertexArray_t>(context->getProcAddress("glIsVertexArray"));
     }
 }
 
diff --git a/src/gui/opengl/qopenglvertexarrayobject.h b/src/gui/opengl/qopenglvertexarrayobject.h
index e8ebf41071..228c29fce7 100644
--- a/src/gui/opengl/qopenglvertexarrayobject.h
+++ b/src/gui/opengl/qopenglvertexarrayobject.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qopenglvertexarrayobject_p.h b/src/gui/opengl/qopenglvertexarrayobject_p.h
index 8cfa711269..937921765b 100644
--- a/src/gui/opengl/qopenglvertexarrayobject_p.h
+++ b/src/gui/opengl/qopenglvertexarrayobject_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2014 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Sean Harmer <sean.harmer@kdab.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qrbtree_p.h b/src/gui/opengl/qrbtree_p.h
index ee3c72b5d8..4c9dfe1af4 100644
--- a/src/gui/opengl/qrbtree_p.h
+++ b/src/gui/opengl/qrbtree_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qtriangulatingstroker.cpp b/src/gui/opengl/qtriangulatingstroker.cpp
index 5967bd6e89..d9a3231165 100644
--- a/src/gui/opengl/qtriangulatingstroker.cpp
+++ b/src/gui/opengl/qtriangulatingstroker.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qtriangulatingstroker_p.h b/src/gui/opengl/qtriangulatingstroker_p.h
index dd46cbe1e5..5c037cb05d 100644
--- a/src/gui/opengl/qtriangulatingstroker_p.h
+++ b/src/gui/opengl/qtriangulatingstroker_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qtriangulator.cpp b/src/gui/opengl/qtriangulator.cpp
index 6574fe9975..601b51a5fb 100644
--- a/src/gui/opengl/qtriangulator.cpp
+++ b/src/gui/opengl/qtriangulator.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/opengl/qtriangulator_p.h b/src/gui/opengl/qtriangulator_p.h
index 0ab3f7496c..2ef635ff84 100644
--- a/src/gui/opengl/qtriangulator_p.h
+++ b/src/gui/opengl/qtriangulator_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -88,12 +94,13 @@ public:
 
     inline QVertexIndexVector &operator = (const QVertexIndexVector &other)
     {
-         if (t == UnsignedInt)
-           indices32 = other.indices32;
-         else
-           indices16 = other.indices16;
+        if (t == UnsignedInt)
+            indices32 = other.indices32;
+        else
+            indices16 = other.indices16;
 
-         return *this;
+        t = other.t;
+        return *this;
     }
 
 private:
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index 1e516e4581..283b6643b9 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -101,9 +101,10 @@ SSE4_1_SOURCES += painting/qdrawhelper_sse4.cpp \
                   painting/qimagescale_sse4.cpp
 AVX2_SOURCES += painting/qdrawhelper_avx2.cpp
 
-NEON_SOURCES += painting/qdrawhelper_neon.cpp
+NEON_SOURCES += painting/qdrawhelper_neon.cpp painting/qimagescale_neon.cpp
 NEON_HEADERS += painting/qdrawhelper_neon_p.h
 NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S
+!ios:contains(QT_ARCH, "arm"): CONFIG+=no_clang_integrated_as
 !ios:!contains(QT_ARCH, "arm64"): DEFINES += ENABLE_PIXMAN_DRAWHELPERS
 
 MIPS_DSP_SOURCES += painting/qdrawhelper_mips_dsp.cpp
diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp
index aca246e9bf..e3d18512dd 100644
--- a/src/gui/painting/qbackingstore.cpp
+++ b/src/gui/painting/qbackingstore.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qbackingstore.h b/src/gui/painting/qbackingstore.h
index 331fa8c534..886cf29f0e 100644
--- a/src/gui/painting/qbackingstore.h
+++ b/src/gui/painting/qbackingstore.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp
index 8e0e76f787..a3dcb02e07 100644
--- a/src/gui/painting/qbezier.cpp
+++ b/src/gui/painting/qbezier.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qbezier_p.h b/src/gui/painting/qbezier_p.h
index dd1cd94acf..c4e14a18cb 100644
--- a/src/gui/painting/qbezier_p.h
+++ b/src/gui/painting/qbezier_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp
index 0898a20998..0a5d458532 100644
--- a/src/gui/painting/qblendfunctions.cpp
+++ b/src/gui/painting/qblendfunctions.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qblendfunctions_p.h b/src/gui/painting/qblendfunctions_p.h
index a069f89db7..d21765bcde 100644
--- a/src/gui/painting/qblendfunctions_p.h
+++ b/src/gui/painting/qblendfunctions_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qblittable.cpp b/src/gui/painting/qblittable.cpp
index a06b83c96a..8e2013c24f 100644
--- a/src/gui/painting/qblittable.cpp
+++ b/src/gui/painting/qblittable.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qblittable_p.h b/src/gui/painting/qblittable_p.h
index 1a5c507348..8df56f6d0c 100644
--- a/src/gui/painting/qblittable_p.h
+++ b/src/gui/painting/qblittable_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index ee42f2b511..0d26457c15 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h
index ceb95f5676..568c06ef84 100644
--- a/src/gui/painting/qbrush.h
+++ b/src/gui/painting/qbrush.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index d0a60f3704..0d24fd94f5 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -331,7 +337,7 @@ QT_BEGIN_NAMESPACE
 
     \sa isValid(), {QColor#Predefined Colors}{Predefined Colors}
  */
-QColor::QColor(Qt::GlobalColor color)
+QColor::QColor(Qt::GlobalColor color) Q_DECL_NOTHROW
 {
 #define QRGB(r, g, b) \
     QRgb(((0xffu << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff)))
@@ -406,7 +412,7 @@ QColor::QColor(Qt::GlobalColor color)
     \sa fromRgb(), isValid()
 */
 
-QColor::QColor(QRgb color)
+QColor::QColor(QRgb color) Q_DECL_NOTHROW
 {
     cspec = Rgb;
     ct.argb.alpha = 0xffff;
@@ -424,7 +430,7 @@ QColor::QColor(QRgb color)
     \sa fromRgba64()
 */
 
-QColor::QColor(QRgba64 rgba64)
+QColor::QColor(QRgba64 rgba64) Q_DECL_NOTHROW
 {
     setRgba64(rgba64);
 }
@@ -438,7 +444,7 @@ QColor::QColor(QRgba64 rgba64)
     becomes a valid color by accident.
 */
 
-QColor::QColor(Spec spec)
+QColor::QColor(Spec spec) Q_DECL_NOTHROW
 {
     switch (spec) {
     case Invalid:
@@ -959,7 +965,7 @@ void QColor::setRgb(int r, int g, int b, int a)
     \sa setRgba(), rgb(), rgba64()
 */
 
-QRgb QColor::rgba() const
+QRgb QColor::rgba() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().rgba();
@@ -971,7 +977,7 @@ QRgb QColor::rgba() const
 
     \sa rgba(), rgb(), setRgba64()
 */
-void QColor::setRgba(QRgb rgba)
+void QColor::setRgba(QRgb rgba) Q_DECL_NOTHROW
 {
     cspec = Rgb;
     ct.argb.alpha = qAlpha(rgba) * 0x101;
@@ -991,7 +997,7 @@ void QColor::setRgba(QRgb rgba)
     \sa setRgba64(), rgba(), rgb()
 */
 
-QRgba64 QColor::rgba64() const
+QRgba64 QColor::rgba64() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().rgba64();
@@ -1005,7 +1011,7 @@ QRgba64 QColor::rgba64() const
 
     \sa \setRgba(), rgba64()
 */
-void QColor::setRgba64(QRgba64 rgba)
+void QColor::setRgba64(QRgba64 rgba) Q_DECL_NOTHROW
 {
     cspec = Rgb;
     ct.argb.alpha = rgba.alpha();
@@ -1022,7 +1028,7 @@ void QColor::setRgba64(QRgba64 rgba)
 
     \sa getRgb(), rgba()
 */
-QRgb QColor::rgb() const
+QRgb QColor::rgb() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().rgb();
@@ -1034,7 +1040,7 @@ QRgb QColor::rgb() const
 
     Sets the RGB value to \a rgb. The alpha value is set to opaque.
 */
-void QColor::setRgb(QRgb rgb)
+void QColor::setRgb(QRgb rgb) Q_DECL_NOTHROW
 {
     cspec = Rgb;
     ct.argb.alpha = 0xffff;
@@ -1049,7 +1055,7 @@ void QColor::setRgb(QRgb rgb)
 
     \sa setAlpha(), alphaF(), {QColor#Alpha-Blended Drawing}{Alpha-Blended Drawing}
 */
-int QColor::alpha() const
+int QColor::alpha() const Q_DECL_NOTHROW
 { return ct.argb.alpha >> 8; }
 
 
@@ -1071,7 +1077,7 @@ void QColor::setAlpha(int alpha)
 
     \sa setAlphaF(), alpha(), {QColor#Alpha-Blended Drawing}{Alpha-Blended Drawing}
 */
-qreal QColor::alphaF() const
+qreal QColor::alphaF() const Q_DECL_NOTHROW
 { return ct.argb.alpha / qreal(USHRT_MAX); }
 
 /*!
@@ -1094,7 +1100,7 @@ void QColor::setAlphaF(qreal alpha)
 
     \sa setRed(), redF(), getRgb()
 */
-int QColor::red() const
+int QColor::red() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().red();
@@ -1121,7 +1127,7 @@ void QColor::setRed(int red)
 
     \sa setGreen(), greenF(), getRgb()
 */
-int QColor::green() const
+int QColor::green() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().green();
@@ -1149,7 +1155,7 @@ void QColor::setGreen(int green)
 
     \sa setBlue(), blueF(), getRgb()
 */
-int QColor::blue() const
+int QColor::blue() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().blue();
@@ -1177,7 +1183,7 @@ void QColor::setBlue(int blue)
 
     \sa setRedF(), red(), getRgbF()
 */
-qreal QColor::redF() const
+qreal QColor::redF() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().redF();
@@ -1205,7 +1211,7 @@ void QColor::setRedF(qreal red)
 
     \sa setGreenF(), green(), getRgbF()
 */
-qreal QColor::greenF() const
+qreal QColor::greenF() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().greenF();
@@ -1233,7 +1239,7 @@ void QColor::setGreenF(qreal green)
 
      \sa setBlueF(), blue(), getRgbF()
 */
-qreal QColor::blueF() const
+qreal QColor::blueF() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Rgb)
         return toRgb().blueF();
@@ -1263,7 +1269,7 @@ void QColor::setBlueF(qreal blue)
     \sa hsvHue(), hueF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
 
-int QColor::hue() const
+int QColor::hue() const Q_DECL_NOTHROW
 {
     return hsvHue();
 }
@@ -1273,7 +1279,7 @@ int QColor::hue() const
 
     \sa hueF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-int QColor::hsvHue() const
+int QColor::hsvHue() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Hsv)
         return toHsv().hue();
@@ -1289,7 +1295,7 @@ int QColor::hsvHue() const
     Model}
 */
 
-int QColor::saturation() const
+int QColor::saturation() const Q_DECL_NOTHROW
 {
     return hsvSaturation();
 }
@@ -1299,7 +1305,7 @@ int QColor::saturation() const
 
     \sa saturationF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-int QColor::hsvSaturation() const
+int QColor::hsvSaturation() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Hsv)
         return toHsv().saturation();
@@ -1311,7 +1317,7 @@ int QColor::hsvSaturation() const
 
     \sa valueF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-int QColor::value() const
+int QColor::value() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Hsv)
         return toHsv().value();
@@ -1325,7 +1331,7 @@ int QColor::value() const
 
     \sa hsvHueF(), hue(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-qreal QColor::hueF() const
+qreal QColor::hueF() const Q_DECL_NOTHROW
 {
     return hsvHueF();
 }
@@ -1336,7 +1342,7 @@ qreal QColor::hueF() const
     \sa hue(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color
     Model}
 */
-qreal QColor::hsvHueF() const
+qreal QColor::hsvHueF() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Hsv)
         return toHsv().hueF();
@@ -1351,7 +1357,7 @@ qreal QColor::hsvHueF() const
     \sa hsvSaturationF(), saturation(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color
     Model}
 */
-qreal QColor::saturationF() const
+qreal QColor::saturationF() const Q_DECL_NOTHROW
 {
     return hsvSaturationF();
 }
@@ -1361,7 +1367,7 @@ qreal QColor::saturationF() const
 
     \sa saturation(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-qreal QColor::hsvSaturationF() const
+qreal QColor::hsvSaturationF() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Hsv)
         return toHsv().saturationF();
@@ -1373,7 +1379,7 @@ qreal QColor::hsvSaturationF() const
 
     \sa value(), getHsvF(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-qreal QColor::valueF() const
+qreal QColor::valueF() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Hsv)
         return toHsv().valueF();
@@ -1387,7 +1393,7 @@ qreal QColor::valueF() const
 
     \sa getHslF(), getHsl()
 */
-int QColor::hslHue() const
+int QColor::hslHue() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Hsl)
         return toHsl().hslHue();
@@ -1401,7 +1407,7 @@ int QColor::hslHue() const
 
     \sa saturationF(), getHsv(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-int QColor::hslSaturation() const
+int QColor::hslSaturation() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Hsl)
         return toHsl().hslSaturation();
@@ -1415,7 +1421,7 @@ int QColor::hslSaturation() const
 
     \sa lightnessF(), getHsl()
 */
-int QColor::lightness() const
+int QColor::lightness() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Hsl)
         return toHsl().lightness();
@@ -1429,7 +1435,7 @@ int QColor::lightness() const
 
     \sa hue(), getHslF()
 */
-qreal QColor::hslHueF() const
+qreal QColor::hslHueF() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Hsl)
         return toHsl().hslHueF();
@@ -1443,7 +1449,7 @@ qreal QColor::hslHueF() const
 
     \sa saturationF(), getHslF()
 */
-qreal QColor::hslSaturationF() const
+qreal QColor::hslSaturationF() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Hsl)
         return toHsl().hslSaturationF();
@@ -1457,7 +1463,7 @@ qreal QColor::hslSaturationF() const
 
     \sa value(), getHslF()
 */
-qreal QColor::lightnessF() const
+qreal QColor::lightnessF() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Hsl)
         return toHsl().lightnessF();
@@ -1469,7 +1475,7 @@ qreal QColor::lightnessF() const
 
     \sa cyanF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-int QColor::cyan() const
+int QColor::cyan() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().cyan();
@@ -1481,7 +1487,7 @@ int QColor::cyan() const
 
     \sa magentaF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-int QColor::magenta() const
+int QColor::magenta() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().magenta();
@@ -1493,7 +1499,7 @@ int QColor::magenta() const
 
     \sa yellowF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-int QColor::yellow() const
+int QColor::yellow() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().yellow();
@@ -1506,7 +1512,7 @@ int QColor::yellow() const
     \sa blackF(), getCmyk(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 
 */
-int QColor::black() const
+int QColor::black() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().black();
@@ -1518,7 +1524,7 @@ int QColor::black() const
 
     \sa cyan(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-qreal QColor::cyanF() const
+qreal QColor::cyanF() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().cyanF();
@@ -1530,7 +1536,7 @@ qreal QColor::cyanF() const
 
     \sa magenta(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-qreal QColor::magentaF() const
+qreal QColor::magentaF() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().magentaF();
@@ -1542,7 +1548,7 @@ qreal QColor::magentaF() const
 
      \sa yellow(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-qreal QColor::yellowF() const
+qreal QColor::yellowF() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().yellowF();
@@ -1554,7 +1560,7 @@ qreal QColor::yellowF() const
 
     \sa black(), getCmykF(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-qreal QColor::blackF() const
+qreal QColor::blackF() const Q_DECL_NOTHROW
 {
     if (cspec != Invalid && cspec != Cmyk)
         return toCmyk().blackF();
@@ -1566,7 +1572,7 @@ qreal QColor::blackF() const
 
     \sa fromRgb(), convertTo(), isValid()
 */
-QColor QColor::toRgb() const
+QColor QColor::toRgb() const Q_DECL_NOTHROW
 {
     if (!isValid() || cspec == Rgb)
         return *this;
@@ -1712,7 +1718,7 @@ QColor QColor::toRgb() const
 
     \sa fromHsv(), convertTo(), isValid(), {QColor#The HSV Color Model}{The HSV Color Model}
 */
-QColor QColor::toHsv() const
+QColor QColor::toHsv() const Q_DECL_NOTHROW
 {
     if (!isValid() || cspec == Hsv)
         return *this;
@@ -1763,7 +1769,7 @@ QColor QColor::toHsv() const
 
     \sa fromHsl(), convertTo(), isValid()
 */
-QColor QColor::toHsl() const
+QColor QColor::toHsl() const Q_DECL_NOTHROW
 {
     if (!isValid() || cspec == Hsl)
         return *this;
@@ -1819,7 +1825,7 @@ QColor QColor::toHsl() const
 
     \sa fromCmyk(), convertTo(), isValid(), {QColor#The CMYK Color Model}{The CMYK Color Model}
 */
-QColor QColor::toCmyk() const
+QColor QColor::toCmyk() const Q_DECL_NOTHROW
 {
     if (!isValid() || cspec == Cmyk)
         return *this;
@@ -1855,7 +1861,7 @@ QColor QColor::toCmyk() const
     return color;
 }
 
-QColor QColor::convertTo(QColor::Spec colorSpec) const
+QColor QColor::convertTo(QColor::Spec colorSpec) const Q_DECL_NOTHROW
 {
     if (colorSpec == cspec)
         return *this;
@@ -1886,7 +1892,7 @@ QColor QColor::convertTo(QColor::Spec colorSpec) const
     \sa fromRgba(), fromRgbF(), toRgb(), isValid()
 */
 
-QColor QColor::fromRgb(QRgb rgb)
+QColor QColor::fromRgb(QRgb rgb) Q_DECL_NOTHROW
 {
     return fromRgb(qRed(rgb), qGreen(rgb), qBlue(rgb));
 }
@@ -1902,7 +1908,7 @@ QColor QColor::fromRgb(QRgb rgb)
     \sa fromRgb(), fromRgba64(), isValid()
 */
 
-QColor QColor::fromRgba(QRgb rgba)
+QColor QColor::fromRgba(QRgb rgba) Q_DECL_NOTHROW
 {
     return fromRgb(qRed(rgba), qGreen(rgba), qBlue(rgba), qAlpha(rgba));
 }
@@ -1975,7 +1981,7 @@ QColor QColor::fromRgbF(qreal r, qreal g, qreal b, qreal a)
 
     \sa fromRgb(), fromRgbF(), toRgb(), isValid()
 */
-QColor QColor::fromRgba64(ushort r, ushort g, ushort b, ushort a)
+QColor QColor::fromRgba64(ushort r, ushort g, ushort b, ushort a) Q_DECL_NOTHROW
 {
     QColor color;
     color.setRgba64(qRgba64(r, g, b, a));
@@ -1990,7 +1996,7 @@ QColor QColor::fromRgba64(ushort r, ushort g, ushort b, ushort a)
 
     \sa fromRgb(), fromRgbF(), toRgb(), isValid()
 */
-QColor QColor::fromRgba64(QRgba64 rgba64)
+QColor QColor::fromRgba64(QRgba64 rgba64) Q_DECL_NOTHROW
 {
     QColor color;
     color.setRgba64(rgba64);
@@ -2324,7 +2330,7 @@ QColor QColor::fromCmykF(qreal c, qreal m, qreal y, qreal k, qreal a)
 
     Use lighter(\a factor) instead.
 */
-QColor QColor::light(int factor) const
+QColor QColor::light(int factor) const Q_DECL_NOTHROW
 {
     if (factor <= 0)                                // invalid lightness factor
         return *this;
@@ -2374,7 +2380,7 @@ QColor QColor::light(int factor) const
 
     Use darker(\a factor) instead.
 */
-QColor QColor::dark(int factor) const
+QColor QColor::dark(int factor) const Q_DECL_NOTHROW
 {
     if (factor <= 0)                                // invalid darkness factor
         return *this;
@@ -2392,7 +2398,7 @@ QColor QColor::dark(int factor) const
 /*!
     Assigns a copy of \a color to this color, and returns a reference to it.
 */
-QColor &QColor::operator=(const QColor &color)
+QColor &QColor::operator=(const QColor &color) Q_DECL_NOTHROW
 {
     cspec = color.cspec;
     ct.argb = color.ct.argb;
@@ -2403,7 +2409,7 @@ QColor &QColor::operator=(const QColor &color)
 /*! \overload
     Assigns a copy of \a color and returns a reference to this color.
  */
-QColor &QColor::operator=(Qt::GlobalColor color)
+QColor &QColor::operator=(Qt::GlobalColor color) Q_DECL_NOTHROW
 {
     return operator=(QColor(color));
 }
@@ -2412,12 +2418,11 @@ QColor &QColor::operator=(Qt::GlobalColor color)
     Returns \c true if this color has the same RGB and alpha values as \a color;
     otherwise returns \c false.
 */
-bool QColor::operator==(const QColor &color) const
+bool QColor::operator==(const QColor &color) const Q_DECL_NOTHROW
 {
     if (cspec == Hsl && cspec == color.cspec) {
         return (ct.argb.alpha == color.ct.argb.alpha
-                && ((((ct.ahsl.hue % 36000) == (color.ct.ahsl.hue % 36000)))
-                    || (ct.ahsl.hue == color.ct.ahsl.hue))
+                && ct.ahsl.hue % 36000 == color.ct.ahsl.hue % 36000
                 && (qAbs(ct.ahsl.saturation - color.ct.ahsl.saturation) < 50
                     || ct.ahsl.lightness == 0
                     || color.ct.ahsl.lightness == 0
@@ -2440,7 +2445,7 @@ bool QColor::operator==(const QColor &color) const
     Returns \c true if this color has a different RGB and alpha values from
     \a color; otherwise returns \c false.
 */
-bool QColor::operator!=(const QColor &color) const
+bool QColor::operator!=(const QColor &color) const Q_DECL_NOTHROW
 { return !operator==(color); }
 
 
@@ -2457,7 +2462,7 @@ QColor::operator QVariant() const
     Marks the color as invalid and sets all components to zero (alpha is set
     to fully opaque for compatibility with Qt 3).
 */
-void QColor::invalidate()
+void QColor::invalidate() Q_DECL_NOTHROW
 {
     cspec = Invalid;
     ct.argb.alpha = USHRT_MAX;
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h
index b0192662cc..6338eedd22 100644
--- a/src/gui/painting/qcolor.h
+++ b/src/gui/painting/qcolor.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -60,28 +66,28 @@ public:
     enum Spec { Invalid, Rgb, Hsv, Cmyk, Hsl };
     enum NameFormat { HexRgb, HexArgb };
 
-    QColor();
-    QColor(Qt::GlobalColor color);
+    QColor() Q_DECL_NOTHROW;
+    QColor(Qt::GlobalColor color) Q_DECL_NOTHROW;
     QColor(int r, int g, int b, int a = 255);
-    QColor(QRgb rgb);
-    QColor(QRgba64 rgba64);
+    QColor(QRgb rgb) Q_DECL_NOTHROW;
+    QColor(QRgba64 rgba64) Q_DECL_NOTHROW;
     QColor(const QString& name);
     QColor(const char *name);
-    QColor(Spec spec);
+    QColor(Spec spec) Q_DECL_NOTHROW;
 
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-    QColor(const QColor &color); // ### Qt 6: remove all of these, the trivial ones are fine.
+    QColor(const QColor &color) Q_DECL_NOTHROW; // ### Qt 6: remove all of these, the trivial ones are fine.
 # ifdef Q_COMPILER_RVALUE_REFS
     QColor(QColor &&other) Q_DECL_NOTHROW : cspec(other.cspec), ct(other.ct) {}
     QColor &operator=(QColor &&other) Q_DECL_NOTHROW
     { cspec = other.cspec; ct = other.ct; return *this; }
 # endif
-    QColor &operator=(const QColor &);
+    QColor &operator=(const QColor &) Q_DECL_NOTHROW;
 #endif // Qt < 6
 
-    QColor &operator=(Qt::GlobalColor color);
+    QColor &operator=(Qt::GlobalColor color) Q_DECL_NOTHROW;
 
-    bool isValid() const;
+    bool isValid() const Q_DECL_NOTHROW;
 
     // ### Qt 6: merge overloads
     QString name() const;
@@ -90,25 +96,25 @@ public:
 
     static QStringList colorNames();
 
-    inline Spec spec() const
+    inline Spec spec() const Q_DECL_NOTHROW
     { return cspec; }
 
-    int alpha() const;
+    int alpha() const Q_DECL_NOTHROW;
     void setAlpha(int alpha);
 
-    qreal alphaF() const;
+    qreal alphaF() const Q_DECL_NOTHROW;
     void setAlphaF(qreal alpha);
 
-    int red() const;
-    int green() const;
-    int blue() const;
+    int red() const Q_DECL_NOTHROW;
+    int green() const Q_DECL_NOTHROW;
+    int blue() const Q_DECL_NOTHROW;
     void setRed(int red);
     void setGreen(int green);
     void setBlue(int blue);
 
-    qreal redF() const;
-    qreal greenF() const;
-    qreal blueF() const;
+    qreal redF() const Q_DECL_NOTHROW;
+    qreal greenF() const Q_DECL_NOTHROW;
+    qreal blueF() const Q_DECL_NOTHROW;
     void setRedF(qreal red);
     void setGreenF(qreal green);
     void setBlueF(qreal blue);
@@ -119,26 +125,26 @@ public:
     void getRgbF(qreal *r, qreal *g, qreal *b, qreal *a = Q_NULLPTR) const;
     void setRgbF(qreal r, qreal g, qreal b, qreal a = 1.0);
 
-    QRgb rgba() const;
-    void setRgba(QRgb rgba);
+    QRgba64 rgba64() const Q_DECL_NOTHROW;
+    void setRgba64(QRgba64 rgba) Q_DECL_NOTHROW;
 
-    QRgba64 rgba64() const;
-    void setRgba64(QRgba64 rgba);
+    QRgb rgba() const Q_DECL_NOTHROW;
+    void setRgba(QRgb rgba) Q_DECL_NOTHROW;
 
-    QRgb rgb() const;
-    void setRgb(QRgb rgb);
+    QRgb rgb() const Q_DECL_NOTHROW;
+    void setRgb(QRgb rgb) Q_DECL_NOTHROW;
 
-    int hue() const; // 0 <= hue < 360
-    int saturation() const;
-    int hsvHue() const; // 0 <= hue < 360
-    int hsvSaturation() const;
-    int value() const;
+    int hue() const Q_DECL_NOTHROW; // 0 <= hue < 360
+    int saturation() const Q_DECL_NOTHROW;
+    int hsvHue() const Q_DECL_NOTHROW; // 0 <= hue < 360
+    int hsvSaturation() const Q_DECL_NOTHROW;
+    int value() const Q_DECL_NOTHROW;
 
-    qreal hueF() const; // 0.0 <= hueF < 360.0
-    qreal saturationF() const;
-    qreal hsvHueF() const; // 0.0 <= hueF < 360.0
-    qreal hsvSaturationF() const;
-    qreal valueF() const;
+    qreal hueF() const Q_DECL_NOTHROW; // 0.0 <= hueF < 360.0
+    qreal saturationF() const Q_DECL_NOTHROW;
+    qreal hsvHueF() const Q_DECL_NOTHROW; // 0.0 <= hueF < 360.0
+    qreal hsvSaturationF() const Q_DECL_NOTHROW;
+    qreal valueF() const Q_DECL_NOTHROW;
 
     void getHsv(int *h, int *s, int *v, int *a = Q_NULLPTR) const;
     void setHsv(int h, int s, int v, int a = 255);
@@ -146,15 +152,15 @@ public:
     void getHsvF(qreal *h, qreal *s, qreal *v, qreal *a = Q_NULLPTR) const;
     void setHsvF(qreal h, qreal s, qreal v, qreal a = 1.0);
 
-    int cyan() const;
-    int magenta() const;
-    int yellow() const;
-    int black() const;
+    int cyan() const Q_DECL_NOTHROW;
+    int magenta() const Q_DECL_NOTHROW;
+    int yellow() const Q_DECL_NOTHROW;
+    int black() const Q_DECL_NOTHROW;
 
-    qreal cyanF() const;
-    qreal magentaF() const;
-    qreal yellowF() const;
-    qreal blackF() const;
+    qreal cyanF() const Q_DECL_NOTHROW;
+    qreal magentaF() const Q_DECL_NOTHROW;
+    qreal yellowF() const Q_DECL_NOTHROW;
+    qreal blackF() const Q_DECL_NOTHROW;
 
     void getCmyk(int *c, int *m, int *y, int *k, int *a = Q_NULLPTR);
     void setCmyk(int c, int m, int y, int k, int a = 255);
@@ -162,13 +168,13 @@ public:
     void getCmykF(qreal *c, qreal *m, qreal *y, qreal *k, qreal *a = Q_NULLPTR);
     void setCmykF(qreal c, qreal m, qreal y, qreal k, qreal a = 1.0);
 
-    int hslHue() const; // 0 <= hue < 360
-    int hslSaturation() const;
-    int lightness() const;
+    int hslHue() const Q_DECL_NOTHROW; // 0 <= hue < 360
+    int hslSaturation() const Q_DECL_NOTHROW;
+    int lightness() const Q_DECL_NOTHROW;
 
-    qreal hslHueF() const; // 0.0 <= hueF < 360.0
-    qreal hslSaturationF() const;
-    qreal lightnessF() const;
+    qreal hslHueF() const Q_DECL_NOTHROW; // 0.0 <= hueF < 360.0
+    qreal hslSaturationF() const Q_DECL_NOTHROW;
+    qreal lightnessF() const Q_DECL_NOTHROW;
 
     void getHsl(int *h, int *s, int *l, int *a = Q_NULLPTR) const;
     void setHsl(int h, int s, int l, int a = 255);
@@ -176,21 +182,21 @@ public:
     void getHslF(qreal *h, qreal *s, qreal *l, qreal *a = Q_NULLPTR) const;
     void setHslF(qreal h, qreal s, qreal l, qreal a = 1.0);
 
-    QColor toRgb() const;
-    QColor toHsv() const;
-    QColor toCmyk() const;
-    QColor toHsl() const;
+    QColor toRgb() const Q_DECL_NOTHROW;
+    QColor toHsv() const Q_DECL_NOTHROW;
+    QColor toCmyk() const Q_DECL_NOTHROW;
+    QColor toHsl() const Q_DECL_NOTHROW;
 
-    QColor convertTo(Spec colorSpec) const Q_REQUIRED_RESULT;
+    QColor convertTo(Spec colorSpec) const Q_DECL_NOTHROW Q_REQUIRED_RESULT;
 
-    static QColor fromRgb(QRgb rgb);
-    static QColor fromRgba(QRgb rgba);
+    static QColor fromRgb(QRgb rgb) Q_DECL_NOTHROW;
+    static QColor fromRgba(QRgb rgba) Q_DECL_NOTHROW;
 
     static QColor fromRgb(int r, int g, int b, int a = 255);
     static QColor fromRgbF(qreal r, qreal g, qreal b, qreal a = 1.0);
 
-    static QColor fromRgba64(ushort r, ushort g, ushort b, ushort a = USHRT_MAX);
-    static QColor fromRgba64(QRgba64 rgba);
+    static QColor fromRgba64(ushort r, ushort g, ushort b, ushort a = USHRT_MAX) Q_DECL_NOTHROW;
+    static QColor fromRgba64(QRgba64 rgba) Q_DECL_NOTHROW;
 
     static QColor fromHsv(int h, int s, int v, int a = 255);
     static QColor fromHsvF(qreal h, qreal s, qreal v, qreal a = 1.0);
@@ -201,13 +207,13 @@ public:
     static QColor fromHsl(int h, int s, int l, int a = 255);
     static QColor fromHslF(qreal h, qreal s, qreal l, qreal a = 1.0);
 
-    QColor light(int f = 150) const Q_REQUIRED_RESULT;
-    QColor lighter(int f = 150) const Q_REQUIRED_RESULT;
-    QColor dark(int f = 200) const Q_REQUIRED_RESULT;
-    QColor darker(int f = 200) const Q_REQUIRED_RESULT;
+    QColor light(int f = 150) const Q_DECL_NOTHROW Q_REQUIRED_RESULT;
+    QColor lighter(int f = 150) const Q_DECL_NOTHROW Q_REQUIRED_RESULT;
+    QColor dark(int f = 200) const Q_DECL_NOTHROW Q_REQUIRED_RESULT;
+    QColor darker(int f = 200) const Q_DECL_NOTHROW Q_REQUIRED_RESULT;
 
-    bool operator==(const QColor &c) const;
-    bool operator!=(const QColor &c) const;
+    bool operator==(const QColor &c) const Q_DECL_NOTHROW;
+    bool operator!=(const QColor &c) const Q_DECL_NOTHROW;
 
     operator QVariant() const;
 
@@ -215,7 +221,7 @@ public:
 
 private:
 
-    void invalidate();
+    void invalidate() Q_DECL_NOTHROW;
     bool setColorFromString(const QString &name);
 
     Spec cspec;
@@ -258,7 +264,7 @@ private:
 #endif
 };
 
-inline QColor::QColor()
+inline QColor::QColor() Q_DECL_NOTHROW
 { invalidate(); }
 
 inline QColor::QColor(int r, int g, int b, int a)
@@ -271,18 +277,18 @@ inline QColor::QColor(const QString& aname)
 { setNamedColor(aname); }
 
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
-inline QColor::QColor(const QColor &acolor)
+inline QColor::QColor(const QColor &acolor) Q_DECL_NOTHROW
     : cspec(acolor.cspec)
 { ct.argb = acolor.ct.argb; }
 #endif
 
-inline bool QColor::isValid() const
+inline bool QColor::isValid() const Q_DECL_NOTHROW
 { return cspec != Invalid; }
 
-inline QColor QColor::lighter(int f) const
+inline QColor QColor::lighter(int f) const Q_DECL_NOTHROW
 { return light(f); }
 
-inline QColor QColor::darker(int f) const
+inline QColor QColor::darker(int f) const Q_DECL_NOTHROW
 { return dark(f); }
 
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qcolor_p.cpp b/src/gui/painting/qcolor_p.cpp
index 2b9ef6030e..773e4096ee 100644
--- a/src/gui/painting/qcolor_p.cpp
+++ b/src/gui/painting/qcolor_p.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qcolor_p.h b/src/gui/painting/qcolor_p.h
index d896022ac1..75bc888952 100644
--- a/src/gui/painting/qcolor_p.h
+++ b/src/gui/painting/qcolor_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qcompositionfunctions.cpp b/src/gui/painting/qcompositionfunctions.cpp
index ba428a7938..9312ee9540 100644
--- a/src/gui/painting/qcompositionfunctions.cpp
+++ b/src/gui/painting/qcompositionfunctions.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
index 64da03f13a..4965762d74 100644
--- a/src/gui/painting/qcosmeticstroker.cpp
+++ b/src/gui/painting/qcosmeticstroker.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -540,7 +546,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
                 QPointF p2 = QPointF(p[-2], p[-1]) * state->matrix;
                 calculateLastPoint(p1.x(), p1.y(), p2.x(), p2.y());
             }
-            int caps = (!closed & drawCaps) ? CapBegin : NoCaps;
+            int caps = (!closed && drawCaps) ? CapBegin : NoCaps;
 //            qDebug() << "closed =" << closed << capString(caps);
 
             points += 2;
@@ -591,7 +597,7 @@ void QCosmeticStroker::drawPath(const QVectorPath &path)
         const qreal *end = points + 2*path.elementCount();
         // handle closed path case
         bool closed = path.hasImplicitClose() || (points[0] == end[-2] && points[1] == end[-1]);
-        int caps = (!closed & drawCaps) ? CapBegin : NoCaps;
+        int caps = (!closed && drawCaps) ? CapBegin : NoCaps;
         if (closed) {
             QPointF p2 = QPointF(end[-2], end[-1]) * state->matrix;
             calculateLastPoint(p2.x(), p2.y(), p.x(), p.y());
diff --git a/src/gui/painting/qcosmeticstroker_p.h b/src/gui/painting/qcosmeticstroker_p.h
index 389163dac8..b22e2c2cf5 100644
--- a/src/gui/painting/qcosmeticstroker_p.h
+++ b/src/gui/painting/qcosmeticstroker_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qcssutil.cpp b/src/gui/painting/qcssutil.cpp
index e150b65920..a826532b43 100644
--- a/src/gui/painting/qcssutil.cpp
+++ b/src/gui/painting/qcssutil.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -331,8 +337,10 @@ static bool paintsOver(const QCss::BorderStyle *styles, const QBrush *colors, QC
     if (s2 == BorderStyle_None || colors[e2] == Qt::transparent)
         return true;
 
-    if ((s1 == BorderStyle_Solid && s2 == BorderStyle_Solid) && (colors[e1] == colors[e2]))
+    if ((s1 == BorderStyle_Solid && s2 == BorderStyle_Solid) && (colors[e1] == colors[e2])
+            && colors[e1].isOpaque()) {
         return true;
+    }
 
     return false;
 }
diff --git a/src/gui/painting/qcssutil_p.h b/src/gui/painting/qcssutil_p.h
index fac6e55dda..3184b7fa22 100644
--- a/src/gui/painting/qcssutil_p.h
+++ b/src/gui/painting/qcssutil_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qdatabuffer_p.h b/src/gui/painting/qdatabuffer_p.h
index 2a6b1bde4c..f5a3fa1432 100644
--- a/src/gui/painting/qdatabuffer_p.h
+++ b/src/gui/painting/qdatabuffer_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 39ff4142b8..1c772ef232 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2016 Intel Corporation.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -128,10 +135,20 @@ template<> Q_DECL_CONSTEXPR uint blueShift<QImage::Format_ARGB4444_Premultiplied
 template<> Q_DECL_CONSTEXPR uint blueShift<QImage::Format_ARGB8555_Premultiplied>() { return 8; }
 template<> Q_DECL_CONSTEXPR uint blueShift<QImage::Format_ARGB8565_Premultiplied>() { return 8; }
 template<> Q_DECL_CONSTEXPR uint blueShift<QImage::Format_ARGB6666_Premultiplied>() { return 0; }
+template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_RGB16>() { return 0; }
+template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_RGB444>() { return 0; }
+template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_RGB555>() { return 0; }
+template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_RGB666>() { return 0; }
+template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_RGB888>() { return 0; }
 template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_ARGB4444_Premultiplied>() { return  4; }
 template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_ARGB8555_Premultiplied>() { return  8; }
 template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_ARGB8565_Premultiplied>() { return  8; }
 template<> Q_DECL_CONSTEXPR uint alphaWidth<QImage::Format_ARGB6666_Premultiplied>() { return  6; }
+template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_RGB16>() { return 0; }
+template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_RGB444>() { return 0; }
+template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_RGB555>() { return 0; }
+template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_RGB666>() { return 0; }
+template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_RGB888>() { return 0; }
 template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_ARGB4444_Premultiplied>() { return 12; }
 template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_ARGB8555_Premultiplied>() { return  0; }
 template<> Q_DECL_CONSTEXPR uint alphaShift<QImage::Format_ARGB8565_Premultiplied>() { return  0; }
@@ -228,17 +245,36 @@ static const uint *QT_FASTCALL convertARGBPMToARGB32PM(uint *buffer, const uint
     Q_CONSTEXPR uchar greenRightShift = 2 * greenWidth<Format>() - 8;
     Q_CONSTEXPR uchar blueRightShift = 2 * blueWidth<Format>() - 8;
 
-    for (int i = 0; i < count; ++i) {
-        uint alpha = (src[i] >> alphaShift<Format>()) & alphaMask;
-        uint red = (src[i] >> redShift<Format>()) & redMask;
-        uint green = (src[i] >> greenShift<Format>()) & greenMask;
-        uint blue = (src[i] >> blueShift<Format>()) & blueMask;
-
-        alpha = (alpha << alphaLeftShift) | (alpha >> alphaRightShift);
-        red = qMin(alpha, (red << redLeftShift) | (red >> redRightShift));
-        green = qMin(alpha, (green << greenLeftShift) | (green >> greenRightShift));
-        blue = qMin(alpha, (blue << blueLeftShift) | (blue >> blueRightShift));
-        buffer[i] = (alpha << 24) | (red << 16) | (green << 8) | blue;
+    Q_CONSTEXPR bool mustMin = (alphaWidth<Format>() != redWidth<Format>()) ||
+                               (alphaWidth<Format>() != greenWidth<Format>()) ||
+                               (alphaWidth<Format>() != blueWidth<Format>());
+
+    if (mustMin) {
+        for (int i = 0; i < count; ++i) {
+            uint alpha = (src[i] >> alphaShift<Format>()) & alphaMask;
+            uint red = (src[i] >> redShift<Format>()) & redMask;
+            uint green = (src[i] >> greenShift<Format>()) & greenMask;
+            uint blue = (src[i] >> blueShift<Format>()) & blueMask;
+
+            alpha = (alpha << alphaLeftShift) | (alpha >> alphaRightShift);
+            red = qMin(alpha, (red << redLeftShift) | (red >> redRightShift));
+            green = qMin(alpha, (green << greenLeftShift) | (green >> greenRightShift));
+            blue = qMin(alpha, (blue << blueLeftShift) | (blue >> blueRightShift));
+            buffer[i] = (alpha << 24) | (red << 16) | (green << 8) | blue;
+        }
+    } else {
+        for (int i = 0; i < count; ++i) {
+            uint alpha = (src[i] >> alphaShift<Format>()) & alphaMask;
+            uint red   = (src[i] >> redShift<Format>())   & redMask;
+            uint green = (src[i] >> greenShift<Format>()) & greenMask;
+            uint blue  = (src[i] >> blueShift<Format>())  & blueMask;
+
+            alpha = ((alpha << alphaLeftShift) | (alpha >> alphaRightShift)) << 24;
+            red   = ((red << redLeftShift) | (red >> redRightShift)) << 16;
+            green = ((green << greenLeftShift) | (green >> greenRightShift)) << 8;
+            blue  = (blue << blueLeftShift)  | (blue >> blueRightShift);
+            buffer[i] = alpha | red | green | blue;
+        }
     }
 
     return buffer;
@@ -263,108 +299,85 @@ static const QRgba64 *QT_FASTCALL convertARGBPMToARGB64PM(QRgba64 *buffer, const
     Q_CONSTEXPR uchar greenRightShift = 2 * greenWidth<Format>() - 8;
     Q_CONSTEXPR uchar blueRightShift = 2 * blueWidth<Format>() - 8;
 
-    for (int i = 0; i < count; ++i) {
-        uint alpha = (src[i] >> alphaShift<Format>()) & alphaMask;
-        uint red = (src[i] >> redShift<Format>()) & redMask;
-        uint green = (src[i] >> greenShift<Format>()) & greenMask;
-        uint blue = (src[i] >> blueShift<Format>()) & blueMask;
-
-        alpha = (alpha << alphaLeftShift) | (alpha >> alphaRightShift);
-        red = qMin(alpha, (red << redLeftShift) | (red >> redRightShift));
-        green = qMin(alpha, (green << greenLeftShift) | (green >> greenRightShift));
-        blue = qMin(alpha, (blue << blueLeftShift) | (blue >> blueRightShift));
-        buffer[i] = QRgba64::fromRgba(red, green, blue, alpha);
+    Q_CONSTEXPR bool mustMin = (alphaWidth<Format>() != redWidth<Format>()) ||
+                               (alphaWidth<Format>() != greenWidth<Format>()) ||
+                               (alphaWidth<Format>() != blueWidth<Format>());
+
+    if (mustMin) {
+        for (int i = 0; i < count; ++i) {
+            uint alpha = (src[i] >> alphaShift<Format>()) & alphaMask;
+            uint red = (src[i] >> redShift<Format>()) & redMask;
+            uint green = (src[i] >> greenShift<Format>()) & greenMask;
+            uint blue = (src[i] >> blueShift<Format>()) & blueMask;
+
+            alpha = (alpha << alphaLeftShift) | (alpha >> alphaRightShift);
+            red = qMin(alpha, (red << redLeftShift) | (red >> redRightShift));
+            green = qMin(alpha, (green << greenLeftShift) | (green >> greenRightShift));
+            blue = qMin(alpha, (blue << blueLeftShift) | (blue >> blueRightShift));
+            buffer[i] = QRgba64::fromRgba(red, green, blue, alpha);
+        }
+    } else {
+        for (int i = 0; i < count; ++i) {
+            uint alpha = (src[i] >> alphaShift<Format>()) & alphaMask;
+            uint red = (src[i] >> redShift<Format>()) & redMask;
+            uint green = (src[i] >> greenShift<Format>()) & greenMask;
+            uint blue = (src[i] >> blueShift<Format>()) & blueMask;
+
+            alpha = (alpha << alphaLeftShift) | (alpha >> alphaRightShift);
+            red = (red << redLeftShift) | (red >> redRightShift);
+            green = (green << greenLeftShift) | (green >> greenRightShift);
+            blue = (blue << blueLeftShift) | (blue >> blueRightShift);
+            buffer[i] = QRgba64::fromRgba(red, green, blue, alpha);
+        }
     }
 
     return buffer;
 }
 
-template<QImage::Format Format>
+template<QImage::Format Format, bool fromRGB>
 static const uint *QT_FASTCALL convertRGBFromARGB32PM(uint *buffer, const uint *src, int count,
                                                       const QPixelLayout *, const QRgb *)
 {
-    Q_CONSTEXPR uint redMask = ((1 << redWidth<Format>()) - 1);
-    Q_CONSTEXPR uint greenMask = ((1 << greenWidth<Format>()) - 1);
-    Q_CONSTEXPR uint blueMask = ((1 << blueWidth<Format>()) - 1);
-
-    Q_CONSTEXPR uchar redRightShift = 24 - redWidth<Format>();
-    Q_CONSTEXPR uchar greenRightShift = 16 - greenWidth<Format>();
-    Q_CONSTEXPR uchar blueRightShift = 8 - blueWidth<Format>();
-
-    for (int i = 0; i < count; ++i) {
-        const uint color = qUnpremultiply(src[i]);
-        const uint red = ((color >> redRightShift) & redMask) << redShift<Format>();
-        const uint green = ((color >> greenRightShift) & greenMask) << greenShift<Format>();
-        const uint blue = ((color >> blueRightShift) & blueMask) << blueShift<Format>();
-        buffer[i] = red | green | blue;
-    }
-    return buffer;
-}
-
-template<QImage::Format Format>
-static const uint *QT_FASTCALL convertRGBFromRGB32(uint *buffer, const uint *src, int count,
-                                                   const QPixelLayout *, const QRgb *)
-{
-    Q_CONSTEXPR uint redMask = ((1 << redWidth<Format>()) - 1);
-    Q_CONSTEXPR uint greenMask = ((1 << greenWidth<Format>()) - 1);
-    Q_CONSTEXPR uint blueMask = ((1 << blueWidth<Format>()) - 1);
+    Q_CONSTEXPR uint rMask = ((1 << redWidth<Format>()) - 1);
+    Q_CONSTEXPR uint gMask = ((1 << greenWidth<Format>()) - 1);
+    Q_CONSTEXPR uint bMask = ((1 << blueWidth<Format>()) - 1);
 
-    Q_CONSTEXPR uchar redRightShift = 24 - redWidth<Format>();
-    Q_CONSTEXPR uchar greenRightShift = 16 - greenWidth<Format>();
-    Q_CONSTEXPR uchar blueRightShift = 8 - blueWidth<Format>();
+    Q_CONSTEXPR uchar rRightShift = 24 - redWidth<Format>();
+    Q_CONSTEXPR uchar gRightShift = 16 - greenWidth<Format>();
+    Q_CONSTEXPR uchar bRightShift =  8 - blueWidth<Format>();
 
     for (int i = 0; i < count; ++i) {
-        const uint red = ((src[i] >> redRightShift) & redMask) << redShift<Format>();
-        const uint green = ((src[i] >> greenRightShift) & greenMask) << greenShift<Format>();
-        const uint blue = ((src[i] >> blueRightShift) & blueMask) << blueShift<Format>();
-        buffer[i] = red | green | blue;
+        const uint c = fromRGB ? src[i] : qUnpremultiply(src[i]);
+        const uint r = ((c >> rRightShift) & rMask) << redShift<Format>();
+        const uint g = ((c >> gRightShift) & gMask) << greenShift<Format>();
+        const uint b = ((c >> bRightShift) & bMask) << blueShift<Format>();
+        buffer[i] = r | g | b;
     }
     return buffer;
 }
 
-template<QImage::Format Format>
-static const uint *QT_FASTCALL convertARGBPMFromRGB32(uint *buffer, const uint *src, int count,
-                                                    const QPixelLayout *, const QRgb *)
-{
-    Q_CONSTEXPR uint alphaMask = ((1 << alphaWidth<Format>()) - 1);
-    Q_CONSTEXPR uint redMask = ((1 << redWidth<Format>()) - 1);
-    Q_CONSTEXPR uint greenMask = ((1 << greenWidth<Format>()) - 1);
-    Q_CONSTEXPR uint blueMask = ((1 << blueWidth<Format>()) - 1);
-
-    Q_CONSTEXPR uchar redRightShift = 24 - redWidth<Format>();
-    Q_CONSTEXPR uchar greenRightShift = 16 - greenWidth<Format>();
-    Q_CONSTEXPR uchar blueRightShift = 8 - blueWidth<Format>();
-
-    for (int i = 0; i < count; ++i) {
-        Q_CONSTEXPR uint alpha = (0xff & alphaMask) << alphaShift<Format>();
-        const uint red = ((src[i] >> redRightShift) & redMask) << redShift<Format>();
-        const uint green = ((src[i] >> greenRightShift) & greenMask) << greenShift<Format>();
-        const uint blue = ((src[i] >> blueRightShift) & blueMask) << blueShift<Format>();
-        buffer[i] = alpha | red | green | blue;
-    }
-    return buffer;
-}
-
-template<QImage::Format Format>
+template<QImage::Format Format, bool fromRGB>
 static const uint *QT_FASTCALL convertARGBPMFromARGB32PM(uint *buffer, const uint *src, int count,
                                                          const QPixelLayout *, const QRgb *)
 {
-    Q_CONSTEXPR uint alphaMask = ((1 << alphaWidth<Format>()) - 1);
-    Q_CONSTEXPR uint redMask = ((1 << redWidth<Format>()) - 1);
-    Q_CONSTEXPR uint greenMask = ((1 << greenWidth<Format>()) - 1);
-    Q_CONSTEXPR uint blueMask = ((1 << blueWidth<Format>()) - 1);
+    Q_CONSTEXPR uint aMask = ((1 << alphaWidth<Format>()) - 1);
+    Q_CONSTEXPR uint rMask = ((1 << redWidth<Format>()) - 1);
+    Q_CONSTEXPR uint gMask = ((1 << greenWidth<Format>()) - 1);
+    Q_CONSTEXPR uint bMask = ((1 << blueWidth<Format>()) - 1);
 
-    Q_CONSTEXPR uchar alphaRightShift = 32 - alphaWidth<Format>();
-    Q_CONSTEXPR uchar redRightShift = 24 - redWidth<Format>();
-    Q_CONSTEXPR uchar greenRightShift = 16 - greenWidth<Format>();
-    Q_CONSTEXPR uchar blueRightShift = 8 - blueWidth<Format>();
+    Q_CONSTEXPR uchar aRightShift = 32 - alphaWidth<Format>();
+    Q_CONSTEXPR uchar rRightShift = 24 - redWidth<Format>();
+    Q_CONSTEXPR uchar gRightShift = 16 - greenWidth<Format>();
+    Q_CONSTEXPR uchar bRightShift =  8 - blueWidth<Format>();
 
+    Q_CONSTEXPR uint aOpaque = (0xff & aMask) << alphaShift<Format>();
     for (int i = 0; i < count; ++i) {
-        const uint alpha = ((src[i] >> alphaRightShift) & alphaMask) << alphaShift<Format>();
-        const uint red = ((src[i] >> redRightShift) & redMask) << redShift<Format>();
-        const uint green = ((src[i] >> greenRightShift) & greenMask) << greenShift<Format>();
-        const uint blue = ((src[i] >> blueRightShift) & blueMask) << blueShift<Format>();
-        buffer[i] = alpha | red | green | blue;
+        const uint c = src[i];
+        const uint a = fromRGB ? aOpaque : (((c >> aRightShift) & aMask) << alphaShift<Format>());
+        const uint r = ((c >> rRightShift) & rMask) << redShift<Format>();
+        const uint g = ((c >> gRightShift) & gMask) << greenShift<Format>();
+        const uint b = ((c >> bRightShift) & bMask) << blueShift<Format>();
+        buffer[i] = a | r | g | b;
     }
     return buffer;
 }
@@ -380,8 +393,8 @@ template<QImage::Format Format> Q_DECL_CONSTEXPR static inline QPixelLayout pixe
         0, 0,
         false, bitsPerPixel<Format>(),
         convertToRGB32<Format>,
-        convertRGBFromARGB32PM<Format>,
-        convertRGBFromRGB32<Format>,
+        convertRGBFromARGB32PM<Format, false>,
+        convertRGBFromARGB32PM<Format, true>,
         convertToRGB64<Format>
     };
 }
@@ -395,8 +408,8 @@ template<QImage::Format Format> Q_DECL_CONSTEXPR static inline QPixelLayout pixe
         uchar(alphaWidth<Format>()), uchar(alphaShift<Format>()),
         true, bitsPerPixel<Format>(),
         convertARGBPMToARGB32PM<Format>,
-        convertARGBPMFromARGB32PM<Format>,
-        convertARGBPMFromRGB32<Format>,
+        convertARGBPMFromARGB32PM<Format, false>,
+        convertARGBPMFromARGB32PM<Format, true>,
         convertARGBPMToARGB64PM<Format>
     };
 }
@@ -874,56 +887,56 @@ QPixelLayout qPixelLayouts[QImage::NImageFormats] = {
 #else
     { 5, 11, 6,  5, 5,  0, 0,  0, false, QPixelLayout::BPP16,
       convertToRGB32<QImage::Format_RGB16>,
-      convertRGBFromARGB32PM<QImage::Format_RGB16>,
-      convertRGBFromRGB32<QImage::Format_RGB16>,
+      convertRGBFromARGB32PM<QImage::Format_RGB16, false>,
+      convertRGBFromARGB32PM<QImage::Format_RGB16, true>,
       convertToRGB64<QImage::Format_RGB16>,
     },
     { 5, 19, 6, 13, 5,  8, 8,  0,  true, QPixelLayout::BPP24,
       convertARGBPMToARGB32PM<QImage::Format_ARGB8565_Premultiplied>,
-      convertARGBPMFromARGB32PM<QImage::Format_ARGB8565_Premultiplied>,
-      convertARGBPMFromRGB32<QImage::Format_ARGB8565_Premultiplied>,
+      convertARGBPMFromARGB32PM<QImage::Format_ARGB8565_Premultiplied, false>,
+      convertARGBPMFromARGB32PM<QImage::Format_ARGB8565_Premultiplied, true>,
       convertARGBPMToARGB64PM<QImage::Format_ARGB8565_Premultiplied>,
     },
     { 6, 12, 6,  6, 6,  0, 0,  0, false, QPixelLayout::BPP24,
       convertToRGB32<QImage::Format_RGB666>,
-      convertRGBFromARGB32PM<QImage::Format_RGB666>,
-      convertRGBFromRGB32<QImage::Format_RGB666>,
+      convertRGBFromARGB32PM<QImage::Format_RGB666, false>,
+      convertRGBFromARGB32PM<QImage::Format_RGB666, true>,
       convertToRGB64<QImage::Format_RGB666>,
     },
     { 6, 12, 6,  6, 6,  0, 6, 18,  true, QPixelLayout::BPP24,
       convertARGBPMToARGB32PM<QImage::Format_ARGB6666_Premultiplied>,
-      convertARGBPMFromARGB32PM<QImage::Format_ARGB6666_Premultiplied>,
-      convertARGBPMFromRGB32<QImage::Format_ARGB6666_Premultiplied>,
+      convertARGBPMFromARGB32PM<QImage::Format_ARGB6666_Premultiplied, false>,
+      convertARGBPMFromARGB32PM<QImage::Format_ARGB6666_Premultiplied, true>,
       convertARGBPMToARGB64PM<QImage::Format_ARGB6666_Premultiplied>,
     },
     { 5, 10, 5,  5, 5,  0, 0,  0, false, QPixelLayout::BPP16,
       convertToRGB32<QImage::Format_RGB555>,
-      convertRGBFromARGB32PM<QImage::Format_RGB555>,
-      convertRGBFromRGB32<QImage::Format_RGB555>,
+      convertRGBFromARGB32PM<QImage::Format_RGB555, false>,
+      convertRGBFromARGB32PM<QImage::Format_RGB555, true>,
       convertToRGB64<QImage::Format_RGB555>,
     },
     { 5, 18, 5, 13, 5,  8, 8,  0,  true, QPixelLayout::BPP24,
       convertARGBPMToARGB32PM<QImage::Format_ARGB8555_Premultiplied>,
-      convertARGBPMFromARGB32PM<QImage::Format_ARGB8555_Premultiplied>,
-      convertARGBPMFromRGB32<QImage::Format_ARGB8555_Premultiplied>,
+      convertARGBPMFromARGB32PM<QImage::Format_ARGB8555_Premultiplied, false>,
+      convertARGBPMFromARGB32PM<QImage::Format_ARGB8555_Premultiplied, true>,
       convertARGBPMToARGB64PM<QImage::Format_ARGB8555_Premultiplied>,
     },
     { 8, 16, 8,  8, 8,  0, 0,  0, false, QPixelLayout::BPP24,
       convertToRGB32<QImage::Format_RGB888>,
-      convertRGBFromARGB32PM<QImage::Format_RGB888>,
-      convertRGBFromRGB32<QImage::Format_RGB888>,
+      convertRGBFromARGB32PM<QImage::Format_RGB888, false>,
+      convertRGBFromARGB32PM<QImage::Format_RGB888, true>,
       convertToRGB64<QImage::Format_RGB888>,
     },
     { 4,  8, 4,  4, 4,  0, 0,  0, false, QPixelLayout::BPP16,
       convertToRGB32<QImage::Format_RGB444>,
-      convertRGBFromARGB32PM<QImage::Format_RGB444>,
-      convertRGBFromRGB32<QImage::Format_RGB444>,
+      convertRGBFromARGB32PM<QImage::Format_RGB444, false>,
+      convertRGBFromARGB32PM<QImage::Format_RGB444, true>,
       convertToRGB64<QImage::Format_RGB444>,
     },
     { 4,  8, 4,  4, 4,  0, 4, 12,  true, QPixelLayout::BPP16,
       convertARGBPMToARGB32PM<QImage::Format_ARGB4444_Premultiplied>,
-      convertARGBPMFromARGB32PM<QImage::Format_ARGB4444_Premultiplied>,
-      convertARGBPMFromRGB32<QImage::Format_ARGB4444_Premultiplied>,
+      convertARGBPMFromARGB32PM<QImage::Format_ARGB4444_Premultiplied, false>,
+      convertARGBPMFromARGB32PM<QImage::Format_ARGB4444_Premultiplied, true>,
       convertARGBPMToARGB64PM<QImage::Format_ARGB4444_Premultiplied>,
     },
 #endif
@@ -954,7 +967,7 @@ const FetchPixelsFunc qFetchPixels[QPixelLayout::BPPCount] = {
     fetchPixels<QPixelLayout::BPP32> // BPP32
 };
 
-const StorePixelsFunc qStorePixels[QPixelLayout::BPPCount] = {
+StorePixelsFunc qStorePixels[QPixelLayout::BPPCount] = {
     0, // BPPNone
     storePixels<QPixelLayout::BPP1MSB>, // BPP1MSB
     storePixels<QPixelLayout::BPP1LSB>, // BPP1LSB
@@ -2338,8 +2351,8 @@ static const uint * QT_FASTCALL fetchTransformedBilinearARGB32PM(uint *buffer, c
                     uint bl = s2[x1];
                     uint br = s2[x2];
 
-#if defined(__SSE2__)
-                    // The SSE2 optimized interpolate_4_pixels is faster than interpolate_4_pixels_16.
+#if defined(__SSE2__) || defined(__ARM_NEON__)
+                    // The optimized interpolate_4_pixels are faster than interpolate_4_pixels_16.
                     int distx = (fx & 0x0000ffff) >> 8;
                     int disty = (fy & 0x0000ffff) >> 8;
                     *b = interpolate_4_pixels(tl, tr, bl, br, distx, disty);
@@ -2569,12 +2582,8 @@ static const uint *QT_FASTCALL fetchTransformedBilinear(uint *buffer, const Oper
                     if ((fdx < 0 && fdx > -(fixed_scale / 8)) || std::abs(data->m22) < (1./8.)) { // scale up more than 8x
                         int disty = (fy & 0x0000ffff) >> 8;
                         for (int i = 0; i < len; ++i) {
-                            uint tl = buf1[i * 2 + 0];
-                            uint tr = buf1[i * 2 + 1];
-                            uint bl = buf2[i * 2 + 0];
-                            uint br = buf2[i * 2 + 1];
                             int distx = (fracX & 0x0000ffff) >> 8;
-                            b[i] = interpolate_4_pixels(tl, tr, bl, br, distx, disty);
+                            b[i] = interpolate_4_pixels(buf1 + i * 2, buf2 + i * 2, distx, disty);
                             fracX += fdx;
                         }
                     } else { //scale down
@@ -2635,15 +2644,10 @@ static const uint *QT_FASTCALL fetchTransformedBilinear(uint *buffer, const Oper
                 if (std::abs(data->m11) > 8 || std::abs(data->m22) > 8) {
                     //if we are zooming more than 8 times, we use 8bit precision for the position.
                     for (int i = 0; i < len; ++i) {
-                        uint tl = buf1[i * 2 + 0];
-                        uint tr = buf1[i * 2 + 1];
-                        uint bl = buf2[i * 2 + 0];
-                        uint br = buf2[i * 2 + 1];
-
                         int distx = (fracX & 0x0000ffff) >> 8;
                         int disty = (fracY & 0x0000ffff) >> 8;
 
-                        b[i] = interpolate_4_pixels(tl, tr, bl, br, distx, disty);
+                        b[i] = interpolate_4_pixels(buf1 + i * 2, buf2 + i * 2, distx, disty);
                         fracX += fdx;
                         fracY += fdy;
                     }
@@ -2733,12 +2737,7 @@ static const uint *QT_FASTCALL fetchTransformedBilinear(uint *buffer, const Oper
                 int distx = distxs[i];
                 int disty = distys[i];
 
-                uint tl = buf1[i * 2 + 0];
-                uint tr = buf1[i * 2 + 1];
-                uint bl = buf2[i * 2 + 0];
-                uint br = buf2[i * 2 + 1];
-
-                b[i] = interpolate_4_pixels(tl, tr, bl, br, distx, disty);
+                b[i] = interpolate_4_pixels(buf1 + i * 2, buf2 + i * 2, distx, disty);
             }
             length -= len;
             b += len;
@@ -6390,10 +6389,16 @@ static void qInitDrawhelperFunctions()
                                                     int w, int h,
                                                     int const_alpha);
 
+        extern void QT_FASTCALL storePixelsBPP24_ssse3(uchar *dest, const uint *src, int index, int count);
+        extern const uint * QT_FASTCALL qt_fetchUntransformed_888_ssse3(uint *buffer, const Operator *, const QSpanData *data,
+                                                                        int y, int x, int length);
         qBlendFunctions[QImage::Format_RGB32][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_ssse3;
         qBlendFunctions[QImage::Format_ARGB32_Premultiplied][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_argb32_ssse3;
         qBlendFunctions[QImage::Format_RGBX8888][QImage::Format_RGBA8888_Premultiplied] = qt_blend_argb32_on_argb32_ssse3;
         qBlendFunctions[QImage::Format_RGBA8888_Premultiplied][QImage::Format_RGBA8888_Premultiplied] = qt_blend_argb32_on_argb32_ssse3;
+        qStorePixels[QPixelLayout::BPP24] = storePixelsBPP24_ssse3;
+        sourceFetch[BlendUntransformed][QImage::Format_RGB888] = qt_fetchUntransformed_888_ssse3;
+        sourceFetch[BlendTiled][QImage::Format_RGB888] = qt_fetchUntransformed_888_ssse3;
     }
 #endif // SSSE3
 
@@ -6456,6 +6461,9 @@ static void qInitDrawhelperFunctions()
 
     qt_fetch_radial_gradient = qt_fetch_radial_gradient_neon;
 
+    sourceFetch[BlendUntransformed][QImage::Format_RGB888] = qt_fetchUntransformed_888_neon;
+    sourceFetch[BlendTiled][QImage::Format_RGB888] = qt_fetchUntransformed_888_neon;
+
 #if defined(ENABLE_PIXMAN_DRAWHELPERS)
     // The RGB16 helpers are using Arm32 assemblythat has not been ported to AArch64
     qBlendFunctions[QImage::Format_RGB16][QImage::Format_ARGB32_Premultiplied] = qt_blend_argb32_on_rgb16_neon;
diff --git a/src/gui/painting/qdrawhelper_avx2.cpp b/src/gui/painting/qdrawhelper_avx2.cpp
index 5716be682b..e11536ebd0 100644
--- a/src/gui/painting/qdrawhelper_avx2.cpp
+++ b/src/gui/painting/qdrawhelper_avx2.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qdrawhelper_mips_dsp.cpp b/src/gui/painting/qdrawhelper_mips_dsp.cpp
index c28b594de3..b72ca3da3d 100644
--- a/src/gui/painting/qdrawhelper_mips_dsp.cpp
+++ b/src/gui/painting/qdrawhelper_mips_dsp.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Imagination Technologies Limited, www.imgtec.com
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qdrawhelper_mips_dsp_asm.S b/src/gui/painting/qdrawhelper_mips_dsp_asm.S
index 1d88dac354..c6b34293b6 100644
--- a/src/gui/painting/qdrawhelper_mips_dsp_asm.S
+++ b/src/gui/painting/qdrawhelper_mips_dsp_asm.S
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Imagination Technologies Limited, www.imgtec.com
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qdrawhelper_mips_dsp_p.h b/src/gui/painting/qdrawhelper_mips_dsp_p.h
index ca05c9273f..86773ad25f 100644
--- a/src/gui/painting/qdrawhelper_mips_dsp_p.h
+++ b/src/gui/painting/qdrawhelper_mips_dsp_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Imagination Technologies Limited, www.imgtec.com
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qdrawhelper_mips_dspr2_asm.S b/src/gui/painting/qdrawhelper_mips_dspr2_asm.S
index 85ec66537b..4921365e36 100644
--- a/src/gui/painting/qdrawhelper_mips_dspr2_asm.S
+++ b/src/gui/painting/qdrawhelper_mips_dspr2_asm.S
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Imagination Technologies Limited, www.imgtec.com
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qdrawhelper_neon.cpp b/src/gui/painting/qdrawhelper_neon.cpp
index e3f5d5bac7..f5b794ace6 100644
--- a/src/gui/painting/qdrawhelper_neon.cpp
+++ b/src/gui/painting/qdrawhelper_neon.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -1055,6 +1061,16 @@ const uint * QT_FASTCALL qt_fetch_radial_gradient_neon(uint *buffer, const Opera
     return qt_fetch_radial_gradient_template<QRadialFetchSimd<QSimdNeon>,uint>(buffer, op, data, y, x, length);
 }
 
+extern void QT_FASTCALL qt_convert_rgb888_to_rgb32_neon(quint32 *dst, const uchar *src, int len);
+
+const uint * QT_FASTCALL qt_fetchUntransformed_888_neon(uint *buffer, const Operator *, const QSpanData *data,
+                                                       int y, int x, int length)
+{
+    const uchar *line = data->texture.scanLine(y) + x * 3;
+    qt_convert_rgb888_to_rgb32_neon(buffer, line, length);
+    return buffer;
+}
+
 QT_END_NAMESPACE
 
 #endif // __ARM_NEON__
diff --git a/src/gui/painting/qdrawhelper_neon_asm.S b/src/gui/painting/qdrawhelper_neon_asm.S
index 927a03f8ec..1830fd2fc0 100644
--- a/src/gui/painting/qdrawhelper_neon_asm.S
+++ b/src/gui/painting/qdrawhelper_neon_asm.S
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qdrawhelper_neon_p.h b/src/gui/painting/qdrawhelper_neon_p.h
index 37e060f147..3cf949fc32 100644
--- a/src/gui/painting/qdrawhelper_neon_p.h
+++ b/src/gui/painting/qdrawhelper_neon_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -131,6 +137,9 @@ void QT_FASTCALL qt_destStoreRGB16_neon(QRasterBuffer *rasterBuffer,
 void QT_FASTCALL comp_func_solid_SourceOver_neon(uint *destPixels, int length, uint color, uint const_alpha);
 void QT_FASTCALL comp_func_Plus_neon(uint *dst, const uint *src, int length, uint const_alpha);
 
+const uint * QT_FASTCALL qt_fetchUntransformed_888_neon(uint *buffer, const Operator *, const QSpanData *data,
+                                                       int y, int x, int length);
+
 #endif // __ARM_NEON__
 
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qdrawhelper_p.h b/src/gui/painting/qdrawhelper_p.h
index 1c6cd5db8a..f13cdbaec0 100644
--- a/src/gui/painting/qdrawhelper_p.h
+++ b/src/gui/painting/qdrawhelper_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -632,31 +638,75 @@ static Q_ALWAYS_INLINE uint BYTE_MUL(uint x, uint a) {
 }
 #endif
 
-#ifdef __SSE2__
+#if defined(__SSE2__)
+static Q_ALWAYS_INLINE uint interpolate_4_pixels_sse2(__m128i vt, __m128i vb, uint distx, uint disty)
+{
+    // First interpolate top and bottom pixels in parallel.
+    vt = _mm_unpacklo_epi8(vt, _mm_setzero_si128());
+    vb = _mm_unpacklo_epi8(vb, _mm_setzero_si128());
+    vt = _mm_mullo_epi16(vt, _mm_set1_epi16(256 - disty));
+    vb = _mm_mullo_epi16(vb, _mm_set1_epi16(disty));
+    __m128i vlr = _mm_add_epi16(vt, vb);
+    vlr = _mm_srli_epi16(vlr, 8);
+    // vlr now contains the result of the first two interpolate calls vlr = unpacked((xright << 64) | xleft)
+
+    // Now the last interpolate between left and right..
+    const __m128i vidistx = _mm_shufflelo_epi16(_mm_cvtsi32_si128(256 - distx), _MM_SHUFFLE(0, 0, 0, 0));
+    const __m128i vdistx = _mm_shufflelo_epi16(_mm_cvtsi32_si128(distx), _MM_SHUFFLE(0, 0, 0, 0));
+    const __m128i vmulx = _mm_unpacklo_epi16(vidistx, vdistx);
+    vlr = _mm_unpacklo_epi16(vlr, _mm_srli_si128(vlr, 8));
+    // vlr now contains the colors of left and right interleaved { la, ra, lr, rr, lg, rg, lb, rb }
+    vlr = _mm_madd_epi16(vlr, vmulx); // Multiply and horizontal add.
+    vlr = _mm_srli_epi32(vlr, 8);
+    vlr = _mm_packs_epi32(vlr, vlr);
+    vlr = _mm_packus_epi16(vlr, vlr);
+    return _mm_cvtsi128_si32(vlr);
+}
+
+static inline uint interpolate_4_pixels(uint tl, uint tr, uint bl, uint br, uint distx, uint disty)
+{
+    __m128i vt = _mm_unpacklo_epi32(_mm_cvtsi32_si128(tl), _mm_cvtsi32_si128(tr));
+    __m128i vb = _mm_unpacklo_epi32(_mm_cvtsi32_si128(bl), _mm_cvtsi32_si128(br));
+    return interpolate_4_pixels_sse2(vt, vb, distx, disty);
+}
+
+static inline uint interpolate_4_pixels(const uint t[], const uint b[], uint distx, uint disty)
+{
+    __m128i vt = _mm_loadl_epi64((const __m128i*)t);
+    __m128i vb = _mm_loadl_epi64((const __m128i*)b);
+    return interpolate_4_pixels_sse2(vt, vb, distx, disty);
+}
+#elif defined(__ARM_NEON__)
+static Q_ALWAYS_INLINE uint interpolate_4_pixels_neon(uint32x2_t vt32, uint32x2_t vb32, uint distx, uint disty)
+{
+    uint16x8_t vt16 = vmovl_u8(vreinterpret_u8_u32(vt32));
+    uint16x8_t vb16 = vmovl_u8(vreinterpret_u8_u32(vb32));
+    vt16 = vmulq_n_u16(vt16, 256 - disty);
+    vt16 = vmlaq_n_u16(vt16, vb16, disty);
+    vt16 = vshrq_n_u16(vt16, 8);
+    uint16x4_t vl16 = vget_low_u16(vt16);
+    uint16x4_t vr16 = vget_high_u16(vt16);
+    vl16 = vmul_n_u16(vl16, 256 - distx);
+    vl16 = vmla_n_u16(vl16, vr16, distx);
+    vl16 = vshr_n_u16(vl16, 8);
+    uint8x8_t vr = vmovn_u16(vcombine_u16(vl16, vl16));
+    return vget_lane_u32(vreinterpret_u32_u8(vr), 0);
+}
+
 static inline uint interpolate_4_pixels(uint tl, uint tr, uint bl, uint br, uint distx, uint disty)
 {
-    // First interpolate right and left pixels in parallel.
-    __m128i vl = _mm_unpacklo_epi32(_mm_cvtsi32_si128(tl), _mm_cvtsi32_si128(bl));
-    __m128i vr = _mm_unpacklo_epi32(_mm_cvtsi32_si128(tr), _mm_cvtsi32_si128(br));
-    vl = _mm_unpacklo_epi8(vl, _mm_setzero_si128());
-    vr = _mm_unpacklo_epi8(vr, _mm_setzero_si128());
-    vl = _mm_mullo_epi16(vl, _mm_set1_epi16(256 - distx));
-    vr = _mm_mullo_epi16(vr, _mm_set1_epi16(distx));
-    __m128i vtb = _mm_add_epi16(vl, vr);
-    vtb = _mm_srli_epi16(vtb, 8);
-    // vtb now contains the result of the first two interpolate calls vtb = unpacked((xbot << 64) | xtop)
-
-    // Now the last interpolate between top and bottom interpolations.
-    const __m128i vidisty = _mm_shufflelo_epi16(_mm_cvtsi32_si128(256 - disty), _MM_SHUFFLE(0, 0, 0, 0));
-    const __m128i vdisty = _mm_shufflelo_epi16(_mm_cvtsi32_si128(disty), _MM_SHUFFLE(0, 0, 0, 0));
-    const __m128i vmuly = _mm_unpacklo_epi16(vidisty, vdisty);
-    vtb = _mm_unpacklo_epi16(vtb, _mm_srli_si128(vtb, 8));
-    // vtb now contains the colors of top and bottom interleaved { ta, ba, tr, br, tg, bg, tb, bb }
-    vtb = _mm_madd_epi16(vtb, vmuly); // Multiply and horizontal add.
-    vtb = _mm_srli_epi32(vtb, 8);
-    vtb = _mm_packs_epi32(vtb, _mm_setzero_si128());
-    vtb = _mm_packus_epi16(vtb, _mm_setzero_si128());
-    return _mm_cvtsi128_si32(vtb);
+    uint32x2_t vt32 = vmov_n_u32(tl);
+    uint32x2_t vb32 = vmov_n_u32(bl);
+    vt32 = vset_lane_u32(tr, vt32, 1);
+    vb32 = vset_lane_u32(br, vb32, 1);
+    return interpolate_4_pixels_neon(vt32, vb32, distx, disty);
+}
+
+static inline uint interpolate_4_pixels(const uint t[], const uint b[], uint distx, uint disty)
+{
+    uint32x2_t vt32 = vld1_u32(t);
+    uint32x2_t vb32 = vld1_u32(b);
+    return interpolate_4_pixels_neon(vt32, vb32, distx, disty);
 }
 #else
 static inline uint interpolate_4_pixels(uint tl, uint tr, uint bl, uint br, uint distx, uint disty)
@@ -667,6 +717,11 @@ static inline uint interpolate_4_pixels(uint tl, uint tr, uint bl, uint br, uint
     uint xbot = INTERPOLATE_PIXEL_256(bl, idistx, br, distx);
     return INTERPOLATE_PIXEL_256(xtop, idisty, xbot, disty);
 }
+
+static inline uint interpolate_4_pixels(const uint t[], const uint b[], uint distx, uint disty)
+{
+    return interpolate_4_pixels(t[0], t[1], b[0], b[1], distx, disty);
+}
 #endif
 
 #if Q_BYTE_ORDER == Q_BIG_ENDIAN
@@ -1161,7 +1216,7 @@ typedef void (QT_FASTCALL *StorePixelsFunc)(uchar *dest, const uint *src, int in
 
 extern QPixelLayout qPixelLayouts[QImage::NImageFormats];
 extern const FetchPixelsFunc qFetchPixels[QPixelLayout::BPPCount];
-extern const StorePixelsFunc qStorePixels[QPixelLayout::BPPCount];
+extern StorePixelsFunc qStorePixels[QPixelLayout::BPPCount];
 
 
 
diff --git a/src/gui/painting/qdrawhelper_sse2.cpp b/src/gui/painting/qdrawhelper_sse2.cpp
index d7f3686e54..03abeed440 100644
--- a/src/gui/painting/qdrawhelper_sse2.cpp
+++ b/src/gui/painting/qdrawhelper_sse2.cpp
@@ -1,31 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2016 Intel Corporation.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qdrawhelper_sse4.cpp b/src/gui/painting/qdrawhelper_sse4.cpp
index 7cc498eefc..a39cdb3127 100644
--- a/src/gui/painting/qdrawhelper_sse4.cpp
+++ b/src/gui/painting/qdrawhelper_sse4.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qdrawhelper_ssse3.cpp b/src/gui/painting/qdrawhelper_ssse3.cpp
index fff4145d21..7cd3e9ca1b 100644
--- a/src/gui/painting/qdrawhelper_ssse3.cpp
+++ b/src/gui/painting/qdrawhelper_ssse3.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -170,6 +176,73 @@ void qt_blend_argb32_on_argb32_ssse3(uchar *destPixels, int dbpl,
     }
 }
 
+static inline void store_uint24_ssse3(uchar *dst, const uint *src, int len)
+{
+    int i = 0;
+
+    quint24 *dst24 = reinterpret_cast<quint24*>(dst);
+    // Align dst on 16 bytes
+    for (; i < len && (reinterpret_cast<quintptr>(dst24) & 0xf); ++i)
+        *dst24++ = quint24(*src++);
+
+    // Shuffle masks for first and second half of every output, all outputs are aligned so the shuffled ends are not used.
+    const __m128i shuffleMask1 = _mm_setr_epi8(char(0x80), char(0x80), char(0x80), char(0x80), 2, 1, 0, 6, 5, 4, 10, 9, 8, 14, 13, 12);
+    const __m128i shuffleMask2 = _mm_setr_epi8(2, 1, 0, 6, 5, 4, 10, 9, 8, 14, 13, 12, char(0x80), char(0x80), char(0x80), char(0x80));
+
+    const __m128i *inVectorPtr = (const __m128i *)src;
+    __m128i *dstVectorPtr = (__m128i *)dst24;
+
+    for (; i < (len - 15); i += 16) {
+        // Load four vectors, store three.
+        // Create each output vector by combining two shuffled input vectors.
+        __m128i srcVector1 = _mm_loadu_si128(inVectorPtr);
+        ++inVectorPtr;
+        __m128i srcVector2 = _mm_loadu_si128(inVectorPtr);
+        ++inVectorPtr;
+        __m128i outputVector1 = _mm_shuffle_epi8(srcVector1, shuffleMask1);
+        __m128i outputVector2 = _mm_shuffle_epi8(srcVector2, shuffleMask2);
+        __m128i outputVector = _mm_alignr_epi8(outputVector2, outputVector1, 4);
+        _mm_store_si128(dstVectorPtr, outputVector);
+        ++dstVectorPtr;
+
+        srcVector1 = _mm_loadu_si128(inVectorPtr);
+        ++inVectorPtr;
+        outputVector1 = _mm_shuffle_epi8(srcVector2, shuffleMask1);
+        outputVector2 = _mm_shuffle_epi8(srcVector1, shuffleMask2);
+        outputVector = _mm_alignr_epi8(outputVector2, outputVector1, 8);
+        _mm_store_si128(dstVectorPtr, outputVector);
+        ++dstVectorPtr;
+
+        srcVector2 = _mm_loadu_si128(inVectorPtr);
+        ++inVectorPtr;
+        outputVector1 = _mm_shuffle_epi8(srcVector1, shuffleMask1);
+        outputVector2 = _mm_shuffle_epi8(srcVector2, shuffleMask2);
+        outputVector = _mm_alignr_epi8(outputVector2, outputVector1, 12);
+        _mm_store_si128(dstVectorPtr, outputVector);
+        ++dstVectorPtr;
+    }
+    dst24 = reinterpret_cast<quint24*>(dstVectorPtr);
+    src = reinterpret_cast<const uint*>(inVectorPtr);
+
+    for (; i < len; ++i)
+        *dst24++ = quint24(*src++);
+}
+
+void QT_FASTCALL storePixelsBPP24_ssse3(uchar *dest, const uint *src, int index, int count)
+{
+    store_uint24_ssse3(dest + index * 3, src, count);
+}
+
+extern void QT_FASTCALL qt_convert_rgb888_to_rgb32_ssse3(quint32 *dst, const uchar *src, int len);
+
+const uint * QT_FASTCALL qt_fetchUntransformed_888_ssse3(uint *buffer, const Operator *, const QSpanData *data,
+                                                         int y, int x, int length)
+{
+    const uchar *line = data->texture.scanLine(y) + x * 3;
+    qt_convert_rgb888_to_rgb32_ssse3(buffer, line, length);
+    return buffer;
+}
+
 QT_END_NAMESPACE
 
 #endif // QT_COMPILER_SUPPORTS_SSSE3
diff --git a/src/gui/painting/qdrawhelper_x86_p.h b/src/gui/painting/qdrawhelper_x86_p.h
index 50ee83aa2c..37be8b89a9 100644
--- a/src/gui/painting/qdrawhelper_x86_p.h
+++ b/src/gui/painting/qdrawhelper_x86_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qdrawingprimitive_sse2_p.h b/src/gui/painting/qdrawingprimitive_sse2_p.h
index c74055e440..e16529e2d0 100644
--- a/src/gui/painting/qdrawingprimitive_sse2_p.h
+++ b/src/gui/painting/qdrawingprimitive_sse2_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qemulationpaintengine.cpp b/src/gui/painting/qemulationpaintengine.cpp
index 12ba67c124..586b71557e 100644
--- a/src/gui/painting/qemulationpaintengine.cpp
+++ b/src/gui/painting/qemulationpaintengine.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qemulationpaintengine_p.h b/src/gui/painting/qemulationpaintengine_p.h
index ab35e9b23e..f3cf88af17 100644
--- a/src/gui/painting/qemulationpaintengine_p.h
+++ b/src/gui/painting/qemulationpaintengine_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qfixed_p.h b/src/gui/painting/qfixed_p.h
index c29dacae3d..d2b6e51ab1 100644
--- a/src/gui/painting/qfixed_p.h
+++ b/src/gui/painting/qfixed_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qgammatables.cpp b/src/gui/painting/qgammatables.cpp
index 83c31bbe95..1d76f7ee3c 100644
--- a/src/gui/painting/qgammatables.cpp
+++ b/src/gui/painting/qgammatables.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.c
index 5ce1895541..db3453898f 100644
--- a/src/gui/painting/qgrayraster.c
+++ b/src/gui/painting/qgrayraster.c
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qgrayraster_p.h b/src/gui/painting/qgrayraster_p.h
index 8d1dec6b80..86d54d4379 100644
--- a/src/gui/painting/qgrayraster_p.h
+++ b/src/gui/painting/qgrayraster_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qimagescale.cpp b/src/gui/painting/qimagescale.cpp
index 33dccc5374..22787b91fe 100644
--- a/src/gui/painting/qimagescale.cpp
+++ b/src/gui/painting/qimagescale.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -277,6 +283,18 @@ void qt_qimageScaleAARGBA_down_xy_sse4(QImageScaleInfo *isi, unsigned int *dest,
                                        int dw, int dh, int dow, int sow);
 #endif
 
+#if defined(__ARM_NEON__)
+template<bool RGB>
+void qt_qimageScaleAARGBA_up_x_down_y_neon(QImageScaleInfo *isi, unsigned int *dest,
+                                           int dw, int dh, int dow, int sow);
+template<bool RGB>
+void qt_qimageScaleAARGBA_down_x_up_y_neon(QImageScaleInfo *isi, unsigned int *dest,
+                                           int dw, int dh, int dow, int sow);
+template<bool RGB>
+void qt_qimageScaleAARGBA_down_xy_neon(QImageScaleInfo *isi, unsigned int *dest,
+                                       int dw, int dh, int dow, int sow);
+#endif
+
 static void qt_qimageScaleAARGBA_up_xy(QImageScaleInfo *isi, unsigned int *dest,
                                        int dw, int dh, int dow, int sow)
 {
@@ -296,7 +314,7 @@ static void qt_qimageScaleAARGBA_up_xy(QImageScaleInfo *isi, unsigned int *dest,
                 const unsigned int *pix = sptr + xpoints[x];
                 const int xap = xapoints[x];
                 if (xap > 0)
-                    *dptr = interpolate_4_pixels(pix[0], pix[1], pix[sow], pix[sow + 1], xap, yap);
+                    *dptr = interpolate_4_pixels(pix, pix + sow, xap, yap);
                 else
                     *dptr = INTERPOLATE_PIXEL_256(pix[0], 256 - yap, pix[sow], yap);
                 dptr++;
@@ -329,6 +347,10 @@ static void qt_qimageScaleAARGBA(QImageScaleInfo *isi, unsigned int *dest,
         if (qCpuHasFeature(SSE4_1))
             qt_qimageScaleAARGBA_up_x_down_y_sse4<false>(isi, dest, dw, dh, dow, sow);
         else
+#elif defined(__ARM_NEON__)
+        if (qCpuHasFeature(NEON))
+            qt_qimageScaleAARGBA_up_x_down_y_neon<false>(isi, dest, dw, dh, dow, sow);
+        else
 #endif
         qt_qimageScaleAARGBA_up_x_down_y(isi, dest, dw, dh, dow, sow);
     }
@@ -338,6 +360,10 @@ static void qt_qimageScaleAARGBA(QImageScaleInfo *isi, unsigned int *dest,
         if (qCpuHasFeature(SSE4_1))
             qt_qimageScaleAARGBA_down_x_up_y_sse4<false>(isi, dest, dw, dh, dow, sow);
         else
+#elif defined(__ARM_NEON__)
+        if (qCpuHasFeature(NEON))
+            qt_qimageScaleAARGBA_down_x_up_y_neon<false>(isi, dest, dw, dh, dow, sow);
+        else
 #endif
         qt_qimageScaleAARGBA_down_x_up_y(isi, dest, dw, dh, dow, sow);
     }
@@ -347,6 +373,10 @@ static void qt_qimageScaleAARGBA(QImageScaleInfo *isi, unsigned int *dest,
         if (qCpuHasFeature(SSE4_1))
             qt_qimageScaleAARGBA_down_xy_sse4<false>(isi, dest, dw, dh, dow, sow);
         else
+#elif defined(__ARM_NEON__)
+        if (qCpuHasFeature(NEON))
+            qt_qimageScaleAARGBA_down_xy_neon<false>(isi, dest, dw, dh, dow, sow);
+        else
 #endif
         qt_qimageScaleAARGBA_down_xy(isi, dest, dw, dh, dow, sow);
     }
@@ -522,6 +552,10 @@ static void qt_qimageScaleAARGB(QImageScaleInfo *isi, unsigned int *dest,
         if (qCpuHasFeature(SSE4_1))
             qt_qimageScaleAARGBA_up_x_down_y_sse4<true>(isi, dest, dw, dh, dow, sow);
         else
+#elif defined(__ARM_NEON__)
+        if (qCpuHasFeature(NEON))
+            qt_qimageScaleAARGBA_up_x_down_y_neon<true>(isi, dest, dw, dh, dow, sow);
+        else
 #endif
         qt_qimageScaleAARGB_up_x_down_y(isi, dest, dw, dh, dow, sow);
     }
@@ -531,6 +565,10 @@ static void qt_qimageScaleAARGB(QImageScaleInfo *isi, unsigned int *dest,
         if (qCpuHasFeature(SSE4_1))
             qt_qimageScaleAARGBA_down_x_up_y_sse4<true>(isi, dest, dw, dh, dow, sow);
         else
+#elif defined(__ARM_NEON__)
+        if (qCpuHasFeature(NEON))
+            qt_qimageScaleAARGBA_down_x_up_y_neon<true>(isi, dest, dw, dh, dow, sow);
+        else
 #endif
         qt_qimageScaleAARGB_down_x_up_y(isi, dest, dw, dh, dow, sow);
     }
@@ -540,6 +578,10 @@ static void qt_qimageScaleAARGB(QImageScaleInfo *isi, unsigned int *dest,
         if (qCpuHasFeature(SSE4_1))
             qt_qimageScaleAARGBA_down_xy_sse4<true>(isi, dest, dw, dh, dow, sow);
         else
+#elif defined(__ARM_NEON__)
+        if (qCpuHasFeature(NEON))
+            qt_qimageScaleAARGBA_down_xy_neon<true>(isi, dest, dw, dh, dow, sow);
+        else
 #endif
         qt_qimageScaleAARGB_down_xy(isi, dest, dw, dh, dow, sow);
     }
diff --git a/src/gui/painting/qimagescale_neon.cpp b/src/gui/painting/qimagescale_neon.cpp
new file mode 100644
index 0000000000..4ae113b002
--- /dev/null
+++ b/src/gui/painting/qimagescale_neon.cpp
@@ -0,0 +1,215 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qimagescale_p.h"
+#include "qimage.h"
+#include <private/qsimd_p.h>
+
+#if defined(__ARM_NEON__)
+
+QT_BEGIN_NAMESPACE
+
+using namespace QImageScale;
+
+inline static uint32x4_t qt_qimageScaleAARGBA_helper(const unsigned int *pix, int xyap, int Cxy, int step)
+{
+    uint32x2_t vpix32 = vmov_n_u32(*pix);
+    uint16x4_t vpix16 = vget_low_u16(vmovl_u8(vreinterpret_u8_u32(vpix32)));
+    uint32x4_t vx = vmull_n_u16(vpix16, xyap);
+    int i;
+    for (i = (1 << 14) - xyap; i > Cxy; i -= Cxy) {
+        pix += step;
+        vpix32 = vmov_n_u32(*pix);
+        vpix16 = vget_low_u16(vmovl_u8(vreinterpret_u8_u32(vpix32)));
+        vx = vaddq_u32(vx, vmull_n_u16(vpix16, Cxy));
+    }
+    pix += step;
+    vpix32 = vmov_n_u32(*pix);
+    vpix16 = vget_low_u16(vmovl_u8(vreinterpret_u8_u32(vpix32)));
+    vx = vaddq_u32(vx, vmull_n_u16(vpix16, i));
+    return vx;
+}
+
+template<bool RGB>
+void qt_qimageScaleAARGBA_up_x_down_y_neon(QImageScaleInfo *isi, unsigned int *dest,
+                                           int dw, int dh, int dow, int sow)
+{
+    const unsigned int **ypoints = isi->ypoints;
+    int *xpoints = isi->xpoints;
+    int *xapoints = isi->xapoints;
+    int *yapoints = isi->yapoints;
+
+    /* go through every scanline in the output buffer */
+    for (int y = 0; y < dh; y++) {
+        int Cy = yapoints[y] >> 16;
+        int yap = yapoints[y] & 0xffff;
+
+        unsigned int *dptr = dest + (y * dow);
+        for (int x = 0; x < dw; x++) {
+            const unsigned int *sptr = ypoints[y] + xpoints[x];
+            uint32x4_t vx = qt_qimageScaleAARGBA_helper(sptr, yap, Cy, sow);
+
+            int xap = xapoints[x];
+            if (xap > 0) {
+                uint32x4_t vr = qt_qimageScaleAARGBA_helper(sptr + 1, yap, Cy, sow);
+
+                vx = vmulq_n_u32(vx, 256 - xap);
+                vr = vmulq_n_u32(vr, xap);
+                vx = vaddq_u32(vx, vr);
+                vx = vshrq_n_u32(vx, 8);
+            }
+            vx = vshrq_n_u32(vx, 14);
+            const uint16x4_t vx16 = vmovn_u32(vx);
+            const uint8x8_t vx8 = vmovn_u16(vcombine_u16(vx16, vx16));
+            *dptr = vget_lane_u32(vreinterpret_u32_u8(vx8), 0);
+            if (RGB)
+                *dptr |= 0xff000000;
+            dptr++;
+        }
+    }
+}
+
+template<bool RGB>
+void qt_qimageScaleAARGBA_down_x_up_y_neon(QImageScaleInfo *isi, unsigned int *dest,
+                                           int dw, int dh, int dow, int sow)
+{
+    const unsigned int **ypoints = isi->ypoints;
+    int *xpoints = isi->xpoints;
+    int *xapoints = isi->xapoints;
+    int *yapoints = isi->yapoints;
+
+    /* go through every scanline in the output buffer */
+    for (int y = 0; y < dh; y++) {
+        unsigned int *dptr = dest + (y * dow);
+        for (int x = 0; x < dw; x++) {
+            int Cx = xapoints[x] >> 16;
+            int xap = xapoints[x] & 0xffff;
+
+            const unsigned int *sptr = ypoints[y] + xpoints[x];
+            uint32x4_t vx = qt_qimageScaleAARGBA_helper(sptr, xap, Cx, 1);
+
+            int yap = yapoints[y];
+            if (yap > 0) {
+                uint32x4_t vr = qt_qimageScaleAARGBA_helper(sptr + sow, xap, Cx, 1);
+
+                vx = vmulq_n_u32(vx, 256 - yap);
+                vr = vmulq_n_u32(vr, yap);
+                vx = vaddq_u32(vx, vr);
+                vx = vshrq_n_u32(vx, 8);
+            }
+            vx = vshrq_n_u32(vx, 14);
+            const uint16x4_t vx16 = vmovn_u32(vx);
+            const uint8x8_t vx8 = vmovn_u16(vcombine_u16(vx16, vx16));
+            *dptr = vget_lane_u32(vreinterpret_u32_u8(vx8), 0);
+            if (RGB)
+                *dptr |= 0xff000000;
+            dptr++;
+        }
+    }
+}
+
+template<bool RGB>
+void qt_qimageScaleAARGBA_down_xy_neon(QImageScaleInfo *isi, unsigned int *dest,
+                                       int dw, int dh, int dow, int sow)
+{
+    const unsigned int **ypoints = isi->ypoints;
+    int *xpoints = isi->xpoints;
+    int *xapoints = isi->xapoints;
+    int *yapoints = isi->yapoints;
+
+    for (int y = 0; y < dh; y++) {
+        int Cy = yapoints[y] >> 16;
+        int yap = yapoints[y] & 0xffff;
+
+        unsigned int *dptr = dest + (y * dow);
+        for (int x = 0; x < dw; x++) {
+            const int Cx = xapoints[x] >> 16;
+            const int xap = xapoints[x] & 0xffff;
+
+            const unsigned int *sptr = ypoints[y] + xpoints[x];
+            uint32x4_t vx = qt_qimageScaleAARGBA_helper(sptr, xap, Cx, 1);
+            vx = vshrq_n_u32(vx, 4);
+            uint32x4_t vr = vmulq_n_u32(vx, yap);
+
+            int j;
+            for (j = (1 << 14) - yap; j > Cy; j -= Cy) {
+                sptr += sow;
+                vx = qt_qimageScaleAARGBA_helper(sptr, xap, Cx, 1);
+                vx = vshrq_n_u32(vx, 4);
+                vx = vmulq_n_u32(vx, Cy);
+                vr = vaddq_u32(vr, vx);
+            }
+            sptr += sow;
+            vx = qt_qimageScaleAARGBA_helper(sptr, xap, Cx, 1);
+            vx = vshrq_n_u32(vx, 4);
+            vx = vmulq_n_u32(vx, j);
+            vr = vaddq_u32(vr, vx);
+
+            vx = vshrq_n_u32(vr, 24);
+            const uint16x4_t vx16 = vmovn_u32(vx);
+            const uint8x8_t vx8 = vmovn_u16(vcombine_u16(vx16, vx16));
+            *dptr = vget_lane_u32(vreinterpret_u32_u8(vx8), 0);
+            if (RGB)
+                *dptr |= 0xff000000;
+            dptr++;
+        }
+    }
+}
+
+template void qt_qimageScaleAARGBA_up_x_down_y_neon<false>(QImageScaleInfo *isi, unsigned int *dest,
+                                                           int dw, int dh, int dow, int sow);
+
+template void qt_qimageScaleAARGBA_up_x_down_y_neon<true>(QImageScaleInfo *isi, unsigned int *dest,
+                                                          int dw, int dh, int dow, int sow);
+
+template void qt_qimageScaleAARGBA_down_x_up_y_neon<false>(QImageScaleInfo *isi, unsigned int *dest,
+                                                           int dw, int dh, int dow, int sow);
+
+template void qt_qimageScaleAARGBA_down_x_up_y_neon<true>(QImageScaleInfo *isi, unsigned int *dest,
+                                                          int dw, int dh, int dow, int sow);
+
+template void qt_qimageScaleAARGBA_down_xy_neon<false>(QImageScaleInfo *isi, unsigned int *dest,
+                                                       int dw, int dh, int dow, int sow);
+
+template void qt_qimageScaleAARGBA_down_xy_neon<true>(QImageScaleInfo *isi, unsigned int *dest,
+                                                      int dw, int dh, int dow, int sow);
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/painting/qimagescale_p.h b/src/gui/painting/qimagescale_p.h
index c35aea451a..415623a575 100644
--- a/src/gui/painting/qimagescale_p.h
+++ b/src/gui/painting/qimagescale_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qimagescale_sse4.cpp b/src/gui/painting/qimagescale_sse4.cpp
index 8712b5d324..34d6b3882e 100644
--- a/src/gui/painting/qimagescale_sse4.cpp
+++ b/src/gui/painting/qimagescale_sse4.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qmath_p.h b/src/gui/painting/qmath_p.h
index 13f82a82bb..7cc3612113 100644
--- a/src/gui/painting/qmath_p.h
+++ b/src/gui/painting/qmath_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index e4d756c18d..681490e347 100644
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -238,11 +244,11 @@ QMatrix::QMatrix(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qreal dy)
 {
 }
 
-
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
      Constructs a matrix that is a copy of the given \a matrix.
  */
-QMatrix::QMatrix(const QMatrix &matrix)
+QMatrix::QMatrix(const QMatrix &matrix) Q_DECL_NOTHROW
     : _m11(matrix._m11)
     , _m12(matrix._m12)
     , _m21(matrix._m21)
@@ -251,6 +257,7 @@ QMatrix::QMatrix(const QMatrix &matrix)
     , _dy(matrix._dy)
 {
 }
+#endif
 
 /*!
     Sets the matrix elements to the specified values, \a m11, \a m12,
@@ -1057,10 +1064,11 @@ QMatrix QMatrix::operator *(const QMatrix &m) const
     return QMatrix(tm11, tm12, tm21, tm22, tdx, tdy, true);
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
     Assigns the given \a matrix's values to this matrix.
 */
-QMatrix &QMatrix::operator=(const QMatrix &matrix)
+QMatrix &QMatrix::operator=(const QMatrix &matrix) Q_DECL_NOTHROW
 {
     _m11 = matrix._m11;
     _m12 = matrix._m12;
@@ -1070,6 +1078,7 @@ QMatrix &QMatrix::operator=(const QMatrix &matrix)
     _dy  = matrix._dy;
     return *this;
 }
+#endif
 
 /*!
     \since 4.2
diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h
index 809a19a0b8..b28c8433cd 100644
--- a/src/gui/painting/qmatrix.h
+++ b/src/gui/painting/qmatrix.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -54,7 +60,16 @@ public:
     QMatrix();
     QMatrix(qreal m11, qreal m12, qreal m21, qreal m22,
             qreal dx, qreal dy);
-    QMatrix(const QMatrix &matrix);
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    // ### Qt 6: remove; the compiler-generated ones are fine!
+    QMatrix &operator=(QMatrix &&other) Q_DECL_NOTHROW // = default
+    { memcpy(this, &other, sizeof(QMatrix)); return *this; }
+    QMatrix &operator=(const QMatrix &) Q_DECL_NOTHROW; // = default
+    QMatrix(QMatrix &&other) Q_DECL_NOTHROW // = default
+    { memcpy(this, &other, sizeof(QMatrix)); }
+    QMatrix(const QMatrix &other) Q_DECL_NOTHROW; // = default
+#endif
 
     void setMatrix(qreal m11, qreal m12, qreal m21, qreal m22,
                    qreal dx, qreal dy);
@@ -100,8 +115,6 @@ public:
     QMatrix &operator*=(const QMatrix &);
     QMatrix operator*(const QMatrix &o) const;
 
-    QMatrix &operator=(const QMatrix &);
-
     operator QVariant() const;
 
 private:
diff --git a/src/gui/painting/qmemrotate.cpp b/src/gui/painting/qmemrotate.cpp
index f205cb1c5e..3fbae76de5 100644
--- a/src/gui/painting/qmemrotate.cpp
+++ b/src/gui/painting/qmemrotate.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qmemrotate_p.h b/src/gui/painting/qmemrotate_p.h
index ece6e94765..64cfb22517 100644
--- a/src/gui/painting/qmemrotate_p.h
+++ b/src/gui/painting/qmemrotate_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qoutlinemapper.cpp b/src/gui/painting/qoutlinemapper.cpp
index 84061a5c25..f1e4ce5820 100644
--- a/src/gui/painting/qoutlinemapper.cpp
+++ b/src/gui/painting/qoutlinemapper.cpp
@@ -1,40 +1,47 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
 #include "qoutlinemapper_p.h"
-#include <private/qpainterpath_p.h>
+
+#include "qbezier_p.h"
 #include "qmath.h"
-#include <private/qbezier_p.h>
+#include "qpainterpath_p.h"
 
 #include <stdlib.h>
 
@@ -71,10 +78,23 @@ void QOutlineMapper::curveTo(const QPointF &cp1, const QPointF &cp2, const QPoin
 #endif
 
     QBezier bezier = QBezier::fromPoints(m_elements.last(), cp1, cp2, ep);
-    bezier.addToPolygon(m_elements, m_curve_threshold);
-    m_element_types.reserve(m_elements.size());
-    for (int i = m_elements.size() - m_element_types.size(); i; --i)
-        m_element_types << QPainterPath::LineToElement;
+
+    bool outsideClip = false;
+    // Test one point first before doing a full intersection test.
+    if (!QRectF(m_clip_rect).contains(m_transform.map(ep))) {
+        QRectF potentialCurveArea = m_transform.mapRect(bezier.bounds());
+        outsideClip = !potentialCurveArea.intersects(m_clip_rect);
+    }
+    if (outsideClip) {
+        // The curve is entirely outside the clip rect, so just
+        // approximate it with a line that closes the path.
+        lineTo(ep);
+    } else {
+        bezier.addToPolygon(m_elements, m_curve_threshold);
+        m_element_types.reserve(m_elements.size());
+        for (int i = m_elements.size() - m_element_types.size(); i; --i)
+            m_element_types << QPainterPath::LineToElement;
+    }
     Q_ASSERT(m_elements.size() == m_element_types.size());
 }
 
@@ -181,38 +201,26 @@ void QOutlineMapper::endOutline()
     QPointF *elements = m_elements.data();
 
     // Transform the outline
-    if (m_txop == QTransform::TxNone) {
-        // Nothing to do.
-    } else if (m_txop == QTransform::TxTranslate) {
-        for (int i = 0; i < m_elements.size(); ++i) {
-            QPointF &e = elements[i];
-            e = QPointF(e.x() + m_dx, e.y() + m_dy);
-        }
-    } else if (m_txop == QTransform::TxScale) {
-        for (int i = 0; i < m_elements.size(); ++i) {
-            QPointF &e = elements[i];
-            e = QPointF(m_m11 * e.x() + m_dx, m_m22 * e.y() + m_dy);
-        }
-    } else if (m_txop < QTransform::TxProject) {
-        for (int i = 0; i < m_elements.size(); ++i) {
-            QPointF &e = elements[i];
-            e = QPointF(m_m11 * e.x() + m_m21 * e.y() + m_dx,
-                        m_m22 * e.y() + m_m12 * e.x() + m_dy);
-        }
+    if (m_transform.isIdentity()) {
+        // Nothing to do
+    } else if (m_transform.type() < QTransform::TxProject) {
+        for (int i = 0; i < m_elements.size(); ++i)
+            elements[i] = m_transform.map(elements[i]);
     } else {
         const QVectorPath vp((qreal *)elements, m_elements.size(),
                              m_element_types.size() ? m_element_types.data() : 0);
         QPainterPath path = vp.convertToPainterPath();
-        path = QTransform(m_m11, m_m12, m_m13, m_m21, m_m22, m_m23, m_dx, m_dy, m_m33).map(path);
+        path = m_transform.map(path);
         if (!(m_outline.flags & QT_FT_OUTLINE_EVEN_ODD_FILL))
             path.setFillRule(Qt::WindingFill);
-        uint old_txop = m_txop;
-        m_txop = QTransform::TxNone;
-        if (path.isEmpty())
+        if (path.isEmpty()) {
             m_valid = false;
-        else
+        } else {
+            QTransform oldTransform = m_transform;
+            m_transform.reset();
             convertPath(path);
-        m_txop = old_txop;
+            m_transform = oldTransform;
+        }
         return;
     }
 
@@ -381,13 +389,14 @@ void QOutlineMapper::clipElements(const QPointF *elements,
     QPainterPath clipPath;
     clipPath.addRect(m_clip_rect);
     QPainterPath clippedPath = path.intersected(clipPath);
-    uint old_txop = m_txop;
-    m_txop = QTransform::TxNone;
-    if (clippedPath.isEmpty())
+    if (clippedPath.isEmpty()) {
         m_valid = false;
-    else
+    } else {
+        QTransform oldTransform = m_transform;
+        m_transform.reset();
         convertPath(clippedPath);
-    m_txop = old_txop;
+        m_transform = oldTransform;
+    }
 
     m_in_clip_elements = false;
 }
diff --git a/src/gui/painting/qoutlinemapper_p.h b/src/gui/painting/qoutlinemapper_p.h
index 9d75e12619..47413d920c 100644
--- a/src/gui/painting/qoutlinemapper_p.h
+++ b/src/gui/painting/qoutlinemapper_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -98,16 +104,7 @@ public:
     */
     void setMatrix(const QTransform &m)
     {
-        m_m11 = m.m11();
-        m_m12 = m.m12();
-        m_m13 = m.m13();
-        m_m21 = m.m21();
-        m_m22 = m.m22();
-        m_m23 = m.m23();
-        m_m33 = m.m33();
-        m_dx = m.dx();
-        m_dy = m.dy();
-        m_txop = m.type();
+        m_transform = m;
 
         qreal scale;
         qt_scaleForTransform(m, &scale);
@@ -201,20 +198,10 @@ public:
     QRectF controlPointRect; // only valid after endOutline()
 
     QT_FT_Outline m_outline;
-    uint m_txop;
 
     int m_subpath_start;
 
-    // Matrix
-    qreal m_m11;
-    qreal m_m12;
-    qreal m_m13;
-    qreal m_m21;
-    qreal m_m22;
-    qreal m_m23;
-    qreal m_m33;
-    qreal m_dx;
-    qreal m_dy;
+    QTransform m_transform;
 
     qreal m_curve_threshold;
 
diff --git a/src/gui/painting/qpagedpaintdevice.cpp b/src/gui/painting/qpagedpaintdevice.cpp
index 547cedf51f..22ec981134 100644
--- a/src/gui/painting/qpagedpaintdevice.cpp
+++ b/src/gui/painting/qpagedpaintdevice.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpagedpaintdevice.h b/src/gui/painting/qpagedpaintdevice.h
index 8d5f677bc5..3aebbb7551 100644
--- a/src/gui/painting/qpagedpaintdevice.h
+++ b/src/gui/painting/qpagedpaintdevice.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpagedpaintdevice_p.h b/src/gui/painting/qpagedpaintdevice_p.h
index 30b1c0a1e6..028ab3b5af 100644
--- a/src/gui/painting/qpagedpaintdevice_p.h
+++ b/src/gui/painting/qpagedpaintdevice_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpagelayout.cpp b/src/gui/painting/qpagelayout.cpp
index 15dfa6f8c1..f3f7f5f956 100644
--- a/src/gui/painting/qpagelayout.cpp
+++ b/src/gui/painting/qpagelayout.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2014 John Layt <jlayt@kde.org>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpagelayout.h b/src/gui/painting/qpagelayout.h
index 7eac348c43..bd29165777 100644
--- a/src/gui/painting/qpagelayout.h
+++ b/src/gui/painting/qpagelayout.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2014 John Layt <jlayt@kde.org>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpagesize.cpp b/src/gui/painting/qpagesize.cpp
index 17f6b7bb64..f53285d9cb 100644
--- a/src/gui/painting/qpagesize.cpp
+++ b/src/gui/painting/qpagesize.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2014 John Layt <jlayt@kde.org>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpagesize.h b/src/gui/painting/qpagesize.h
index 9119a582ac..4916ddd4b5 100644
--- a/src/gui/painting/qpagesize.h
+++ b/src/gui/painting/qpagesize.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2014 John Layt <jlayt@kde.org>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpaintdevice.cpp b/src/gui/painting/qpaintdevice.cpp
index 2332d11a03..faaa316085 100644
--- a/src/gui/painting/qpaintdevice.cpp
+++ b/src/gui/painting/qpaintdevice.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h
index 72a6ca4cb3..5c9b966029 100644
--- a/src/gui/painting/qpaintdevice.h
+++ b/src/gui/painting/qpaintdevice.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpaintdevice.qdoc b/src/gui/painting/qpaintdevice.qdoc
index ef5deb154d..0cba864523 100644
--- a/src/gui/painting/qpaintdevice.qdoc
+++ b/src/gui/painting/qpaintdevice.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -11,8 +11,8 @@
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file included in the packaging of
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp
index f056207d19..ddea168e72 100644
--- a/src/gui/painting/qpaintengine.cpp
+++ b/src/gui/painting/qpaintengine.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -304,6 +310,7 @@ struct QT_Point {
     int x;
     int y;
 };
+Q_DECLARE_TYPEINFO(QT_Point, Q_PRIMITIVE_TYPE);
 
 /*!
     \fn void QPaintEngine::drawPolygon(const QPointF *points, int pointCount,
@@ -334,6 +341,8 @@ struct QT_PointF {
     qreal x;
     qreal y;
 };
+Q_DECLARE_TYPEINFO(QT_PointF, Q_PRIMITIVE_TYPE);
+
 /*!
     \overload
 
diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h
index fa3fad1caa..a9da37b354 100644
--- a/src/gui/painting/qpaintengine.h
+++ b/src/gui/painting/qpaintengine.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpaintengine_blitter.cpp b/src/gui/painting/qpaintengine_blitter.cpp
index a2bab58922..81191d07b8 100644
--- a/src/gui/painting/qpaintengine_blitter.cpp
+++ b/src/gui/painting/qpaintengine_blitter.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -190,7 +196,7 @@ private:
     }
 
     void setSourcePixmapMask() {
-        updateStateBits(&drawPixmapMask, STATE_XFORM_SCALE, true);
+        updateStateBits(&drawPixmapMask, STATE_XFORM_SCALE, false);
         updateStateBits(&drawPixmapMask, STATE_XFORM_COMPLEX, false);
 
         updateStateBits(&drawPixmapMask, STATE_BRUSH_PATTERN, true);
@@ -212,7 +218,7 @@ private:
 
     void setSourceOverScaledPixmapMask() {
         setSourceOverPixmapMask();
-        updateStateBits(&drawRectMask, STATE_XFORM_SCALE, true);
+        updateStateBits(&drawPixmapMask, STATE_XFORM_SCALE, true);
     }
 
     void setOpacityPixmapMask() {
diff --git a/src/gui/painting/qpaintengine_blitter_p.h b/src/gui/painting/qpaintengine_blitter_p.h
index e960fbcfa8..3feabcf6fc 100644
--- a/src/gui/painting/qpaintengine_blitter_p.h
+++ b/src/gui/painting/qpaintengine_blitter_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -60,46 +66,48 @@ class Q_GUI_EXPORT QBlitterPaintEngine : public QRasterPaintEngine
 public:
     QBlitterPaintEngine(QBlittablePlatformPixmap *p);
 
-    virtual QPaintEngine::Type type() const { return Blitter; }
+    virtual QPaintEngine::Type type() const Q_DECL_OVERRIDE
+    { return Blitter; }
 
-    virtual bool begin(QPaintDevice *pdev);
-    virtual bool end();
+    virtual bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE;
+    virtual bool end() Q_DECL_OVERRIDE;
 
     // Call down into QBlittable
-    virtual void fill(const QVectorPath &path, const QBrush &brush);
-    virtual void fillRect(const QRectF &rect, const QBrush &brush);
-    virtual void fillRect(const QRectF &rect, const QColor &color);
-    virtual void drawRects(const QRect *rects, int rectCount);
-    virtual void drawRects(const QRectF *rects, int rectCount);
-    void drawPixmap(const QPointF &p, const QPixmap &pm);
-    void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr);
+    void fill(const QVectorPath &path, const QBrush &brush) Q_DECL_OVERRIDE;
+    void fillRect(const QRectF &rect, const QBrush &brush) Q_DECL_OVERRIDE;
+    void fillRect(const QRectF &rect, const QColor &color) Q_DECL_OVERRIDE;
+    void drawRects(const QRect *rects, int rectCount) Q_DECL_OVERRIDE;
+    void drawRects(const QRectF *rects, int rectCount) Q_DECL_OVERRIDE;
+    void drawPixmap(const QPointF &p, const QPixmap &pm) Q_DECL_OVERRIDE;
+    void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE;
 
     // State tracking
-    void setState(QPainterState *s);
-    virtual void clipEnabledChanged();
-    virtual void penChanged();
-    virtual void brushChanged();
-    virtual void opacityChanged();
-    virtual void compositionModeChanged();
-    virtual void renderHintsChanged();
-    virtual void transformChanged();
+    void setState(QPainterState *s) Q_DECL_OVERRIDE;
+    virtual void clipEnabledChanged() Q_DECL_OVERRIDE;
+    virtual void penChanged() Q_DECL_OVERRIDE;
+    virtual void brushChanged() Q_DECL_OVERRIDE;
+    virtual void opacityChanged() Q_DECL_OVERRIDE;
+    virtual void compositionModeChanged() Q_DECL_OVERRIDE;
+    virtual void renderHintsChanged() Q_DECL_OVERRIDE;
+    virtual void transformChanged() Q_DECL_OVERRIDE;
 
     // Override to lock the QBlittable before using raster
-    void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode);
-    void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode);
-    void fillPath(const QPainterPath &path, QSpanData *fillData);
-    void fillPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode);
-    void drawEllipse(const QRectF &rect);
-    void drawImage(const QPointF &p, const QImage &img);
+    void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE;
+    void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE;
+    void fillPath(const QPainterPath &path, QSpanData *fillData) Q_DECL_OVERRIDE;
+    void fillPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE;
+    void drawEllipse(const QRectF &rect) Q_DECL_OVERRIDE;
+    void drawImage(const QPointF &p, const QImage &img) Q_DECL_OVERRIDE;
     void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr,
-                   Qt::ImageConversionFlags flags = Qt::AutoColor);
-    void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &sr);
-    void drawTextItem(const QPointF &p, const QTextItem &textItem);
-    void drawPoints(const QPointF *points, int pointCount);
-    void drawPoints(const QPoint *points, int pointCount);
-    void stroke(const QVectorPath &path, const QPen &pen);
-    void drawStaticTextItem(QStaticTextItem *);
-    bool drawCachedGlyphs(int numGlyphs, const glyph_t *glyphs, const QFixedPoint *positions, QFontEngine *fontEngine);
+                   Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE;
+    void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &sr) Q_DECL_OVERRIDE;
+    void drawTextItem(const QPointF &p, const QTextItem &textItem) Q_DECL_OVERRIDE;
+    void drawPoints(const QPointF *points, int pointCount) Q_DECL_OVERRIDE;
+    void drawPoints(const QPoint *points, int pointCount) Q_DECL_OVERRIDE;
+    void stroke(const QVectorPath &path, const QPen &pen) Q_DECL_OVERRIDE;
+    void drawStaticTextItem(QStaticTextItem *) Q_DECL_OVERRIDE;
+    bool drawCachedGlyphs(int numGlyphs, const glyph_t *glyphs, const QFixedPoint *positions,
+                          QFontEngine *fontEngine) Q_DECL_OVERRIDE;
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h
index 918c98997b..c14f085721 100644
--- a/src/gui/painting/qpaintengine_p.h
+++ b/src/gui/painting/qpaintengine_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 83370be33f..df96a993e3 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -1157,7 +1163,7 @@ void QRasterPaintEngine::clip(const QVectorPath &path, Qt::ClipOperation op)
         if (s->matrix.type() <= QTransform::TxScale
             && path.isRect()) {
 #ifdef QT_DEBUG_DRAW
-            qDebug() << " --- optimizing vector clip to rect clip...";
+            qDebug(" --- optimizing vector clip to rect clip...");
 #endif
             const qreal *points = path.points();
             QRectF r(points[0], points[1], points[4]-points[0], points[5]-points[1]);
@@ -1687,8 +1693,12 @@ void QRasterPaintEngine::fill(const QVectorPath &path, const QBrush &brush)
 
     // ### Optimize for non transformed ellipses and rectangles...
     QRectF cpRect = path.controlPointRect();
-    const QRect deviceRect = s->matrix.mapRect(cpRect).toRect();
-    ProcessSpans blend = d->getBrushFunc(deviceRect, &s->brushData);
+    const QRect pathDeviceRect = s->matrix.mapRect(cpRect).toRect();
+    // Skip paths that by conservative estimates are completely outside the paint device.
+    if (!pathDeviceRect.intersects(d->deviceRect))
+        return;
+
+    ProcessSpans blend = d->getBrushFunc(pathDeviceRect, &s->brushData);
 
         // ### Falcon
 //         const bool do_clip = (deviceRect.left() < -QT_RASTER_COORD_LIMIT
diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h
index 4e6e0b2f73..1afb119535 100644
--- a/src/gui/painting/qpaintengine_raster_p.h
+++ b/src/gui/painting/qpaintengine_raster_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -128,20 +134,20 @@ public:
 
     QRasterPaintEngine(QPaintDevice *device);
     ~QRasterPaintEngine();
-    bool begin(QPaintDevice *device);
-    bool end();
-
-    void penChanged();
-    void brushChanged();
-    void brushOriginChanged();
-    void opacityChanged();
-    void compositionModeChanged();
-    void renderHintsChanged();
-    void transformChanged();
-    void clipEnabledChanged();
-
-    void setState(QPainterState *s);
-    QPainterState *createState(QPainterState *orig) const;
+    bool begin(QPaintDevice *device) Q_DECL_OVERRIDE;
+    bool end() Q_DECL_OVERRIDE;
+
+    void penChanged() Q_DECL_OVERRIDE;
+    void brushChanged() Q_DECL_OVERRIDE;
+    void brushOriginChanged() Q_DECL_OVERRIDE;
+    void opacityChanged() Q_DECL_OVERRIDE;
+    void compositionModeChanged() Q_DECL_OVERRIDE;
+    void renderHintsChanged() Q_DECL_OVERRIDE;
+    void transformChanged() Q_DECL_OVERRIDE;
+    void clipEnabledChanged() Q_DECL_OVERRIDE;
+
+    void setState(QPainterState *s) Q_DECL_OVERRIDE;
+    QPainterState *createState(QPainterState *orig) const Q_DECL_OVERRIDE;
     inline QRasterPaintEngineState *state() {
         return static_cast<QRasterPaintEngineState *>(QPaintEngineEx::state());
     }
@@ -154,42 +160,43 @@ public:
 
     void updateMatrix(const QTransform &matrix);
 
-    void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode);
-    void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode);
-    void fillPath(const QPainterPath &path, QSpanData *fillData);
-    void fillPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode);
+    virtual void fillPath(const QPainterPath &path, QSpanData *fillData);
+    virtual void fillPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode);
 
-    void drawEllipse(const QRectF &rect);
+    void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE;
+    void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE;
 
-    void fillRect(const QRectF &rect, const QBrush &brush);
-    void fillRect(const QRectF &rect, const QColor &color);
+    void drawEllipse(const QRectF &rect) Q_DECL_OVERRIDE;
 
-    void drawRects(const QRect  *rects, int rectCount);
-    void drawRects(const QRectF *rects, int rectCount);
+    void fillRect(const QRectF &rect, const QBrush &brush) Q_DECL_OVERRIDE;
+    void fillRect(const QRectF &rect, const QColor &color) Q_DECL_OVERRIDE;
 
-    void drawPixmap(const QPointF &p, const QPixmap &pm);
-    void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr);
-    void drawImage(const QPointF &p, const QImage &img);
+    void drawRects(const QRect  *rects, int rectCount) Q_DECL_OVERRIDE;
+    void drawRects(const QRectF *rects, int rectCount) Q_DECL_OVERRIDE;
+
+    void drawPixmap(const QPointF &p, const QPixmap &pm) Q_DECL_OVERRIDE;
+    void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE;
+    void drawImage(const QPointF &p, const QImage &img) Q_DECL_OVERRIDE;
     void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr,
-                   Qt::ImageConversionFlags flags = Qt::AutoColor);
-    void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &sr);
-    void drawTextItem(const QPointF &p, const QTextItem &textItem);
+                   Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE;
+    void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &sr) Q_DECL_OVERRIDE;
+    void drawTextItem(const QPointF &p, const QTextItem &textItem) Q_DECL_OVERRIDE;
 
-    void drawLines(const QLine *line, int lineCount);
-    void drawLines(const QLineF *line, int lineCount);
+    void drawLines(const QLine *line, int lineCount) Q_DECL_OVERRIDE;
+    void drawLines(const QLineF *line, int lineCount) Q_DECL_OVERRIDE;
 
-    void drawPoints(const QPointF *points, int pointCount);
-    void drawPoints(const QPoint *points, int pointCount);
+    void drawPoints(const QPointF *points, int pointCount) Q_DECL_OVERRIDE;
+    void drawPoints(const QPoint *points, int pointCount) Q_DECL_OVERRIDE;
 
-    void stroke(const QVectorPath &path, const QPen &pen);
-    void fill(const QVectorPath &path, const QBrush &brush);
+    void stroke(const QVectorPath &path, const QPen &pen) Q_DECL_OVERRIDE;
+    void fill(const QVectorPath &path, const QBrush &brush) Q_DECL_OVERRIDE;
 
-    void clip(const QVectorPath &path, Qt::ClipOperation op);
-    void clip(const QRect &rect, Qt::ClipOperation op);
-    void clip(const QRegion &region, Qt::ClipOperation op);
+    void clip(const QVectorPath &path, Qt::ClipOperation op) Q_DECL_OVERRIDE;
+    void clip(const QRect &rect, Qt::ClipOperation op) Q_DECL_OVERRIDE;
+    void clip(const QRegion &region, Qt::ClipOperation op) Q_DECL_OVERRIDE;
     inline const QClipData *clipData() const;
 
-    void drawStaticTextItem(QStaticTextItem *textItem);
+    void drawStaticTextItem(QStaticTextItem *textItem) Q_DECL_OVERRIDE;
     virtual bool drawCachedGlyphs(int numGlyphs, const glyph_t *glyphs, const QFixedPoint *positions,
                                   QFontEngine *fontEngine);
 
@@ -219,12 +226,12 @@ public:
     QRasterBuffer *rasterBuffer();
     void alphaPenBlt(const void* src, int bpl, int depth, int rx,int ry,int w,int h);
 
-    Type type() const { return Raster; }
+    Type type() const Q_DECL_OVERRIDE { return Raster; }
 
-    QPoint coordinateOffset() const;
+    QPoint coordinateOffset() const Q_DECL_OVERRIDE;
 
-    bool requiresPretransformedGlyphPositions(QFontEngine *fontEngine, const QTransform &m) const;
-    bool shouldDrawCachedGlyphs(QFontEngine *fontEngine, const QTransform &m) const;
+    bool requiresPretransformedGlyphPositions(QFontEngine *fontEngine, const QTransform &m) const Q_DECL_OVERRIDE;
+    bool shouldDrawCachedGlyphs(QFontEngine *fontEngine, const QTransform &m) const Q_DECL_OVERRIDE;
 
 protected:
     QRasterPaintEngine(QRasterPaintEnginePrivate &d, QPaintDevice *);
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index f00bc8d9df..f3c9b92bae 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -176,12 +182,11 @@ void QPaintEngineExPrivate::replayClipOperations()
     if (!p || !p->d_ptr)
         return;
 
-    QList<QPainterClipInfo> clipInfo = p->d_ptr->state->clipInfo;
+    const QVector<QPainterClipInfo> &clipInfo = p->d_ptr->state->clipInfo;
 
     QTransform transform = q->state()->matrix;
 
-    for (int i = 0; i <  clipInfo.size(); ++i) {
-        const QPainterClipInfo &info = clipInfo.at(i);
+    for (const QPainterClipInfo &info : clipInfo) {
 
         if (info.matrix != q->state()->matrix) {
             q->state()->matrix = info.matrix;
@@ -227,9 +232,7 @@ bool QPaintEngineExPrivate::hasClipOperations() const
     if (!p || !p->d_ptr)
         return false;
 
-    QList<QPainterClipInfo> clipInfo = p->d_ptr->state->clipInfo;
-
-    return !clipInfo.isEmpty();
+    return !p->d_ptr->state->clipInfo.isEmpty();
 }
 
 /*******************************************************************************
diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h
index 29eea6032e..643c39c80f 100644
--- a/src/gui/painting/qpaintengineex_p.h
+++ b/src/gui/painting/qpaintengineex_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 51c0f3e22a..2c5e0672b1 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -397,8 +403,7 @@ void QPainterPrivate::draw_helper(const QPainterPath &originalPath, DrawOperatio
 
     if (q->hasClipping()) {
         bool hasPerspectiveTransform = false;
-        for (int i = 0; i < state->clipInfo.size(); ++i) {
-            const QPainterClipInfo &info = state->clipInfo.at(i);
+        for (const QPainterClipInfo &info : qAsConst(state->clipInfo)) {
             if (info.matrix.type() == QTransform::TxProject) {
                 hasPerspectiveTransform = true;
                 break;
@@ -1629,8 +1634,7 @@ void QPainter::restore()
         tmp->clipPath = QPainterPath();
         d->engine->updateState(*tmp);
         // replay the list of clip states,
-        for (int i=0; i<d->state->clipInfo.size(); ++i) {
-            const QPainterClipInfo &info = d->state->clipInfo.at(i);
+        for (const QPainterClipInfo &info : qAsConst(d->state->clipInfo)) {
             tmp->matrix = info.matrix;
             tmp->matrix *= d->state->redirectionMatrix;
             tmp->clipOperation = info.operation;
@@ -2464,7 +2468,7 @@ void QPainter::setClipping(bool enable)
 
     // we can't enable clipping if we don't have a clip
     if (enable
-        && (d->state->clipInfo.isEmpty() || d->state->clipInfo.last().operation == Qt::NoClip))
+        && (d->state->clipInfo.isEmpty() || d->state->clipInfo.constLast().operation == Qt::NoClip))
         return;
     d->state->clipEnabled = enable;
 
@@ -2505,8 +2509,7 @@ QRegion QPainter::clipRegion() const
         const_cast<QPainter *>(this)->d_ptr->updateInvMatrix();
 
     // ### Falcon: Use QPainterPath
-    for (int i=0; i<d->state->clipInfo.size(); ++i) {
-        const QPainterClipInfo &info = d->state->clipInfo.at(i);
+    for (const QPainterClipInfo &info : qAsConst(d->state->clipInfo)) {
         switch (info.clipType) {
 
         case QPainterClipInfo::RegionClip: {
@@ -2620,7 +2623,7 @@ QPainterPath QPainter::clipPath() const
     }
 
     // No clip, return empty
-    if (d->state->clipInfo.size() == 0) {
+    if (d->state->clipInfo.isEmpty()) {
         return QPainterPath();
     } else {
 
@@ -2672,9 +2675,9 @@ QRectF QPainter::clipBoundingRect() const
     // precise, but it fits within the guarantee and it is reasonably
     // fast.
     QRectF bounds;
-    for (int i=0; i<d->state->clipInfo.size(); ++i) {
+    bool first = true;
+    for (const QPainterClipInfo &info : qAsConst(d->state->clipInfo)) {
          QRectF r;
-         const QPainterClipInfo &info = d->state->clipInfo.at(i);
 
          if (info.clipType == QPainterClipInfo::RectClip)
              r = info.rect;
@@ -2687,10 +2690,11 @@ QRectF QPainter::clipBoundingRect() const
 
          r = info.matrix.mapRect(r);
 
-         if (i == 0)
+         if (first)
              bounds = r;
          else if (info.operation == Qt::IntersectClip)
              bounds &= r;
+         first = false;
     }
 
 
@@ -2738,7 +2742,7 @@ void QPainter::setClipRect(const QRectF &rect, Qt::ClipOperation op)
         d->extended->clip(vp, op);
         if (op == Qt::ReplaceClip || op == Qt::NoClip)
             d->state->clipInfo.clear();
-        d->state->clipInfo << QPainterClipInfo(rect, op, d->state->matrix);
+        d->state->clipInfo.append(QPainterClipInfo(rect, op, d->state->matrix));
         d->state->clipOperation = op;
         return;
     }
@@ -2787,7 +2791,7 @@ void QPainter::setClipRect(const QRect &rect, Qt::ClipOperation op)
         d->extended->clip(rect, op);
         if (op == Qt::ReplaceClip || op == Qt::NoClip)
             d->state->clipInfo.clear();
-        d->state->clipInfo << QPainterClipInfo(rect, op, d->state->matrix);
+        d->state->clipInfo.append(QPainterClipInfo(rect, op, d->state->matrix));
         d->state->clipOperation = op;
         return;
     }
@@ -2799,7 +2803,7 @@ void QPainter::setClipRect(const QRect &rect, Qt::ClipOperation op)
     d->state->clipOperation = op;
     if (op == Qt::NoClip || op == Qt::ReplaceClip)
         d->state->clipInfo.clear();
-    d->state->clipInfo << QPainterClipInfo(rect, op, d->state->matrix);
+    d->state->clipInfo.append(QPainterClipInfo(rect, op, d->state->matrix));
     d->state->clipEnabled = true;
     d->state->dirtyFlags |= QPaintEngine::DirtyClipRegion | QPaintEngine::DirtyClipEnabled;
     d->updateState(d->state);
@@ -2846,7 +2850,7 @@ void QPainter::setClipRegion(const QRegion &r, Qt::ClipOperation op)
         d->extended->clip(r, op);
         if (op == Qt::NoClip || op == Qt::ReplaceClip)
             d->state->clipInfo.clear();
-        d->state->clipInfo << QPainterClipInfo(r, op, d->state->matrix);
+        d->state->clipInfo.append(QPainterClipInfo(r, op, d->state->matrix));
         d->state->clipOperation = op;
         return;
     }
@@ -2858,7 +2862,7 @@ void QPainter::setClipRegion(const QRegion &r, Qt::ClipOperation op)
     d->state->clipOperation = op;
     if (op == Qt::NoClip || op == Qt::ReplaceClip)
         d->state->clipInfo.clear();
-    d->state->clipInfo << QPainterClipInfo(r, op, d->state->matrix);
+    d->state->clipInfo.append(QPainterClipInfo(r, op, d->state->matrix));
     d->state->clipEnabled = true;
     d->state->dirtyFlags |= QPaintEngine::DirtyClipRegion | QPaintEngine::DirtyClipEnabled;
     d->updateState(d->state);
@@ -3250,7 +3254,7 @@ void QPainter::setClipPath(const QPainterPath &path, Qt::ClipOperation op)
         d->extended->clip(path, op);
         if (op == Qt::NoClip || op == Qt::ReplaceClip)
             d->state->clipInfo.clear();
-        d->state->clipInfo << QPainterClipInfo(path, op, d->state->matrix);
+        d->state->clipInfo.append(QPainterClipInfo(path, op, d->state->matrix));
         d->state->clipOperation = op;
         return;
     }
@@ -3262,7 +3266,7 @@ void QPainter::setClipPath(const QPainterPath &path, Qt::ClipOperation op)
     d->state->clipOperation = op;
     if (op == Qt::NoClip || op == Qt::ReplaceClip)
         d->state->clipInfo.clear();
-    d->state->clipInfo << QPainterClipInfo(path, op, d->state->matrix);
+    d->state->clipInfo.append(QPainterClipInfo(path, op, d->state->matrix));
     d->state->clipEnabled = true;
     d->state->dirtyFlags |= QPaintEngine::DirtyClipPath | QPaintEngine::DirtyClipEnabled;
     d->updateState(d->state);
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index 8e2d17d3a5..5743d97405 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -480,6 +486,7 @@ private:
     friend class QPreviewPaintEngine;
     friend class QTextEngine;
 };
+Q_DECLARE_TYPEINFO(QPainter::PixmapFragment, Q_RELOCATABLE_TYPE);
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QPainter::RenderHints)
 
diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h
index e8b675365f..23ab5db7b4 100644
--- a/src/gui/painting/qpainter_p.h
+++ b/src/gui/painting/qpainter_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -91,6 +97,7 @@ inline bool qbrush_has_transform(const QBrush &b) { return data_ptr(b)->transfor
 class QPainterClipInfo
 {
 public:
+    QPainterClipInfo() {} // for QVector, don't use
     enum ClipType { RegionClip, PathClip, RectClip, RectFClip };
 
     QPainterClipInfo(const QPainterPath &p, Qt::ClipOperation op, const QTransform &m) :
@@ -128,6 +135,7 @@ public:
 
 };
 
+Q_DECLARE_TYPEINFO(QPainterClipInfo, Q_MOVABLE_TYPE);
 
 class Q_GUI_EXPORT QPainterState : public QPaintEngineState
 {
@@ -147,7 +155,7 @@ public:
     QPainterPath clipPath;
     Qt::ClipOperation clipOperation;
     QPainter::RenderHints renderHints;
-    QList<QPainterClipInfo> clipInfo; // ### Make me smaller and faster to copy around...
+    QVector<QPainterClipInfo> clipInfo; // ### Make me smaller and faster to copy around...
     QTransform worldMatrix;       // World transformation matrix, not window and viewport
     QTransform matrix;            // Complete transformation matrix,
     QTransform redirectionMatrix;
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index 48010c0a71..5b91266b64 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -684,7 +690,7 @@ void QPainterPath::moveTo(const QPointF &p)
 
     d->require_moveTo = false;
 
-    if (d->elements.last().type == MoveToElement) {
+    if (d->elements.constLast().type == MoveToElement) {
         d->elements.last().x = p.x();
         d->elements.last().y = p.y();
     } else {
@@ -732,7 +738,7 @@ void QPainterPath::lineTo(const QPointF &p)
     QPainterPathData *d = d_func();
     Q_ASSERT(!d->elements.isEmpty());
     d->maybeMoveTo();
-    if (p == QPointF(d->elements.last()))
+    if (p == QPointF(d->elements.constLast()))
         return;
     Element elm = { p.x(), p.y(), LineToElement };
     d->elements.append(elm);
@@ -795,7 +801,7 @@ void QPainterPath::cubicTo(const QPointF &c1, const QPointF &c2, const QPointF &
 
     // Abort on empty curve as a stroker cannot handle this and the
     // curve is irrelevant anyway.
-    if (d->elements.last() == c1 && c1 == c2 && c2 == e)
+    if (d->elements.constLast() == c1 && c1 == c2 && c2 == e)
         return;
 
     d->maybeMoveTo();
@@ -978,7 +984,7 @@ QPointF QPainterPath::currentPosition() const
 {
     return !d_ptr || d_func()->elements.isEmpty()
         ? QPointF()
-        : QPointF(d_func()->elements.last().x, d_func()->elements.last().y);
+        : QPointF(d_func()->elements.constLast().x, d_func()->elements.constLast().y);
 }
 
 
@@ -1067,7 +1073,7 @@ void QPainterPath::addPolygon(const QPolygonF &polygon)
 
     d_func()->elements.reserve(d_func()->elements.size() + polygon.size());
 
-    moveTo(polygon.first());
+    moveTo(polygon.constFirst());
     for (int i=1; i<polygon.size(); ++i) {
         Element elm = { polygon.at(i).x(), polygon.at(i).y(), LineToElement };
         d_func()->elements << elm;
@@ -1172,12 +1178,12 @@ void QPainterPath::addText(const QPointF &point, const QFont &f, const QString &
     QVarLengthArray<int> visualOrder(nItems);
     QVarLengthArray<uchar> levels(nItems);
     for (int i = 0; i < nItems; ++i)
-        levels[i] = eng->layoutData->items[i].analysis.bidiLevel;
+        levels[i] = eng->layoutData->items.at(i).analysis.bidiLevel;
     QTextEngine::bidiReorder(nItems, levels.data(), visualOrder.data());
 
     for (int i = 0; i < nItems; ++i) {
         int item = visualOrder[i];
-        QScriptItem &si = eng->layoutData->items[item];
+        const QScriptItem &si = eng->layoutData->items.at(item);
 
         if (si.analysis.flags < QScriptAnalysis::TabOrObject) {
             QGlyphLayout glyphs = eng->shapedGlyphs(&si);
@@ -1224,7 +1230,7 @@ void QPainterPath::addPath(const QPainterPath &other)
 
     QPainterPathData *d = reinterpret_cast<QPainterPathData *>(d_func());
     // Remove last moveto so we don't get multiple moveto's
-    if (d->elements.last().type == MoveToElement)
+    if (d->elements.constLast().type == MoveToElement)
         d->elements.remove(d->elements.size()-1);
 
     // Locate where our own current subpath will start after the other path is added.
@@ -1255,7 +1261,7 @@ void QPainterPath::connectPath(const QPainterPath &other)
 
     QPainterPathData *d = reinterpret_cast<QPainterPathData *>(d_func());
     // Remove last moveto so we don't get multiple moveto's
-    if (d->elements.last().type == MoveToElement)
+    if (d->elements.constLast().type == MoveToElement)
         d->elements.remove(d->elements.size()-1);
 
     // Locate where our own current subpath will start after the other path is added.
@@ -1267,7 +1273,7 @@ void QPainterPath::connectPath(const QPainterPath &other)
         d->elements[first].type = LineToElement;
 
     // avoid duplicate points
-    if (first > 0 && QPointF(d->elements[first]) == QPointF(d->elements[first - 1])) {
+    if (first > 0 && QPointF(d->elements.at(first)) == QPointF(d->elements.at(first - 1))) {
         d->elements.remove(first--);
         --cStart;
     }
@@ -1647,7 +1653,7 @@ QList<QPolygonF> QPainterPath::toFillPolygons(const QTransform &matrix) const
         qDebug() << " bounds" << i << bounds.at(i);
 #endif
 
-    QVector< QList<int> > isects;
+    QVector< QVector<int> > isects;
     isects.resize(count);
 
     // find all intersections
@@ -1675,13 +1681,14 @@ QList<QPolygonF> QPainterPath::toFillPolygons(const QTransform &matrix) const
 
     // flatten the sets of intersections
     for (int i=0; i<count; ++i) {
-        const QList<int> &current_isects = isects.at(i);
+        const QVector<int> &current_isects = isects.at(i);
         for (int j=0; j<current_isects.size(); ++j) {
             int isect_j = current_isects.at(j);
             if (isect_j == i)
                 continue;
-            for (int k=0; k<isects[isect_j].size(); ++k) {
-                int isect_k = isects[isect_j][k];
+            const QVector<int> &isects_j = isects.at(isect_j);
+            for (int k = 0, size = isects_j.size(); k < size; ++k) {
+                int isect_k = isects_j.at(k);
                 if (isect_k != i && !isects.at(i).contains(isect_k)) {
                     isects[i] += isect_k;
                 }
@@ -1703,7 +1710,7 @@ QList<QPolygonF> QPainterPath::toFillPolygons(const QTransform &matrix) const
 
     // Join the intersected subpaths as rewinded polygons
     for (int i=0; i<count; ++i) {
-        const QList<int> &subpath_list = isects[i];
+        const QVector<int> &subpath_list = isects.at(i);
         if (!subpath_list.isEmpty()) {
             QPolygonF buildUp;
             for (int j=0; j<subpath_list.size(); ++j) {
@@ -1712,7 +1719,7 @@ QList<QPolygonF> QPainterPath::toFillPolygons(const QTransform &matrix) const
                 if (!subpath.isClosed())
                     buildUp += subpath.first();
                 if (!buildUp.isClosed())
-                    buildUp += buildUp.first();
+                    buildUp += buildUp.constFirst();
             }
             polys += buildUp;
         }
@@ -1856,6 +1863,8 @@ bool QPainterPath::contains(const QPointF &pt) const
             : ((winding_number % 2) != 0));
 }
 
+enum PainterDirections { Left, Right, Top, Bottom };
+
 static bool qt_painterpath_isect_line_rect(qreal x1, qreal y1, qreal x2, qreal y2,
                                            const QRectF &rect)
 {
@@ -1864,7 +1873,6 @@ static bool qt_painterpath_isect_line_rect(qreal x1, qreal y1, qreal x2, qreal y
     qreal top = rect.top();
     qreal bottom = rect.bottom();
 
-    enum { Left, Right, Top, Bottom };
     // clip the lines, after cohen-sutherland, see e.g. http://www.nondot.org/~sabre/graphpro/line6.html
     int p1 = ((x1 < left) << Left)
              | ((x1 > right) << Right)
@@ -2783,7 +2791,7 @@ void QPainterPathStroker::setDashOffset(qreal offset)
 QPolygonF QPainterPath::toFillPolygon(const QTransform &matrix) const
 {
 
-    QList<QPolygonF> flats = toSubpathPolygons(matrix);
+    const QList<QPolygonF> flats = toSubpathPolygons(matrix);
     QPolygonF polygon;
     if (flats.isEmpty())
         return polygon;
diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h
index 4a7bd98234..882918fc87 100644
--- a/src/gui/painting/qpainterpath.h
+++ b/src/gui/painting/qpainterpath.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -224,6 +230,7 @@ private:
 #endif
 };
 
+Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QPainterPath)
 Q_DECLARE_TYPEINFO(QPainterPath::Element, Q_PRIMITIVE_TYPE);
 
 #ifndef QT_NO_DATASTREAM
diff --git a/src/gui/painting/qpainterpath_p.h b/src/gui/painting/qpainterpath_p.h
index c841a0cf4c..e90cdb0f43 100644
--- a/src/gui/painting/qpainterpath_p.h
+++ b/src/gui/painting/qpainterpath_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp
index a5557c99ff..4f2b59c775 100644
--- a/src/gui/painting/qpathclipper.cpp
+++ b/src/gui/painting/qpathclipper.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -1642,7 +1648,7 @@ bool QPathClipper::doClip(QWingedEdge &list, ClipperMode mode)
 #ifdef QDEBUG_CLIPPER
     printf("sorted y coords:\n");
     for (int i = 0; i < y_coords.size(); ++i) {
-        printf("%.9f\n", y_coords[i]);
+        printf("%.9f\n", y_coords.at(i));
     }
 #endif
 
@@ -1680,23 +1686,23 @@ bool QPathClipper::doClip(QWingedEdge &list, ClipperMode mode)
             QPathVertex *b = list.vertex(edge->second);
 
             // FIXME: this can be optimized by using binary search
-            const int first = qFuzzyFind(y_coords.begin(), y_coords.end(), qMin(a->y, b->y)) - y_coords.begin();
-            const int last = qFuzzyFind(y_coords.begin() + first, y_coords.end(), qMax(a->y, b->y)) - y_coords.begin();
+            const int first = qFuzzyFind(y_coords.cbegin(), y_coords.cend(), qMin(a->y, b->y)) - y_coords.cbegin();
+            const int last = qFuzzyFind(y_coords.cbegin() + first, y_coords.cend(), qMax(a->y, b->y)) - y_coords.cbegin();
 
             Q_ASSERT(first < y_coords.size() - 1);
             Q_ASSERT(last < y_coords.size());
 
-            qreal bestY = 0.5 * (y_coords[first] + y_coords[first+1]);
-            qreal biggestGap = y_coords[first+1] - y_coords[first];
-
+            qreal biggestGap = y_coords.at(first + 1) - y_coords.at(first);
+            int bestIdx = first;
             for (int i = first + 1; i < last; ++i) {
-                qreal gap = y_coords[i+1] - y_coords[i];
+                qreal gap = y_coords.at(i + 1) - y_coords.at(i);
 
                 if (gap > biggestGap) {
-                    bestY = 0.5 * (y_coords[i] + y_coords[i+1]);
+                    bestIdx = i;
                     biggestGap = gap;
                 }
             }
+            const qreal bestY = 0.5 * (y_coords.at(bestIdx) + y_coords.at(bestIdx + 1));
 
 #ifdef QDEBUG_CLIPPER
             printf("y: %.9f, gap: %.9f\n", bestY, biggestGap);
@@ -1747,6 +1753,7 @@ struct QCrossingEdge
         return x < edge.x;
     }
 };
+Q_DECLARE_TYPEINFO(QCrossingEdge, Q_PRIMITIVE_TYPE);
 
 static bool bool_op(bool a, bool b, QPathClipper::Operation op)
 {
diff --git a/src/gui/painting/qpathclipper_p.h b/src/gui/painting/qpathclipper_p.h
index d1caea4a1a..fe3ce84e4a 100644
--- a/src/gui/painting/qpathclipper_p.h
+++ b/src/gui/painting/qpathclipper_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -336,7 +342,8 @@ inline QPathVertex::operator QPointF() const
 inline QPathSegments::QPathSegments(int reserve) :
     m_points(reserve),
     m_segments(reserve),
-    m_intersections(reserve)
+    m_intersections(reserve),
+    m_pathId(0)
 {
 }
 
diff --git a/src/gui/painting/qpathsimplifier.cpp b/src/gui/painting/qpathsimplifier.cpp
index 974b68d3a8..40585ec502 100644
--- a/src/gui/painting/qpathsimplifier.cpp
+++ b/src/gui/painting/qpathsimplifier.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpathsimplifier_p.h b/src/gui/painting/qpathsimplifier_p.h
index 7befd5b5fd..47b1c3c623 100644
--- a/src/gui/painting/qpathsimplifier_p.h
+++ b/src/gui/painting/qpathsimplifier_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
index 77304fb87b..13dc7f7dd9 100644
--- a/src/gui/painting/qpdf.cpp
+++ b/src/gui/painting/qpdf.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -1669,7 +1675,7 @@ void QPdfEnginePrivate::writePage()
     uint resources = requestObject();
     uint annots = requestObject();
 
-    addXrefEntry(pages.last());
+    addXrefEntry(pages.constLast());
     xprintf("<<\n"
             "/Type /Page\n"
             "/Parent %d 0 R\n"
@@ -1762,7 +1768,7 @@ void QPdfEnginePrivate::writeTail()
             ">>\n"
             "startxref\n%d\n"
             "%%%%EOF\n",
-            xrefPositions.size()-1, info, catalog, xrefPositions.last());
+            xrefPositions.size()-1, info, catalog, xrefPositions.constLast());
 }
 
 int QPdfEnginePrivate::addXrefEntry(int object, bool printostr)
@@ -1951,7 +1957,7 @@ int QPdfEnginePrivate::writeImage(const QByteArray &data, int width, int height,
         xprintf("/Interpolate true\n");
     int len = 0;
     if (dct) {
-        //qDebug() << "DCT";
+        //qDebug("DCT");
         xprintf("/Filter /DCTDecode\n>>\nstream\n");
         write(data);
         len = data.length();
@@ -1976,6 +1982,7 @@ struct QGradientBound {
     int function;
     bool reverse;
 };
+Q_DECLARE_TYPEINFO(QGradientBound, Q_PRIMITIVE_TYPE);
 
 int QPdfEnginePrivate::createShadingFunction(const QGradient *gradient, int from, int to, bool reflect, bool alpha)
 {
@@ -2213,8 +2220,10 @@ int QPdfEnginePrivate::generateGradientShader(const QGradient *gradient, const Q
     case QGradient::RadialGradient:
         return generateRadialGradientShader(static_cast<const QRadialGradient *>(gradient), matrix, alpha);
     case QGradient::ConicalGradient:
-    default:
-        qWarning() << "Implement me!";
+        Q_UNIMPLEMENTED(); // ### Implement me!
+        break;
+    case QGradient::NoGradient:
+        break;
     }
     return 0;
 }
diff --git a/src/gui/painting/qpdf_p.h b/src/gui/painting/qpdf_p.h
index ab7a218d89..9f782b019c 100644
--- a/src/gui/painting/qpdf_p.h
+++ b/src/gui/painting/qpdf_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpdfwriter.cpp b/src/gui/painting/qpdfwriter.cpp
index a8c1d8297c..edf2950a67 100644
--- a/src/gui/painting/qpdfwriter.cpp
+++ b/src/gui/painting/qpdfwriter.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpdfwriter.h b/src/gui/painting/qpdfwriter.h
index 4367d595bf..cf1da95bf1 100644
--- a/src/gui/painting/qpdfwriter.h
+++ b/src/gui/painting/qpdfwriter.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp
index 073d254b49..778c770b82 100644
--- a/src/gui/painting/qpen.cpp
+++ b/src/gui/painting/qpen.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpen.h b/src/gui/painting/qpen.h
index bfa1553c68..7469931a48 100644
--- a/src/gui/painting/qpen.h
+++ b/src/gui/painting/qpen.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpen_p.h b/src/gui/painting/qpen_p.h
index 7e4586af06..2098be5a53 100644
--- a/src/gui/painting/qpen_p.h
+++ b/src/gui/painting/qpen_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qplatformbackingstore.cpp b/src/gui/painting/qplatformbackingstore.cpp
index defdcfb4ad..35cf1dae86 100644
--- a/src/gui/painting/qplatformbackingstore.cpp
+++ b/src/gui/painting/qplatformbackingstore.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -247,7 +253,7 @@ static QRegion deviceRegion(const QRegion &region, QWindow *window, const QPoint
     QVector<QRect> rects;
     const QVector<QRect> regionRects = region.rects();
     rects.reserve(regionRects.count());
-    foreach (const QRect &rect, regionRects)
+    for (const QRect &rect : regionRects)
         rects.append(deviceRect(rect.translated(offset), window));
 
     QRegion deviceRegion;
diff --git a/src/gui/painting/qplatformbackingstore.h b/src/gui/painting/qplatformbackingstore.h
index 9c8da0d1db..9b09620cce 100644
--- a/src/gui/painting/qplatformbackingstore.h
+++ b/src/gui/painting/qplatformbackingstore.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpolygon.cpp b/src/gui/painting/qpolygon.cpp
index efcc8875a5..d2203595c8 100644
--- a/src/gui/painting/qpolygon.cpp
+++ b/src/gui/painting/qpolygon.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qpolygon.h b/src/gui/painting/qpolygon.h
index 1e503c03b7..23bdd1933f 100644
--- a/src/gui/painting/qpolygon.h
+++ b/src/gui/painting/qpolygon.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -92,6 +98,7 @@ public:
     QPolygon intersected(const QPolygon &r) const Q_REQUIRED_RESULT;
     QPolygon subtracted(const QPolygon &r) const Q_REQUIRED_RESULT;
 };
+Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QPolygon)
 
 inline QPolygon::QPolygon(int asize) : QVector<QPoint>(asize) {}
 
@@ -168,6 +175,7 @@ public:
     QPolygonF intersected(const QPolygonF &r) const Q_REQUIRED_RESULT;
     QPolygonF subtracted(const QPolygonF &r) const Q_REQUIRED_RESULT;
 };
+Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QPolygonF)
 
 inline QPolygonF::QPolygonF(int asize) : QVector<QPointF>(asize) {}
 
diff --git a/src/gui/painting/qpolygonclipper_p.h b/src/gui/painting/qpolygonclipper_p.h
index 082add6d85..c67a692b52 100644
--- a/src/gui/painting/qpolygonclipper_p.h
+++ b/src/gui/painting/qpolygonclipper_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qrasterdefs_p.h b/src/gui/painting/qrasterdefs_p.h
index fbfe0572af..bf57a84c24 100644
--- a/src/gui/painting/qrasterdefs_p.h
+++ b/src/gui/painting/qrasterdefs_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qrasterizer.cpp b/src/gui/painting/qrasterizer.cpp
index 9411a20000..52501880e4 100644
--- a/src/gui/painting/qrasterizer.cpp
+++ b/src/gui/painting/qrasterizer.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qrasterizer_p.h b/src/gui/painting/qrasterizer_p.h
index 6f6dd994ab..a3e12c076d 100644
--- a/src/gui/painting/qrasterizer_p.h
+++ b/src/gui/painting/qrasterizer_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index 3c191b3c07..7571b5c3e8 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -83,7 +89,7 @@ QT_BEGIN_NAMESPACE
 
     \section1 Additional License Information
 
-    On Embedded Linux, Windows CE and X11 platforms, parts of this class rely on
+    On Embedded Linux and X11 platforms, parts of this class rely on
     code obtained under the following licenses:
 
     \legalese
@@ -204,6 +210,16 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
+    \fn QRegion::QRegion(QRegion &&other)
+    \since 5.7
+
+    Move-constructs a new region from region \a other.
+    After the call, \a other is null.
+
+    \sa isNull()
+*/
+
+/*!
     \fn QRegion::QRegion(const QBitmap &bm)
 
     Constructs a region from the bitmap \a bm.
@@ -1031,7 +1047,15 @@ void addSegmentsToPath(Segment *segment, QPainterPath &path)
     }
 }
 
-}
+} // unnamed namespace
+
+// the following is really a lie, because Segments cannot be relocated, as they
+// reference each other by address. For the same reason, they aren't even copyable,
+// but the code works with the compiler-generated (wrong) copy and move special
+// members, so use this as an optimization. The only container these are used in
+// (a QVarLengthArray in qt_regionToPath()) is resized once up-front, so doesn't
+// have a problem with this, but benefits from not having to run Segment ctors:
+Q_DECLARE_TYPEINFO(Segment, Q_PRIMITIVE_TYPE);
 
 Q_GUI_EXPORT QPainterPath qt_regionToPath(const QRegion &region)
 {
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index ab2404e887..d66f80fcde 100644
--- a/src/gui/painting/qregion.h
+++ b/src/gui/painting/qregion.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -62,6 +68,8 @@ public:
     QRegion(const QRect &r, RegionType t = Rectangle);
     QRegion(const QPolygon &pa, Qt::FillRule fillRule = Qt::OddEvenFill);
     QRegion(const QRegion &region);
+    QRegion(QRegion &&other) Q_DECL_NOTHROW
+        : d(other.d) { other.d = const_cast<QRegionData*>(&shared_empty); }
     QRegion(const QBitmap &bitmap);
     ~QRegion();
     QRegion &operator=(const QRegion &);
diff --git a/src/gui/painting/qrgb.h b/src/gui/painting/qrgb.h
index ca9fc03d14..6e666025ac 100644
--- a/src/gui/painting/qrgb.h
+++ b/src/gui/painting/qrgb.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qrgba64.h b/src/gui/painting/qrgba64.h
index 413315f12a..27e1e6e06d 100644
--- a/src/gui/painting/qrgba64.h
+++ b/src/gui/painting/qrgba64.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -44,7 +50,7 @@ class QRgba64 {
 
     // Make sure that the representation always has the order: red green blue alpha, independent
     // of byte order. This way, vector operations that assume 4 16-bit values see the correct ones.
-    enum {
+    enum Shifts {
 #if Q_BYTE_ORDER == Q_BIG_ENDIAN
         RedShift = 48,
         GreenShift = 32,
diff --git a/src/gui/painting/qrgba64.qdoc b/src/gui/painting/qrgba64.qdoc
index b786e91b03..064f018210 100644
--- a/src/gui/painting/qrgba64.qdoc
+++ b/src/gui/painting/qrgba64.qdoc
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
@@ -11,8 +11,8 @@
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
@@ -20,7 +20,7 @@
 ** Foundation and appearing in the file included in the packaging of
 ** this file. Please review the following information to ensure
 ** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
+** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/src/gui/painting/qrgba64_p.h b/src/gui/painting/qrgba64_p.h
index 724658ad94..cf3dad5f90 100644
--- a/src/gui/painting/qrgba64_p.h
+++ b/src/gui/painting/qrgba64_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp
index f6c899a815..c52792c2d3 100644
--- a/src/gui/painting/qstroker.cpp
+++ b/src/gui/painting/qstroker.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qstroker_p.h b/src/gui/painting/qstroker_p.h
index d3765bbd29..e17e68b237 100644
--- a/src/gui/painting/qstroker_p.h
+++ b/src/gui/painting/qstroker_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qt_mips_asm_dsp_p.h b/src/gui/painting/qt_mips_asm_dsp_p.h
index d1df7e018b..1393a35667 100644
--- a/src/gui/painting/qt_mips_asm_dsp_p.h
+++ b/src/gui/painting/qt_mips_asm_dsp_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
 ** Copyright (C) 2013 Imagination Technologies Limited, www.imgtec.com
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index 20039d902a..d2c3eceeef 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h
index 7dd8277a45..14271ccc65 100644
--- a/src/gui/painting/qtextureglyphcache_p.h
+++ b/src/gui/painting/qtextureglyphcache_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index a23aabe559..6058811176 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -47,6 +53,14 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_DEBUG
+Q_NEVER_INLINE
+static void nanWarning(const char *func)
+{
+    qWarning("QTransform::%s with NaN called", func);
+}
+#endif // QT_NO_DEBUG
+
 #define Q_NEAR_CLIP (sizeof(qreal) == sizeof(double) ? 0.000001 : 0.0001)
 
 #ifdef MAP
@@ -412,7 +426,7 @@ QTransform &QTransform::translate(qreal dx, qreal dy)
         return *this;
 #ifndef QT_NO_DEBUG
     if (qIsNaN(dx) | qIsNaN(dy)) {
-        qWarning() << "QTransform::translate with NaN called";
+        nanWarning("translate");
         return *this;
     }
 #endif
@@ -455,7 +469,7 @@ QTransform QTransform::fromTranslate(qreal dx, qreal dy)
 {
 #ifndef QT_NO_DEBUG
     if (qIsNaN(dx) | qIsNaN(dy)) {
-        qWarning() << "QTransform::fromTranslate with NaN called";
+        nanWarning("fromTranslate");
         return QTransform();
 }
 #endif
@@ -480,7 +494,7 @@ QTransform & QTransform::scale(qreal sx, qreal sy)
         return *this;
 #ifndef QT_NO_DEBUG
     if (qIsNaN(sx) | qIsNaN(sy)) {
-        qWarning() << "QTransform::scale with NaN called";
+        nanWarning("scale");
         return *this;
     }
 #endif
@@ -521,7 +535,7 @@ QTransform QTransform::fromScale(qreal sx, qreal sy)
 {
 #ifndef QT_NO_DEBUG
     if (qIsNaN(sx) | qIsNaN(sy)) {
-        qWarning() << "QTransform::fromScale with NaN called";
+        nanWarning("fromScale");
         return QTransform();
 }
 #endif
@@ -546,7 +560,7 @@ QTransform & QTransform::shear(qreal sh, qreal sv)
         return *this;
 #ifndef QT_NO_DEBUG
     if (qIsNaN(sh) | qIsNaN(sv)) {
-        qWarning() << "QTransform::shear with NaN called";
+        nanWarning("shear");
         return *this;
     }
 #endif
@@ -607,7 +621,7 @@ QTransform & QTransform::rotate(qreal a, Qt::Axis axis)
         return *this;
 #ifndef QT_NO_DEBUG
     if (qIsNaN(a)) {
-        qWarning() << "QTransform::rotate with NaN called";
+        nanWarning("rotate");
         return *this;
     }
 #endif
@@ -698,7 +712,7 @@ QTransform & QTransform::rotateRadians(qreal a, Qt::Axis axis)
 {
 #ifndef QT_NO_DEBUG
     if (qIsNaN(a)) {
-        qWarning() << "QTransform::rotateRadians with NaN called";
+        nanWarning("rotateRadians");
         return *this;
     }
 #endif
@@ -1005,10 +1019,11 @@ QTransform QTransform::operator*(const QTransform &m) const
     element of this matrix.
 */
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
     Assigns the given \a matrix's values to this matrix.
 */
-QTransform & QTransform::operator=(const QTransform &matrix)
+QTransform & QTransform::operator=(const QTransform &matrix) Q_DECL_NOTHROW
 {
     affine._m11 = matrix.affine._m11;
     affine._m12 = matrix.affine._m12;
@@ -1024,6 +1039,7 @@ QTransform & QTransform::operator=(const QTransform &matrix)
 
     return *this;
 }
+#endif
 
 /*!
     Resets the matrix to an identity matrix, i.e. all elements are set
diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h
index 8874996e19..470a5565e1 100644
--- a/src/gui/painting/qtransform.h
+++ b/src/gui/painting/qtransform.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -68,6 +74,19 @@ public:
                qreal h22, qreal dx, qreal dy);
     explicit QTransform(const QMatrix &mtx);
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    // ### Qt 6: remove; the compiler-generated ones are fine!
+    QTransform &operator=(QTransform &&other) Q_DECL_NOTHROW // = default
+    { memcpy(this, &other, sizeof(QTransform)); return *this; }
+    QTransform &operator=(const QTransform &) Q_DECL_NOTHROW; // = default
+    QTransform(QTransform &&other) Q_DECL_NOTHROW // = default
+        : affine(Qt::Uninitialized)
+    { memcpy(this, &other, sizeof(QTransform)); }
+    QTransform(const QTransform &other) Q_DECL_NOTHROW // = default
+        : affine(Qt::Uninitialized)
+    { memcpy(this, &other, sizeof(QTransform)); }
+#endif
+
     bool isAffine() const;
     bool isIdentity() const;
     bool isInvertible() const;
@@ -118,8 +137,6 @@ public:
     QTransform &operator*=(const QTransform &);
     QTransform operator*(const QTransform &o) const;
 
-    QTransform &operator=(const QTransform &);
-
     operator QVariant() const;
 
     void reset();
@@ -174,9 +191,10 @@ private:
 
     mutable uint m_type : 5;
     mutable uint m_dirty : 5;
-
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     class Private;
     Private *d;
+#endif
 };
 Q_DECLARE_TYPEINFO(QTransform, Q_MOVABLE_TYPE);
 
diff --git a/src/gui/painting/qvectorpath_p.h b/src/gui/painting/qvectorpath_p.h
index 44fb2e5647..01f7418930 100644
--- a/src/gui/painting/qvectorpath_p.h
+++ b/src/gui/painting/qvectorpath_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qabstracttextdocumentlayout.cpp b/src/gui/text/qabstracttextdocumentlayout.cpp
index 7735fd6b46..ff2497817e 100644
--- a/src/gui/text/qabstracttextdocumentlayout.cpp
+++ b/src/gui/text/qabstracttextdocumentlayout.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -447,8 +453,8 @@ void QAbstractTextDocumentLayout::unregisterHandler(int objectType, QObject *com
 {
     Q_D(QAbstractTextDocumentLayout);
 
-    HandlerHash::iterator it = d->handlers.find(objectType);
-    if (it != d->handlers.end() && (!component || component == it->component)) {
+    const auto it = d->handlers.constFind(objectType);
+    if (it != d->handlers.cend() && (!component || component == it->component)) {
         if (component)
             disconnect(component, SIGNAL(destroyed(QObject*)), this, SLOT(_q_handlerDestroyed(QObject*)));
         d->handlers.erase(it);
diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h
index cdcfed7535..01704fe37b 100644
--- a/src/gui/text/qabstracttextdocumentlayout.h
+++ b/src/gui/text/qabstracttextdocumentlayout.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -122,6 +128,8 @@ private:
     Q_PRIVATE_SLOT(d_func(), int _q_dynamicPageCountSlot())
     Q_PRIVATE_SLOT(d_func(), QSizeF _q_dynamicDocumentSizeSlot())
 };
+Q_DECLARE_TYPEINFO(QAbstractTextDocumentLayout::Selection,    Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QAbstractTextDocumentLayout::PaintContext, Q_RELOCATABLE_TYPE);
 
 class Q_GUI_EXPORT QTextObjectInterface
 {
diff --git a/src/gui/text/qabstracttextdocumentlayout_p.h b/src/gui/text/qabstracttextdocumentlayout_p.h
index a7f28ebf96..fc39d8ec5c 100644
--- a/src/gui/text/qabstracttextdocumentlayout_p.h
+++ b/src/gui/text/qabstracttextdocumentlayout_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index e96aecdf68..a7a8918703 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -61,6 +67,7 @@ struct QCssKnownValue
 static const QCssKnownValue properties[NumProperties - 1] = {
     { "-qt-background-role", QtBackgroundRole },
     { "-qt-block-indent", QtBlockIndent },
+    { "-qt-line-height-type", QtLineHeightType },
     { "-qt-list-indent", QtListIndent },
     { "-qt-list-number-prefix", QtListNumberPrefix },
     { "-qt-list-number-suffix", QtListNumberSuffix },
@@ -1505,10 +1512,10 @@ QRect Declaration::rectValue() const
     const QCss::Value &v = d->values.at(0);
     if (v.type != Value::Function)
         return QRect();
-    QStringList func = v.variant.toStringList();
+    const QStringList func = v.variant.toStringList();
     if (func.count() != 2 || func.at(0).compare(QLatin1String("rect")) != 0)
         return QRect();
-    QStringList args = func[1].split(QLatin1Char(' '), QString::SkipEmptyParts);
+    const auto args = func[1].splitRef(QLatin1Char(' '), QString::SkipEmptyParts);
     if (args.count() != 4)
         return QRect();
     QRect rect(args[0].toInt(), args[1].toInt(), args[2].toInt(), args[3].toInt());
@@ -1651,6 +1658,7 @@ Qt::Alignment Declaration::alignmentValue() const
 void Declaration::borderImageValue(QString *image, int *cuts,
                                    TileMode *h, TileMode *v) const
 {
+    const DeclarationData *d = this->d.data(); // make it const and shadow d
     *image = uriValue();
     for (int i = 0; i < 4; i++)
         cuts[i] = -1;
@@ -1912,9 +1920,8 @@ bool StyleSelector::basicSelectorMatches(const BasicSelector &sel, NodePtr node)
                 return false;
 
             if (a.valueMatchCriterium == QCss::AttributeSelector::MatchContains) {
-
-                QStringList lst = attrValue.split(QLatin1Char(' '));
-                if (!lst.contains(a.value))
+                const auto lst = attrValue.splitRef(QLatin1Char(' '));
+                if (!lst.contains(QStringRef(&a.value)))
                     return false;
             } else if (
                 (a.valueMatchCriterium == QCss::AttributeSelector::MatchEqual
@@ -2165,7 +2172,7 @@ void Parser::init(const QString &css, bool isFile)
     }
 
     hasEscapeSequences = false;
-    symbols.resize(0);
+    symbols.clear();
     symbols.reserve(8);
     Scanner::scan(Scanner::preprocess(styleSheet, &hasEscapeSequences), &symbols);
     index = 0;
diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index 75802ba36a..4da7b62dba 100644
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -183,6 +189,7 @@ enum Property {
     QtListNumberPrefix,
     QtListNumberSuffix,
     LineHeight,
+    QtLineHeightType,
     NumProperties
 };
 
diff --git a/src/gui/text/qcssscanner.cpp b/src/gui/text/qcssscanner.cpp
index 7505d27d80..f6b25d50ba 100644
--- a/src/gui/text/qcssscanner.cpp
+++ b/src/gui/text/qcssscanner.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qdistancefield.cpp b/src/gui/text/qdistancefield.cpp
index efe4cc9928..5a696807b4 100644
--- a/src/gui/text/qdistancefield.cpp
+++ b/src/gui/text/qdistancefield.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qdistancefield_p.h b/src/gui/text/qdistancefield_p.h
index 85662d6ca6..c6c5e6b650 100644
--- a/src/gui/text/qdistancefield_p.h
+++ b/src/gui/text/qdistancefield_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 2496147f11..9e4f61ebee 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -114,9 +120,6 @@ bool QFontDef::exactMatch(const QFontDef &other) const
     QFontDatabase::parseFontName(family, this_foundry, this_family);
     QFontDatabase::parseFontName(other.family, other_foundry, other_family);
 
-    this_family = QFontDatabase::resolveFontFamilyAlias(this_family);
-    other_family = QFontDatabase::resolveFontFamilyAlias(other_family);
-
     return (styleHint     == other.styleHint
             && styleStrategy == other.styleStrategy
             && weight        == other.weight
@@ -551,7 +554,7 @@ QFont::QFont(const QFont &font, QPaintDevice *pd)
         d->dpi = dpi;
         d->screen = screen;
     } else {
-        d = font.d.data();
+        d = font.d;
     }
 }
 
@@ -656,7 +659,7 @@ QFont::QFont(const QString &family, int pointSize, int weight, bool italic)
     Constructs a font that is a copy of \a font.
 */
 QFont::QFont(const QFont &font)
-    : d(font.d.data()), resolve_mask(font.resolve_mask)
+    : d(font.d), resolve_mask(font.resolve_mask)
 {
 }
 
@@ -672,7 +675,7 @@ QFont::~QFont()
 */
 QFont &QFont::operator=(const QFont &font)
 {
-    d = font.d.data();
+    d = font.d;
     resolve_mask = font.resolve_mask;
     return *this;
 }
@@ -1649,8 +1652,8 @@ bool QFont::operator<(const QFont &f) const
 {
     if (f.d == d) return false;
     // the < operator for fontdefs ignores point sizes.
-    QFontDef &r1 = f.d->request;
-    QFontDef &r2 = d->request;
+    const QFontDef &r1 = f.d->request;
+    const QFontDef &r2 = d->request;
     if (r1.pointSize != r2.pointSize) return r1.pointSize < r2.pointSize;
     if (r1.pixelSize != r2.pixelSize) return r1.pixelSize < r2.pixelSize;
     if (r1.weight != r2.weight) return r1.weight < r2.weight;
@@ -1827,7 +1830,7 @@ void QFont::insertSubstitutions(const QString &familyName,
     QFontSubst *fontSubst = globalFontSubst();
     Q_ASSERT(fontSubst != 0);
     QStringList &list = (*fontSubst)[familyName.toLower()];
-    foreach (const QString &substituteName, substituteNames) {
+    for (const QString &substituteName : substituteNames) {
         const QString lowerSubstituteName = substituteName.toLower();
         if (!list.contains(lowerSubstituteName))
             list.append(lowerSubstituteName);
@@ -2032,7 +2035,7 @@ uint qHash(const QFont &font, uint seed) Q_DECL_NOTHROW
  */
 bool QFont::fromString(const QString &descrip)
 {
-    QStringList l(descrip.split(QLatin1Char(',')));
+    const auto l = descrip.splitRef(QLatin1Char(','));
 
     int count = l.count();
     if (!count || (count > 2 && count < 9) || count > 11) {
@@ -2041,7 +2044,7 @@ bool QFont::fromString(const QString &descrip)
         return false;
     }
 
-    setFamily(l[0]);
+    setFamily(l[0].toString());
     if (count > 1 && l[1].toDouble() > 0.0)
         setPointSizeF(l[1].toDouble());
     if (count == 9) {
@@ -2390,7 +2393,7 @@ QDataStream &operator>>(QDataStream &s, QFont &font)
     that is not screen-compatible.
 */
 QFontInfo::QFontInfo(const QFont &font)
-    : d(font.d.data())
+    : d(font.d)
 {
 }
 
@@ -2398,7 +2401,7 @@ QFontInfo::QFontInfo(const QFont &font)
     Constructs a copy of \a fi.
 */
 QFontInfo::QFontInfo(const QFontInfo &fi)
-    : d(fi.d.data())
+    : d(fi.d)
 {
 }
 
@@ -2414,7 +2417,7 @@ QFontInfo::~QFontInfo()
 */
 QFontInfo &QFontInfo::operator=(const QFontInfo &fi)
 {
-    d = fi.d.data();
+    d = fi.d;
     return *this;
 }
 
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h
index 72e4197fc5..85a237643c 100644
--- a/src/gui/text/qfont.h
+++ b/src/gui/text/qfont.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h
index ff9265ca19..3979bb27ac 100644
--- a/src/gui/text/qfont_p.h
+++ b/src/gui/text/qfont_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index f063541249..283d03f22c 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -493,6 +499,7 @@ public:
 
     void invalidate();
 };
+Q_DECLARE_TYPEINFO(QFontDatabasePrivate::ApplicationFont, Q_MOVABLE_TYPE);
 
 void QFontDatabasePrivate::invalidate()
 {
@@ -690,25 +697,20 @@ static QStringList familyList(const QFontDef &req)
     if (req.family.isEmpty())
         return family_list;
 
-    QStringList list = req.family.split(QLatin1Char(','));
+    const auto list = req.family.splitRef(QLatin1Char(','));
     const int numFamilies = list.size();
     family_list.reserve(numFamilies);
     for (int i = 0; i < numFamilies; ++i) {
-        QString str = list.at(i).trimmed();
+        QStringRef str = list.at(i).trimmed();
         if ((str.startsWith(QLatin1Char('"')) && str.endsWith(QLatin1Char('"')))
             || (str.startsWith(QLatin1Char('\'')) && str.endsWith(QLatin1Char('\''))))
             str = str.mid(1, str.length() - 2);
-        family_list << str;
+        family_list << str.toString();
     }
 
     // append the substitute list for each family in family_list
-    QStringList subs_list;
-    QStringList::ConstIterator it = family_list.constBegin(), end = family_list.constEnd();
-    for (; it != end; ++it)
-        subs_list += QFont::substitutes(*it);
-//         qDebug() << "adding substs: " << subs_list;
-
-    family_list += subs_list;
+    for (int i = 0, size = family_list.size(); i < size; ++i)
+        family_list += QFont::substitutes(family_list.at(i));
 
     return family_list;
 }
@@ -1405,7 +1407,7 @@ QString QFontDatabase::styleString(const QFontInfo &fontInfo)
 */
 QFontDatabase::QFontDatabase()
 {
-    if (!qApp || !QGuiApplicationPrivate::platformIntegration())
+    if (Q_UNLIKELY(!qApp || !QGuiApplicationPrivate::platformIntegration()))
         qFatal("QFontDatabase: Must construct a QGuiApplication before accessing QFontDatabase");
 
     QMutexLocker locker(fontDatabaseMutex());
@@ -2666,7 +2668,7 @@ QFontEngine *QFontDatabase::findFont(const QFontDef &request, int script)
 
     QtFontDesc desc;
     QList<int> blackListed;
-    int index = match(script, request, family_name, foundry_name, &desc, blackListed);
+    int index = match(multi ? QChar::Script_Common : script, request, family_name, foundry_name, &desc, blackListed);
     if (index >= 0) {
         engine = loadEngine(script, request, desc.family, desc.foundry, desc.style, desc.size);
         if (engine)
@@ -2699,7 +2701,7 @@ QFontEngine *QFontDatabase::findFont(const QFontDef &request, int script)
                 if (!engine) {
                     QtFontDesc desc;
                     do {
-                        index = match(script, def, def.family, QLatin1String(""), &desc, blackListed);
+                        index = match(multi ? QChar::Script_Common : script, def, def.family, QLatin1String(""), &desc, blackListed);
                         if (index >= 0) {
                             QFontDef loadDef = def;
                             if (loadDef.family.isEmpty())
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h
index 02bc8e8a08..67cf671304 100644
--- a/src/gui/text/qfontdatabase.h
+++ b/src/gui/text/qfontdatabase.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -161,6 +167,7 @@ private:
     friend class QFontDialog;
     friend class QFontDialogPrivate;
     friend class QFontEngineMulti;
+    friend class QRawFont;
 
     QFontDatabasePrivate *d;
 };
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index fa49b25073..4f0c6d25f7 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -240,8 +246,8 @@ Q_AUTOTEST_EXPORT QList<QFontEngine *> QFontEngine_stopCollectingEngines()
 
 QFontEngine::QFontEngine(Type type)
     : m_type(type), ref(0),
-      font_(0), font_destroy_func(0),
-      face_(0), face_destroy_func(0),
+      font_(),
+      face_(),
       m_minLeftBearing(kBearingNotInitialized),
       m_minRightBearing(kBearingNotInitialized)
 {
@@ -263,17 +269,6 @@ QFontEngine::QFontEngine(Type type)
 
 QFontEngine::~QFontEngine()
 {
-    m_glyphCaches.clear();
-
-    if (font_ && font_destroy_func) {
-        font_destroy_func(font_);
-        font_ = 0;
-    }
-    if (face_ && face_destroy_func) {
-        face_destroy_func(face_);
-        face_ = 0;
-    }
-
 #ifdef QT_BUILD_INTERNAL
     if (enginesCollector)
         enginesCollector->removeOne(this);
@@ -328,10 +323,9 @@ void *QFontEngine::harfbuzzFont() const
         hbFont->x_scale = (((qint64)hbFont->x_ppem << 6) * 0x10000L + (emSquare >> 1)) / emSquare;
         hbFont->y_scale = (((qint64)hbFont->y_ppem << 6) * 0x10000L + (emSquare >> 1)) / emSquare;
 
-        font_ = (void *)hbFont;
-        font_destroy_func = free;
+        font_ = Holder(hbFont, free);
     }
-    return font_;
+    return font_.get();
 }
 
 void *QFontEngine::harfbuzzFace() const
@@ -351,10 +345,9 @@ void *QFontEngine::harfbuzzFace() const
         Q_CHECK_PTR(hbFace);
         hbFace->isSymbolFont = symbol;
 
-        face_ = (void *)hbFace;
-        face_destroy_func = hb_freeFace;
+        face_ = Holder(hbFace, hb_freeFace);
     }
-    return face_;
+    return face_.get();
 }
 
 bool QFontEngine::supportsScript(QChar::Script script) const
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index 1711865e59..5550dc21db 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -46,6 +52,7 @@
 #include <qscopedvaluerollback.h>
 #include "qthreadstorage.h"
 #include <qmath.h>
+#include <qendian.h>
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -186,6 +193,15 @@ int QFreetypeFace::getPointInOutline(glyph_t glyph, int flags, quint32 point, QF
     return Err_Ok;
 }
 
+bool QFreetypeFace::isScalableBitmap() const
+{
+#ifdef FT_HAS_COLOR
+    return !FT_IS_SCALABLE(face) && FT_HAS_COLOR(face);
+#else
+    return false;
+#endif
+}
+
 extern QByteArray qt_fontdata_from_index(int);
 
 /*
@@ -240,9 +256,6 @@ QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id,
         }
         newFreetype->face = face;
 
-        newFreetype->hbFace = 0;
-        newFreetype->hbFace_destroy_func = 0;
-
         newFreetype->ref.store(1);
         newFreetype->xsize = 0;
         newFreetype->ysize = 0;
@@ -294,10 +307,7 @@ QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id,
 
 void QFreetypeFace::cleanup()
 {
-    if (hbFace && hbFace_destroy_func) {
-        hbFace_destroy_func(hbFace);
-        hbFace = 0;
-    }
+    hbFace.reset();
     FT_Done_Face(face);
     face = 0;
 }
@@ -324,42 +334,53 @@ void QFreetypeFace::release(const QFontEngine::FaceId &face_id)
 }
 
 
-void QFreetypeFace::computeSize(const QFontDef &fontDef, int *xsize, int *ysize, bool *outline_drawing)
+void QFreetypeFace::computeSize(const QFontDef &fontDef, int *xsize, int *ysize, bool *outline_drawing, QFixed *scalableBitmapScaleFactor)
 {
     *ysize = qRound(fontDef.pixelSize * 64);
     *xsize = *ysize * fontDef.stretch / 100;
+    *scalableBitmapScaleFactor = 1;
     *outline_drawing = false;
 
-    /*
-     * Bitmap only faces must match exactly, so find the closest
-     * one (height dominant search)
-     */
     if (!(face->face_flags & FT_FACE_FLAG_SCALABLE)) {
         int best = 0;
-        for (int i = 1; i < face->num_fixed_sizes; i++) {
-            if (qAbs(*ysize -  face->available_sizes[i].y_ppem) <
-                qAbs(*ysize - face->available_sizes[best].y_ppem) ||
-                (qAbs(*ysize - face->available_sizes[i].y_ppem) ==
-                 qAbs(*ysize - face->available_sizes[best].y_ppem) &&
-                 qAbs(*xsize - face->available_sizes[i].x_ppem) <
-                 qAbs(*xsize - face->available_sizes[best].x_ppem))) {
-                best = i;
+        if (!isScalableBitmap()) {
+            /*
+             * Bitmap only faces must match exactly, so find the closest
+             * one (height dominant search)
+             */
+            for (int i = 1; i < face->num_fixed_sizes; i++) {
+                if (qAbs(*ysize -  face->available_sizes[i].y_ppem) <
+                    qAbs(*ysize - face->available_sizes[best].y_ppem) ||
+                    (qAbs(*ysize - face->available_sizes[i].y_ppem) ==
+                     qAbs(*ysize - face->available_sizes[best].y_ppem) &&
+                     qAbs(*xsize - face->available_sizes[i].x_ppem) <
+                     qAbs(*xsize - face->available_sizes[best].x_ppem))) {
+                    best = i;
+                }
+            }
+        } else {
+            // Select the shortest bitmap strike whose height is larger than the desired height
+            for (int i = 1; i < face->num_fixed_sizes; i++) {
+                if (face->available_sizes[i].y_ppem < *ysize) {
+                    if (face->available_sizes[i].y_ppem > face->available_sizes[best].y_ppem)
+                        best = i;
+                } else if (face->available_sizes[best].y_ppem < *ysize) {
+                    best = i;
+                } else if (face->available_sizes[i].y_ppem < face->available_sizes[best].y_ppem) {
+                    best = i;
+                }
             }
         }
-        if (FT_Set_Char_Size(face, face->available_sizes[best].x_ppem, face->available_sizes[best].y_ppem, 0, 0) == 0) {
+
+        // According to freetype documentation we must use FT_Select_Size
+        // to make sure we can select the desired bitmap strike index
+        if (FT_Select_Size(face, best) == 0) {
+            if (isScalableBitmap())
+                *scalableBitmapScaleFactor = QFixed::fromReal((qreal)fontDef.pixelSize / face->available_sizes[best].height);
             *xsize = face->available_sizes[best].x_ppem;
             *ysize = face->available_sizes[best].y_ppem;
         } else {
-            int err = 1;
-            if (!(face->face_flags & FT_FACE_FLAG_SCALABLE) && ysize == 0 && face->num_fixed_sizes >= 1) {
-                // work around FT 2.1.10 problem with BDF without PIXEL_SIZE property
-                err = FT_Set_Pixel_Sizes(face, face->available_sizes[0].width, face->available_sizes[0].height);
-                if (err && face->num_fixed_sizes == 1)
-                    err = 0; //even more of a workaround...
-            }
-
-            if (err)
-                *xsize = *ysize = 0;
+            *xsize = *ysize = 0;
         }
     } else {
         *outline_drawing = (*xsize > (QT_MAX_CACHED_GLYPH_SIZE<<6) || *ysize > (QT_MAX_CACHED_GLYPH_SIZE<<6));
@@ -680,6 +701,8 @@ bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat format,
     return init(faceId, antialias, format, QFreetypeFace::getFace(faceId, fontData));
 }
 
+static void dont_delete(void*) {}
+
 bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat format,
                          QFreetypeFace *freetypeFace)
 {
@@ -706,7 +729,7 @@ bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat format,
         symbol = bool(fontDef.family.contains(QLatin1String("symbol"), Qt::CaseInsensitive));
     }
 
-    freetype->computeSize(fontDef, &xsize, &ysize, &defaultGlyphSet.outline_drawing);
+    freetype->computeSize(fontDef, &xsize, &ysize, &defaultGlyphSet.outline_drawing, &scalableBitmapScaleFactor);
 
     FT_Face face = lockFace();
 
@@ -734,6 +757,11 @@ bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat format,
         if (line_thickness < 2 && score >= 1050)
             line_thickness = 2;
         underline_position =  ((line_thickness * 2) + 3) / 6;
+
+        if (isScalableBitmap()) {
+            glyphFormat = defaultFormat = GlyphFormat::Format_ARGB;
+            cacheEnabled = false;
+        }
     }
     if (line_thickness < 1)
         line_thickness = 1;
@@ -770,13 +798,13 @@ bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat format,
     if (!freetype->hbFace) {
         faceData.user_data = face;
         faceData.get_font_table = ft_getSfntTable;
-        freetype->hbFace = harfbuzzFace();
-        freetype->hbFace_destroy_func = face_destroy_func;
+        (void)harfbuzzFace(); // populates face_
+        freetype->hbFace = std::move(face_);
     } else {
         Q_ASSERT(!face_);
-        face_ = freetype->hbFace;
     }
-    face_destroy_func = 0; // we share the HB face in QFreeTypeFace, so do not let ~QFontEngine() destroy it
+    // we share the HB face in QFreeTypeFace, so do not let ~QFontEngine() destroy it
+    face_ = Holder(freetype->hbFace.get(), dont_delete);
 
     unlockFace();
 
@@ -827,6 +855,10 @@ int QFontEngineFT::loadFlags(QGlyphSet *set, GlyphFormat format, int flags,
                 load_target = FT_LOAD_TARGET_LCD_V;
             vfactor = 3;
         }
+    } else if (format == Format_ARGB) {
+#ifdef FT_LOAD_COLOR
+        load_flags |= FT_LOAD_COLOR;
+#endif
     }
 
     if (set && set->outline_drawing)
@@ -847,11 +879,8 @@ static inline bool areMetricsTooLarge(const QFontEngineFT::GlyphInfo &info)
 {
     // false if exceeds QFontEngineFT::Glyph metrics
     return (short)(info.linearAdvance) != info.linearAdvance
-            || (signed char)(info.xOff) != info.xOff
             || (uchar)(info.width) != info.width
-            || (uchar)(info.height) != info.height
-            || (signed char)(info.x) != info.x
-            || (signed char)(info.y) != info.y;
+            || (uchar)(info.height) != info.height;
 }
 
 QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph,
@@ -891,7 +920,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph,
                      || matrix.xy != 0
                      || matrix.yx != 0;
 
-    if (transform || (format != Format_Mono && !embeddedbitmap))
+    if (transform || (format != Format_Mono && !isScalableBitmap()))
         load_flags |= FT_LOAD_NO_BITMAP;
 
     FT_Error err = FT_Load_Glyph(face, glyph, load_flags);
@@ -1122,7 +1151,11 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph,
         if (bitmap.buffer != glyph_buffer.data())
             delete [] bitmap.buffer;
     } else if (slot->format == FT_GLYPH_FORMAT_BITMAP) {
+#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100) >= 20500)
+        Q_ASSERT(slot->bitmap.pixel_mode == FT_PIXEL_MODE_MONO || slot->bitmap.pixel_mode == FT_PIXEL_MODE_BGRA);
+#else
         Q_ASSERT(slot->bitmap.pixel_mode == FT_PIXEL_MODE_MONO);
+#endif
         uchar *src = slot->bitmap.buffer;
         uchar *dst = glyph_buffer.data();
         int h = slot->bitmap.rows;
@@ -1133,7 +1166,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph,
                 dst += pitch;
                 src += slot->bitmap.pitch;
             }
-        } else {
+        } else if (slot->bitmap.pixel_mode == FT_PIXEL_MODE_MONO) {
             if (hsubpixel) {
                 while (h--) {
                     uint *dd = (uint *)dst;
@@ -1167,6 +1200,29 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph,
                 }
             }
         }
+#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100) >= 20500)
+        else if (slot->bitmap.pixel_mode == FT_PIXEL_MODE_BGRA)
+        {
+            while (h--) {
+#if Q_BYTE_ORDER == Q_BIG_ENDIAN
+                const quint32 *srcPixel = (const quint32 *)src;
+                quint32 *dstPixel = (quint32 *)dst;
+                for (int x = 0; x < static_cast<int>(slot->bitmap.width); x++, srcPixel++, dstPixel++) {
+                    const quint32 pixel = *srcPixel;
+                    *dstPixel = qbswap(pixel);
+                }
+#else
+                memcpy(dst, src, slot->bitmap.width * 4);
+#endif
+                dst += slot->bitmap.pitch;
+                src += slot->bitmap.pitch;
+            }
+            info.width = info.linearAdvance = info.xOff = slot->bitmap.width;
+            info.height = slot->bitmap.rows;
+            info.x = slot->bitmap_left;
+            info.y = slot->bitmap_top;
+        }
+#endif
     } else {
         qWarning("QFontEngine: Glyph neither outline nor bitmap format=%d", slot->format);
         return 0;
@@ -1237,46 +1293,68 @@ int QFontEngineFT::synthesized() const
 
 QFixed QFontEngineFT::ascent() const
 {
-    return QFixed::fromFixed(metrics.ascender);
+    QFixed v = QFixed::fromFixed(metrics.ascender);
+    if (scalableBitmapScaleFactor != 1)
+        v *= scalableBitmapScaleFactor;
+    return v;
 }
 
 QFixed QFontEngineFT::descent() const
 {
-    return QFixed::fromFixed(-metrics.descender);
+    QFixed v = QFixed::fromFixed(-metrics.descender);
+    if (scalableBitmapScaleFactor != 1)
+        v *= scalableBitmapScaleFactor;
+    return v;
 }
 
 QFixed QFontEngineFT::leading() const
 {
-    return QFixed::fromFixed(metrics.height - metrics.ascender + metrics.descender);
+    QFixed v = QFixed::fromFixed(metrics.height - metrics.ascender + metrics.descender);
+    if (scalableBitmapScaleFactor != 1)
+        v *= scalableBitmapScaleFactor;
+    return v;
 }
 
 QFixed QFontEngineFT::xHeight() const
 {
-    TT_OS2 *os2 = (TT_OS2 *)FT_Get_Sfnt_Table(freetype->face, ft_sfnt_os2);
-    if (os2 && os2->sxHeight) {
-        lockFace();
-        QFixed answer = QFixed(os2->sxHeight * freetype->face->size->metrics.y_ppem) / emSquareSize();
-        unlockFace();
-        return answer;
+    if (!isScalableBitmap()) {
+        TT_OS2 *os2 = (TT_OS2 *)FT_Get_Sfnt_Table(freetype->face, ft_sfnt_os2);
+        if (os2 && os2->sxHeight) {
+            lockFace();
+            QFixed answer = QFixed(os2->sxHeight * freetype->face->size->metrics.y_ppem) / emSquareSize();
+            unlockFace();
+            return answer;
+        }
+    } else {
+        return QFixed(freetype->face->size->metrics.y_ppem) * scalableBitmapScaleFactor;
     }
     return QFontEngine::xHeight();
 }
 
 QFixed QFontEngineFT::averageCharWidth() const
 {
-    TT_OS2 *os2 = (TT_OS2 *)FT_Get_Sfnt_Table(freetype->face, ft_sfnt_os2);
-    if (os2 && os2->xAvgCharWidth) {
-        lockFace();
-        QFixed answer = QFixed(os2->xAvgCharWidth * freetype->face->size->metrics.x_ppem) / emSquareSize();
-        unlockFace();
-        return answer;
-    }
-    return QFontEngine::averageCharWidth();
+     if (!isScalableBitmap()) {
+         TT_OS2 *os2 = (TT_OS2 *)FT_Get_Sfnt_Table(freetype->face, ft_sfnt_os2);
+         if (os2 && os2->xAvgCharWidth) {
+             lockFace();
+             QFixed answer = QFixed(os2->xAvgCharWidth * freetype->face->size->metrics.x_ppem) / emSquareSize();
+             unlockFace();
+             return answer;
+         }
+     } else {
+         const qreal aspectRatio = (qreal)xsize / ysize;
+         return QFixed::fromReal(fontDef.pixelSize * aspectRatio);
+     }
+
+     return QFontEngine::averageCharWidth();
 }
 
 qreal QFontEngineFT::maxCharWidth() const
 {
-    return metrics.max_advance >> 6;
+    QFixed max_advance = QFixed::fromFixed(metrics.max_advance);
+    if (scalableBitmapScaleFactor != 1)
+        max_advance *= scalableBitmapScaleFactor;
+    return max_advance.toReal();
 }
 
 QFixed QFontEngineFT::lineThickness() const
@@ -1559,6 +1637,23 @@ bool QFontEngineFT::shouldUseDesignMetrics(QFontEngine::ShaperFlags flags) const
     return default_hint_style == HintNone || default_hint_style == HintLight || (flags & DesignMetrics);
 }
 
+QFixed QFontEngineFT::scaledBitmapMetrics(QFixed m) const
+{
+    return m * scalableBitmapScaleFactor;
+}
+
+glyph_metrics_t QFontEngineFT::scaledBitmapMetrics(const glyph_metrics_t &m) const
+{
+    glyph_metrics_t metrics;
+    metrics.x = scaledBitmapMetrics(m.x);
+    metrics.y = scaledBitmapMetrics(m.y);
+    metrics.width = scaledBitmapMetrics(m.width);
+    metrics.height = scaledBitmapMetrics(m.height);
+    metrics.xoff = scaledBitmapMetrics(m.xoff);
+    metrics.yoff = scaledBitmapMetrics(m.yoff);
+    return metrics;
+}
+
 void QFontEngineFT::recalcAdvances(QGlyphLayout *glyphs, QFontEngine::ShaperFlags flags) const
 {
     FT_Face face = 0;
@@ -1581,6 +1676,9 @@ void QFontEngineFT::recalcAdvances(QGlyphLayout *glyphs, QFontEngine::ShaperFlag
             if (!cacheEnabled && g != &emptyGlyph)
                 delete g;
         }
+
+        if (scalableBitmapScaleFactor != 1)
+            glyphs->advances[i] *= scalableBitmapScaleFactor;
     }
     if (face)
         unlockFace();
@@ -1597,8 +1695,13 @@ glyph_metrics_t QFontEngineFT::boundingBox(const QGlyphLayout &glyphs)
 
     glyph_metrics_t overall;
     // initialize with line height, we get the same behaviour on all platforms
-    overall.y = -ascent();
-    overall.height = ascent() + descent();
+    if (!isScalableBitmap()) {
+        overall.y = -ascent();
+        overall.height = ascent() + descent();
+    } else {
+        overall.y = QFixed::fromFixed(-metrics.ascender);
+        overall.height = QFixed::fromFixed(metrics.ascender - metrics.descender);
+    }
 
     QFixed ymax = 0;
     QFixed xmax = 0;
@@ -1640,6 +1743,8 @@ glyph_metrics_t QFontEngineFT::boundingBox(const QGlyphLayout &glyphs)
     if (face)
         unlockFace();
 
+    if (isScalableBitmap())
+        overall = scaledBitmapMetrics(overall);
     return overall;
 }
 
@@ -1676,6 +1781,9 @@ glyph_metrics_t QFontEngineFT::boundingBox(glyph_t glyph)
     }
     if (face)
         unlockFace();
+
+    if (isScalableBitmap())
+        overall = scaledBitmapMetrics(overall);
     return overall;
 }
 
@@ -1711,6 +1819,9 @@ glyph_metrics_t QFontEngineFT::alphaMapBoundingBox(glyph_t glyph, QFixed subPixe
         overall.xoff = TRUNC(ROUND(face->glyph->advance.x));
         unlockFace();
     }
+
+    if (isScalableBitmap())
+        overall = scaledBitmapMetrics(overall);
     return overall;
 }
 
@@ -1865,6 +1976,31 @@ QImage QFontEngineFT::alphaRGBMapForGlyph(glyph_t g, QFixed subPixelPosition, co
     return QFontEngine::alphaRGBMapForGlyph(g, subPixelPosition, t);
 }
 
+QImage QFontEngineFT::bitmapForGlyph(glyph_t g, QFixed subPixelPosition, const QTransform &t)
+{
+    Glyph *glyph = loadGlyphFor(g, subPixelPosition, defaultFormat, t);
+    if (glyph == Q_NULLPTR)
+        return QImage();
+
+    QImage img;
+    if (defaultFormat == GlyphFormat::Format_ARGB)
+        img = QImage(glyph->data, glyph->width, glyph->height, QImage::Format_ARGB32_Premultiplied).copy();
+    else if (defaultFormat == GlyphFormat::Format_Mono)
+        img = QImage(glyph->data, glyph->width, glyph->height, QImage::Format_Mono).copy();
+
+    if (!img.isNull() && (!t.isIdentity() || scalableBitmapScaleFactor != 1)) {
+        QTransform trans(t);
+        const qreal scaleFactor = scalableBitmapScaleFactor.toReal();
+        trans.scale(scaleFactor, scaleFactor);
+        img = img.transformed(trans, Qt::SmoothTransformation);
+    }
+
+    if (!cacheEnabled && glyph != &emptyGlyph)
+        delete glyph;
+
+    return img;
+}
+
 void QFontEngineFT::removeGlyphFromCache(glyph_t glyph)
 {
     defaultGlyphSet.removeGlyphFromCache(glyph, 0);
@@ -1886,9 +2022,10 @@ FT_Face QFontEngineFT::lockFace(Scaling scale) const
     freetype->lock();
     FT_Face face = freetype->face;
     if (scale == Unscaled) {
-        FT_Set_Char_Size(face, face->units_per_EM << 6, face->units_per_EM << 6, 0, 0);
-        freetype->xsize = face->units_per_EM << 6;
-        freetype->ysize = face->units_per_EM << 6;
+        if (FT_Set_Char_Size(face, face->units_per_EM << 6, face->units_per_EM << 6, 0, 0) == 0) {
+            freetype->xsize = face->units_per_EM << 6;
+            freetype->ysize = face->units_per_EM << 6;
+        }
     } else if (freetype->xsize != xsize || freetype->ysize != ysize) {
         FT_Set_Char_Size(face, xsize, ysize, 0, 0);
         freetype->xsize = xsize;
diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h
index a1bd21dab9..3cdf0cda47 100644
--- a/src/gui/text/qfontengine_ft_p.h
+++ b/src/gui/text/qfontengine_ft_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -69,7 +75,7 @@ class QFontconfigDatabase;
 class QFreetypeFace
 {
 public:
-    void computeSize(const QFontDef &fontDef, int *xsize, int *ysize, bool *outline_drawing);
+    void computeSize(const QFontDef &fontDef, int *xsize, int *ysize, bool *outline_drawing, QFixed *scalableBitmapScaleFactor);
     QFontEngine::Properties properties() const;
     bool getSfntTable(uint tag, uchar *buffer, uint *length) const;
 
@@ -101,6 +107,8 @@ public:
 
     int getPointInOutline(glyph_t glyph, int flags, quint32 point, QFixed *xpos, QFixed *ypos, quint32 *nPoints);
 
+    bool isScalableBitmap() const;
+
     static void addGlyphToPath(FT_Face face, FT_GlyphSlot g, const QFixedPoint &point, QPainterPath *path, FT_Fixed x_scale, FT_Fixed y_scale);
     static void addBitmapToPath(FT_GlyphSlot slot, const QFixedPoint &point, QPainterPath *path);
 
@@ -115,8 +123,7 @@ private:
     QMutex _lock;
     QByteArray fontData;
 
-    void *hbFace;
-    qt_destroy_func_t hbFace_destroy_func;
+    QFontEngine::Holder hbFace;
 };
 
 // If this is exported this breaks compilation of the windows
@@ -135,9 +142,9 @@ public:
         short linearAdvance;
         unsigned char width;
         unsigned char height;
-        signed char x;
-        signed char y;
-        signed char advance;
+        short x;
+        short y;
+        short advance;
         signed char format;
         uchar *data;
     };
@@ -234,6 +241,7 @@ private:
     QImage alphaMapForGlyph(glyph_t, QFixed) Q_DECL_OVERRIDE;
     QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
     QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
+    QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE;
     glyph_metrics_t alphaMapBoundingBox(glyph_t glyph,
                                         QFixed subPixelPosition,
                                         const QTransform &matrix,
@@ -261,6 +269,7 @@ private:
     inline bool drawAntialiased() const { return antialias; }
     inline bool invalid() const { return xsize == 0 && ysize == 0; }
     inline bool isBitmapFont() const { return defaultFormat == Format_Mono; }
+    inline bool isScalableBitmap() const { return freetype->isScalableBitmap(); }
 
     inline Glyph *loadGlyph(uint glyph, QFixed subPixelPosition, GlyphFormat format = Format_None, bool fetchMetricsOnly = false) const
     { return loadGlyph(cacheEnabled ? &defaultGlyphSet : 0, glyph, subPixelPosition, format, fetchMetricsOnly); }
@@ -311,6 +320,8 @@ private:
 
     int loadFlags(QGlyphSet *set, GlyphFormat format, int flags, bool &hsubpixel, int &vfactor) const;
     bool shouldUseDesignMetrics(ShaperFlags flags) const;
+    QFixed scaledBitmapMetrics(QFixed m) const;
+    glyph_metrics_t scaledBitmapMetrics(const glyph_metrics_t &m) const;
 
     GlyphFormat defaultFormat;
     FT_Matrix matrix;
@@ -328,6 +339,7 @@ private:
 
     FT_Size_Metrics metrics;
     mutable bool kerning_pairs_loaded;
+    QFixed scalableBitmapScaleFactor;
 };
 
 inline uint qHash(const QFontEngineFT::GlyphAndSubPixelPosition &g)
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index 39cf826ee2..132531f5bc 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -271,10 +277,45 @@ public:
     QAtomicInt ref;
     QFontDef fontDef;
 
-    mutable void *font_;
-    mutable qt_destroy_func_t font_destroy_func;
-    mutable void *face_;
-    mutable qt_destroy_func_t face_destroy_func;
+    class Holder { // replace by std::unique_ptr once available
+        void *ptr;
+        qt_destroy_func_t destroy_func;
+    public:
+        Holder() : ptr(nullptr), destroy_func(nullptr) {}
+        explicit Holder(void *p, qt_destroy_func_t d) : ptr(p), destroy_func(d) {}
+        ~Holder() { if (ptr && destroy_func) destroy_func(ptr); }
+        Holder(Holder &&other) Q_DECL_NOTHROW
+            : ptr(other.ptr),
+              destroy_func(other.destroy_func)
+        {
+            other.ptr = nullptr;
+            other.destroy_func = nullptr;
+        }
+        Holder &operator=(Holder &&other) Q_DECL_NOTHROW
+        { swap(other); return *this; }
+
+        void swap(Holder &other) Q_DECL_NOTHROW
+        {
+            qSwap(ptr, other.ptr);
+            qSwap(destroy_func, other.destroy_func);
+        }
+
+        void *get() const Q_DECL_NOTHROW { return ptr; }
+        void *release() Q_DECL_NOTHROW {
+            void *result = ptr;
+            ptr = nullptr;
+            destroy_func = nullptr;
+            return result;
+        }
+        void reset() Q_DECL_NOTHROW { Holder().swap(*this); }
+        qt_destroy_func_t get_deleter() const Q_DECL_NOTHROW { return destroy_func; }
+
+        bool operator!() const Q_DECL_NOTHROW { return !ptr; }
+    };
+
+    mutable Holder font_; // \ NOTE: Declared before m_glyphCaches, so font_, face_
+    mutable Holder face_; // / are destroyed _after_ m_glyphCaches is destroyed.
+
     struct FaceData {
         void *user_data;
         qt_get_font_table_func_t get_font_table;
@@ -329,6 +370,7 @@ private:
     mutable qreal m_minRightBearing;
 
 };
+Q_DECLARE_TYPEINFO(QFontEngine::KernPair, Q_PRIMITIVE_TYPE);
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QFontEngine::ShaperFlags)
 
diff --git a/src/gui/text/qfontengine_qpf2.cpp b/src/gui/text/qfontengine_qpf2.cpp
index f2e05631a3..2e4af09550 100644
--- a/src/gui/text/qfontengine_qpf2.cpp
+++ b/src/gui/text/qfontengine_qpf2.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -240,7 +246,7 @@ QFontEngineQPF2::QFontEngineQPF2(const QFontDef &def, const QByteArray &data)
 
     if (!verifyHeader(fontData, dataSize)) {
 #if defined(DEBUG_FONTENGINE)
-        qDebug() << "verifyHeader failed!";
+        qDebug("verifyHeader failed!");
 #endif
         return;
     }
@@ -527,7 +533,7 @@ void QPF2Generator::writeHeader()
     {
         const QByteArray head = fe->getSfntTable(MAKE_TAG('h', 'e', 'a', 'd'));
         if (head.size() >= 4) {
-            const quint32 revision = qFromBigEndian<quint32>(reinterpret_cast<const uchar *>(head.constData()));
+            const quint32 revision = qFromBigEndian<quint32>(head.constData());
             writeTaggedUInt32(QFontEngineQPF2::Tag_FontRevision, revision);
         }
     }
diff --git a/src/gui/text/qfontengine_qpf2_p.h b/src/gui/text/qfontengine_qpf2_p.h
index 349fd483bf..50aac245c1 100644
--- a/src/gui/text/qfontengine_qpf2_p.h
+++ b/src/gui/text/qfontengine_qpf2_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qfontengineglyphcache.cpp b/src/gui/text/qfontengineglyphcache.cpp
index f6fdfa3ce3..c6e6499854 100644
--- a/src/gui/text/qfontengineglyphcache.cpp
+++ b/src/gui/text/qfontengineglyphcache.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qfontengineglyphcache_p.h b/src/gui/text/qfontengineglyphcache_p.h
index def42c22a3..54b9af71df 100644
--- a/src/gui/text/qfontengineglyphcache_p.h
+++ b/src/gui/text/qfontengineglyphcache_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qfontinfo.h b/src/gui/text/qfontinfo.h
index 76addc9aa5..ee368e26bd 100644
--- a/src/gui/text/qfontinfo.h
+++ b/src/gui/text/qfontinfo.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index 32e40b9f4d..2189923b25 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -145,7 +151,7 @@ extern void qt_format_text(const QFont& font, const QRectF &_r,
     metrics that are compatible with a certain paint device.
 */
 QFontMetrics::QFontMetrics(const QFont &font)
-    : d(font.d.data())
+    : d(font.d)
 {
 }
 
@@ -171,7 +177,7 @@ QFontMetrics::QFontMetrics(const QFont &font, QPaintDevice *paintdevice)
         d->dpi = dpi;
         d->screen = screen;
     } else {
-        d = font.d.data();
+        d = font.d;
     }
 
 }
@@ -180,7 +186,7 @@ QFontMetrics::QFontMetrics(const QFont &font, QPaintDevice *paintdevice)
     Constructs a copy of \a fm.
 */
 QFontMetrics::QFontMetrics(const QFontMetrics &fm)
-    : d(fm.d.data())
+    : d(fm.d)
 {
 }
 
@@ -197,7 +203,7 @@ QFontMetrics::~QFontMetrics()
 */
 QFontMetrics &QFontMetrics::operator=(const QFontMetrics &fm)
 {
-    d = fm.d.data();
+    d = fm.d;
     return *this;
 }
 
@@ -995,7 +1001,7 @@ int QFontMetrics::lineWidth() const
     from the given \a fontMetrics object.
 */
 QFontMetricsF::QFontMetricsF(const QFontMetrics &fontMetrics)
-    : d(fontMetrics.d.data())
+    : d(fontMetrics.d)
 {
 }
 
@@ -1006,7 +1012,7 @@ QFontMetricsF::QFontMetricsF(const QFontMetrics &fontMetrics)
 */
 QFontMetricsF &QFontMetricsF::operator=(const QFontMetrics &other)
 {
-    d = other.d.data();
+    d = other.d;
     return *this;
 }
 
@@ -1034,7 +1040,7 @@ QFontMetricsF &QFontMetricsF::operator=(const QFontMetrics &other)
     metrics that are compatible with a certain paint device.
 */
 QFontMetricsF::QFontMetricsF(const QFont &font)
-    : d(font.d.data())
+    : d(font.d)
 {
 }
 
@@ -1060,7 +1066,7 @@ QFontMetricsF::QFontMetricsF(const QFont &font, QPaintDevice *paintdevice)
         d->dpi = dpi;
         d->screen = screen;
     } else {
-        d = font.d.data();
+        d = font.d;
     }
 
 }
@@ -1069,7 +1075,7 @@ QFontMetricsF::QFontMetricsF(const QFont &font, QPaintDevice *paintdevice)
     Constructs a copy of \a fm.
 */
 QFontMetricsF::QFontMetricsF(const QFontMetricsF &fm)
-    : d(fm.d.data())
+    : d(fm.d)
 {
 }
 
@@ -1086,7 +1092,7 @@ QFontMetricsF::~QFontMetricsF()
 */
 QFontMetricsF &QFontMetricsF::operator=(const QFontMetricsF &fm)
 {
-    d = fm.d.data();
+    d = fm.d;
     return *this;
 }
 
diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h
index 4c2c6317ba..1d7241c9f2 100644
--- a/src/gui/text/qfontmetrics.h
+++ b/src/gui/text/qfontmetrics.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp
index 84819fd52e..c8f0393084 100644
--- a/src/gui/text/qfontsubset.cpp
+++ b/src/gui/text/qfontsubset.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -618,6 +624,7 @@ static QTtfTable generateName(const QVector<QTtfNameRecord> &name);
 static QTtfTable generateName(const qttf_name_table &name)
 {
     QVector<QTtfNameRecord> list;
+    list.reserve(5);
     QTtfNameRecord rec;
     rec.nameId = 0;
     rec.value = name.copyright;
@@ -791,7 +798,7 @@ static void convertPath(const QPainterPath &path, QVector<TTF_POINT> *points, QV
                     base -= 3;
                 } else {
                     // need to split
-//                     qDebug() << "  -> splitting";
+//                     qDebug("  -> splitting");
                     qint16 a, b, c, d;
                     base[6].x = base[3].x;
                     c = base[1].x;
@@ -852,7 +859,7 @@ static void getBounds(const QVector<TTF_POINT> &points, qint16 *xmin, qint16 *xm
 static int convertToRelative(QVector<TTF_POINT> *points)
 {
     // convert points to relative and setup flags
-//     qDebug() << "relative points:";
+//     qDebug("relative points:");
     qint16 prev_x = 0;
     qint16 prev_y = 0;
     int point_array_size = 0;
@@ -973,7 +980,7 @@ static QTtfGlyph generateGlyph(int index, const QPainterPath &path, qreal advanc
 //     qDebug() << "number of contours=" << endPoints.size();
 //     for (int i = 0; i < points.size(); ++i)
 //         qDebug() << "  point[" << i << "] = " << QPoint(points.at(i).x, points.at(i).y) << " flags=" << points.at(i).flags;
-//     qDebug() << "endPoints:";
+//     qDebug("endPoints:");
 //     for (int i = 0; i < endPoints.size(); ++i)
 //         qDebug() << endPoints.at(i);
 
@@ -1055,6 +1062,7 @@ static QVector<QTtfTable> generateGlyphTables(qttf_font_tables &tables, const QV
     Q_ASSERT(hmtx.data.size() == hs.offset());
 
     QVector<QTtfTable> list;
+    list.reserve(3);
     list.append(glyf);
     list.append(loca);
     list.append(hmtx);
@@ -1137,7 +1145,7 @@ static QByteArray bindFont(const QVector<QTtfTable>& _tables)
 
     // calculate the fonts checksum and qToBigEndian into 'head's checksum_adjust
     quint32 checksum_adjust = 0xB1B0AFBA - checksum(font);
-    qToBigEndian(checksum_adjust, (uchar *)font.data() + head_offset + 8);
+    qToBigEndian(checksum_adjust, font.data() + head_offset + 8);
 
     return font;
 }
diff --git a/src/gui/text/qfontsubset_agl.cpp b/src/gui/text/qfontsubset_agl.cpp
index 5ad1dea3ab..d96808703a 100644
--- a/src/gui/text/qfontsubset_agl.cpp
+++ b/src/gui/text/qfontsubset_agl.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qfontsubset_p.h b/src/gui/text/qfontsubset_p.h
index 4abdb48c0d..a7328df4ed 100644
--- a/src/gui/text/qfontsubset_p.h
+++ b/src/gui/text/qfontsubset_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qfragmentmap.cpp b/src/gui/text/qfragmentmap.cpp
index 1211547767..7dd8999d58 100644
--- a/src/gui/text/qfragmentmap.cpp
+++ b/src/gui/text/qfragmentmap.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qfragmentmap_p.h b/src/gui/text/qfragmentmap_p.h
index 4af2d2f772..b54d7261d0 100644
--- a/src/gui/text/qfragmentmap_p.h
+++ b/src/gui/text/qfragmentmap_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -249,14 +255,11 @@ uint QFragmentMapData<Fragment>::createFragment()
     uint freePos = head->freelist;
     if (freePos == head->allocated) {
         // need to create some free space
-        if (freePos >= uint(MaxAllocSize) / fragmentSize)
-            qBadAlloc();
-        uint needed = qAllocMore((freePos+1)*fragmentSize, 0);
-        Q_ASSERT(needed/fragmentSize > head->allocated);
-        Fragment *newFragments = (Fragment *)realloc(fragments, needed);
+        auto blockInfo = qCalculateGrowingBlockSize(freePos + 1, fragmentSize);
+        Fragment *newFragments = (Fragment *)realloc(fragments, blockInfo.size);
         Q_CHECK_PTR(newFragments);
         fragments = newFragments;
-        head->allocated = needed/fragmentSize;
+        head->allocated = quint32(blockInfo.elementCount);
         F(freePos).right = 0;
     }
 
diff --git a/src/gui/text/qglyphrun.cpp b/src/gui/text/qglyphrun.cpp
index 642313d340..bd44e11dce 100644
--- a/src/gui/text/qglyphrun.cpp
+++ b/src/gui/text/qglyphrun.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -408,10 +414,7 @@ void QGlyphRun::setFlag(GlyphRunFlag flag, bool enabled)
         return;
 
     detach();
-    if (enabled)
-        d->flags |= flag;
-    else
-        d->flags &= ~flag;
+    d->flags.setFlag(flag, enabled);
 }
 
 /*!
diff --git a/src/gui/text/qglyphrun.h b/src/gui/text/qglyphrun.h
index 9f51a49a6d..6016925d27 100644
--- a/src/gui/text/qglyphrun.h
+++ b/src/gui/text/qglyphrun.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qglyphrun_p.h b/src/gui/text/qglyphrun_p.h
index 1b9e25b188..52fa03f150 100644
--- a/src/gui/text/qglyphrun_p.h
+++ b/src/gui/text/qglyphrun_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qharfbuzzng.cpp b/src/gui/text/qharfbuzzng.cpp
index b2edfc00a0..55ef9f0d15 100644
--- a/src/gui/text/qharfbuzzng.cpp
+++ b/src/gui/text/qharfbuzzng.cpp
@@ -1,32 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Copyright (C) 2013 Konstantin Ritt
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -672,14 +678,10 @@ hb_face_t *hb_qt_face_get_for_engine(QFontEngine *fe)
 {
     Q_ASSERT(fe && fe->type() != QFontEngine::Multi);
 
-    if (Q_UNLIKELY(!fe->face_)) {
-        fe->face_ = _hb_qt_face_create(fe);
-        if (Q_UNLIKELY(!fe->face_))
-            return NULL;
-        fe->face_destroy_func = _hb_qt_face_release;
-    }
+    if (Q_UNLIKELY(!fe->face_))
+        fe->face_ = QFontEngine::Holder(_hb_qt_face_create(fe), _hb_qt_face_release);
 
-    return static_cast<hb_face_t *>(fe->face_);
+    return static_cast<hb_face_t *>(fe->face_.get());
 }
 
 
@@ -722,14 +724,10 @@ hb_font_t *hb_qt_font_get_for_engine(QFontEngine *fe)
 {
     Q_ASSERT(fe && fe->type() != QFontEngine::Multi);
 
-    if (Q_UNLIKELY(!fe->font_)) {
-        fe->font_ = _hb_qt_font_create(fe);
-        if (Q_UNLIKELY(!fe->font_))
-            return NULL;
-        fe->font_destroy_func = _hb_qt_font_release;
-    }
+    if (Q_UNLIKELY(!fe->font_))
+        fe->font_ = QFontEngine::Holder(_hb_qt_font_create(fe), _hb_qt_font_release);
 
-    return static_cast<hb_font_t *>(fe->font_);
+    return static_cast<hb_font_t *>(fe->font_.get());
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/text/qharfbuzzng_p.h b/src/gui/text/qharfbuzzng_p.h
index d5e11e6264..28f20338dd 100644
--- a/src/gui/text/qharfbuzzng_p.h
+++ b/src/gui/text/qharfbuzzng_p.h
@@ -1,32 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Copyright (C) 2013 Konstantin Ritt
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp
index 0695c2eff4..0d7cb204ff 100644
--- a/src/gui/text/qplatformfontdatabase.cpp
+++ b/src/gui/text/qplatformfontdatabase.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -94,7 +100,7 @@ void QPlatformFontDatabase::registerQPF2Font(const QByteArray &dataArray, void *
             registerFont(fontName,QString(),QString(),fontWeight,fontStyle,stretch,true,false,pixelSize,false,writingSystems,handle);
         }
     } else {
-        qDebug() << "header verification of QPF2 font failed. maybe it is corrupt?";
+        qDebug("header verification of QPF2 font failed. maybe it is corrupt?");
     }
 }
 
@@ -511,7 +517,7 @@ static const quint8 requiredUnicodeBits[QFontDatabase::WritingSystemsCount][2] =
     { 14, 127 },  // Nko
 };
 
-enum {
+enum CsbBits {
     Latin1CsbBit = 0,
     CentralEuropeCsbBit = 1,
     TurkishCsbBit = 4,
diff --git a/src/gui/text/qplatformfontdatabase.h b/src/gui/text/qplatformfontdatabase.h
index 3331d96f8b..61c892ad8b 100644
--- a/src/gui/text/qplatformfontdatabase.h
+++ b/src/gui/text/qplatformfontdatabase.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp
index 66d16d6068..88b9e218fb 100644
--- a/src/gui/text/qrawfont.cpp
+++ b/src/gui/text/qrawfont.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -44,6 +50,7 @@
 #include <qpa/qplatformfontdatabase.h>
 
 #include <QtCore/qendian.h>
+#include <QtCore/qfile.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -702,13 +709,27 @@ extern int qt_script_for_writing_system(QFontDatabase::WritingSystem writingSyst
 QRawFont QRawFont::fromFont(const QFont &font, QFontDatabase::WritingSystem writingSystem)
 {
     QRawFont rawFont;
-    QFontPrivate *font_d = QFontPrivate::get(font);
+    const QFontPrivate *font_d = QFontPrivate::get(font);
     int script = qt_script_for_writing_system(writingSystem);
     QFontEngine *fe = font_d->engineForScript(script);
 
     if (fe != 0 && fe->type() == QFontEngine::Multi) {
         QFontEngineMulti *multiEngine = static_cast<QFontEngineMulti *>(fe);
         fe = multiEngine->engine(0);
+
+        if (script > QChar::Script_Latin) {
+            // keep in sync with QFontEngineMulti::loadEngine()
+            QFontDef request(multiEngine->fontDef);
+            request.styleStrategy |= QFont::NoFontMerging;
+
+            if (QFontEngine *engine = QFontDatabase::findFont(request, script)) {
+                if (request.weight > QFont::Normal)
+                    engine->fontDef.weight = request.weight;
+                if (request.style > QFont::StyleNormal)
+                    engine->fontDef.style = request.style;
+                fe = engine;
+            }
+        }
         Q_ASSERT(fe);
     }
 
diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h
index d710658a9b..aa98363229 100644
--- a/src/gui/text/qrawfont.h
+++ b/src/gui/text/qrawfont.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qrawfont_p.h b/src/gui/text/qrawfont_p.h
index b3becccfd7..ee54578cf9 100644
--- a/src/gui/text/qrawfont_p.h
+++ b/src/gui/text/qrawfont_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index 74f4b10305..a10071490e 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -700,25 +706,4 @@ void QStaticTextPrivate::init()
     needsRelayout = false;
 }
 
-QStaticTextItem::~QStaticTextItem()
-{
-    if (m_userData != 0 && !m_userData->ref.deref())
-        delete m_userData;
-    setFontEngine(0);
-}
-
-void QStaticTextItem::setFontEngine(QFontEngine *fe)
-{
-    if (m_fontEngine == fe)
-        return;
-
-    if (m_fontEngine != 0 && !m_fontEngine->ref.deref())
-        delete m_fontEngine;
-
-    m_fontEngine = fe;
-
-    if (m_fontEngine != 0)
-        m_fontEngine->ref.ref();
-}
-
 QT_END_NAMESPACE
diff --git a/src/gui/text/qstatictext.h b/src/gui/text/qstatictext.h
index 0a1d9429b4..2da74825a2 100644
--- a/src/gui/text/qstatictext.h
+++ b/src/gui/text/qstatictext.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h
index 49ca24d51c..7fdf46c101 100644
--- a/src/gui/text/qstatictext_p.h
+++ b/src/gui/text/qstatictext_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -75,46 +81,18 @@ public:
                         userDataNeedsUpdate(0), usesRawFont(0),
                         m_fontEngine(0), m_userData(0) {}
 
-    QStaticTextItem(const QStaticTextItem &other)
-    {
-        operator=(other);
-    }
-
-    void operator=(const QStaticTextItem &other)
+    void setUserData(QStaticTextUserData *newUserData)
     {
-        glyphPositions = other.glyphPositions;
-        glyphs = other.glyphs;
-        numGlyphs = other.numGlyphs;
-        font = other.font;
-        color = other.color;
-        useBackendOptimizations = other.useBackendOptimizations;
-        userDataNeedsUpdate = other.userDataNeedsUpdate;
-        usesRawFont = other.usesRawFont;
-
-        m_fontEngine = 0;
-        m_userData = 0;
-        setUserData(other.userData());
-        setFontEngine(other.fontEngine());
+        m_userData = newUserData;
     }
+    QStaticTextUserData *userData() const { return m_userData.data(); }
 
-    ~QStaticTextItem();
-
-    void setUserData(QStaticTextUserData *newUserData)
+    void setFontEngine(QFontEngine *fe)
     {
-        if (m_userData == newUserData)
-            return;
-
-        if (m_userData != 0 && !m_userData->ref.deref())
-            delete m_userData;
-
-        m_userData = newUserData;
-        if (m_userData != 0)
-            m_userData->ref.ref();
+        m_fontEngine = fe;
     }
-    QStaticTextUserData *userData() const { return m_userData; }
 
-    void setFontEngine(QFontEngine *fe);
-    QFontEngine *fontEngine() const { return m_fontEngine; }
+    QFontEngine *fontEngine() const { return m_fontEngine.data(); }
 
     union {
         QFixedPoint *glyphPositions;             // 8 bytes per glyph
@@ -135,12 +113,13 @@ public:
     char userDataNeedsUpdate : 1;                //
     char usesRawFont : 1;                        //
 
-private: // Needs special handling in setters, so private to avoid abuse
-    QFontEngine *m_fontEngine;                     // 4 bytes per item
-    QStaticTextUserData *m_userData;               // 8 bytes per item
-                                                 // ================
-                                                 // 43 bytes per item
+private: // private to avoid abuse
+    QExplicitlySharedDataPointer<QFontEngine> m_fontEngine;       // 4 bytes per item
+    QExplicitlySharedDataPointer<QStaticTextUserData> m_userData; // 8 bytes per item
+                                                                  // ================
+                                                                  // 43 bytes per item
 };
+Q_DECLARE_TYPEINFO(QStaticTextItem, Q_MOVABLE_TYPE);
 
 class QStaticText;
 class Q_AUTOTEST_EXPORT QStaticTextPrivate
diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp
index f180a839b7..d5541b0df1 100644
--- a/src/gui/text/qsyntaxhighlighter.cpp
+++ b/src/gui/text/qsyntaxhighlighter.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -44,6 +50,8 @@
 #include <qdebug.h>
 #include <qtimer.h>
 
+#include <algorithm>
+
 QT_BEGIN_NAMESPACE
 
 class QSyntaxHighlighterPrivate : public QObjectPrivate
@@ -96,15 +104,15 @@ void QSyntaxHighlighterPrivate::applyFormatChanges()
     const int preeditAreaLength = layout->preeditAreaText().length();
 
     if (preeditAreaLength != 0) {
-        QVector<QTextLayout::FormatRange>::Iterator it = ranges.begin();
-        while (it != ranges.end()) {
-            if (it->start >= preeditAreaStart
-                && it->start + it->length <= preeditAreaStart + preeditAreaLength) {
-                ++it;
-            } else {
-                it = ranges.erase(it);
-                formatsChanged = true;
-            }
+        auto isOutsidePreeditArea = [=](const QTextLayout::FormatRange &range) {
+            return range.start < preeditAreaStart
+                    || range.start + range.length > preeditAreaStart + preeditAreaLength;
+        };
+        const auto it = std::remove_if(ranges.begin(), ranges.end(),
+                                       isOutsidePreeditArea);
+        if (it != ranges.end()) {
+            ranges.erase(it, ranges.end());
+            formatsChanged = true;
         }
     } else if (!ranges.isEmpty()) {
         ranges.clear();
diff --git a/src/gui/text/qsyntaxhighlighter.h b/src/gui/text/qsyntaxhighlighter.h
index 56b9020d2c..2ccb3a68b9 100644
--- a/src/gui/text/qsyntaxhighlighter.h
+++ b/src/gui/text/qsyntaxhighlighter.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index eb51447105..f824d1b369 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtextcursor.h b/src/gui/text/qtextcursor.h
index d42d7a1a70..9610e61b39 100644
--- a/src/gui/text/qtextcursor.h
+++ b/src/gui/text/qtextcursor.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtextcursor_p.h b/src/gui/text/qtextcursor_p.h
index d3cb52d94f..84f912a3fa 100644
--- a/src/gui/text/qtextcursor_p.h
+++ b/src/gui/text/qtextcursor_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 6cccf417c7..bb44c19557 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -2424,7 +2430,7 @@ bool QTextHtmlExporter::emitCharFormatStyle(const QTextCharFormat &format)
         html += QLatin1Char(';');
         attributesEmitted = true;
     } else {
-        html.chop(qstrlen(decorationTag.latin1()));
+        html.chop(decorationTag.size());
     }
 
     if (format.foreground() != defaultCharFormat.foreground()
@@ -2659,7 +2665,7 @@ void QTextHtmlExporter::emitFragment(const QTextFragment &fragment)
     if (attributesEmitted)
         html += QLatin1String("\">");
     else
-        html.chop(qstrlen(styleTag.latin1()));
+        html.chop(styleTag.size());
 
     if (isObject) {
         for (int i = 0; isImage && i < txt.length(); ++i) {
@@ -2694,13 +2700,8 @@ void QTextHtmlExporter::emitFragment(const QTextFragment &fragment)
         // split for [\n{LineSeparator}]
         QString forcedLineBreakRegExp = QString::fromLatin1("[\\na]");
         forcedLineBreakRegExp[3] = QChar::LineSeparator;
-
-        const QStringList lines = txt.split(QRegExp(forcedLineBreakRegExp));
-        for (int i = 0; i < lines.count(); ++i) {
-            if (i > 0)
-                html += QLatin1String("<br />"); // space on purpose for compatibility with Netscape, Lynx & Co.
-            html += lines.at(i);
-        }
+        // space in BR on purpose for compatibility with old-fashioned browsers
+        html += txt.replace(QRegExp(forcedLineBreakRegExp), QLatin1String("<br />"));
     }
 
     if (attributesEmitted)
@@ -2757,26 +2758,25 @@ void QTextHtmlExporter::emitBlockAttributes(const QTextBlock &block)
     }
 
     if (format.lineHeightType() != QTextBlockFormat::SingleHeight) {
+        html += QLatin1String(" line-height:")
+             + QString::number(format.lineHeight());
         switch (format.lineHeightType()) {
             case QTextBlockFormat::ProportionalHeight:
+                html += QLatin1String("%;");
+                break;
             case QTextBlockFormat::FixedHeight:
-                html += QLatin1String(" line-height:");
+                html += QLatin1String("; -qt-line-height-type: fixed;");
                 break;
             case QTextBlockFormat::MinimumHeight:
-                html += QLatin1String(" min-height:");
+                html += QLatin1String("px;");
                 break;
             case QTextBlockFormat::LineDistanceHeight:
-                html += QLatin1String(" line-spacing:");
+                html += QLatin1String("; -qt-line-height-type: line-distance;");
                 break;
-            case QTextBlockFormat::SingleHeight:
             default:
+                html += QLatin1String(";");
                 break; // Should never reach here
         }
-        html += QString::number(format.lineHeight());
-        if (format.lineHeightType() == QTextBlockFormat::ProportionalHeight)
-            html += QLatin1String("%;");
-        else
-            html += QLatin1String("px;");
     }
 
     emitPageBreakPolicy(format.pageBreakPolicy());
@@ -3222,7 +3222,7 @@ void QTextHtmlExporter::emitFrameStyle(const QTextFrameFormat &format, FrameType
                     QString::number(format.rightMargin()));
 
     if (html.length() == originalHtmlLength) // nothing emitted?
-        html.chop(qstrlen(styleAttribute.latin1()));
+        html.chop(styleAttribute.size());
     else
         html += QLatin1Char('\"');
 }
diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h
index f05b624704..02cfa97bce 100644
--- a/src/gui/text/qtextdocument.h
+++ b/src/gui/text/qtextdocument.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index 587844c1dd..ffc5d7418b 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -229,7 +235,7 @@ void QTextDocumentPrivate::clear()
 {
     Q_Q(QTextDocument);
 
-    foreach (QTextCursorPrivate *curs, cursors) {
+    for (QTextCursorPrivate *curs : qAsConst(cursors)) {
         curs->setPosition(0);
         curs->currentCharFormat = -1;
         curs->anchor = 0;
@@ -281,7 +287,7 @@ void QTextDocumentPrivate::clear()
 
 QTextDocumentPrivate::~QTextDocumentPrivate()
 {
-    foreach (QTextCursorPrivate *curs, cursors)
+    for (QTextCursorPrivate *curs : qAsConst(cursors))
         curs->priv = 0;
     cursors.clear();
     undoState = 0;
@@ -668,7 +674,7 @@ void QTextDocumentPrivate::remove(int pos, int length, QTextUndoCommand::Operati
     blockCursorAdjustment = true;
     move(pos, -1, length, op);
     blockCursorAdjustment = false;
-    foreach (QTextCursorPrivate *curs, cursors) {
+    for (QTextCursorPrivate *curs : qAsConst(cursors)) {
         if (curs->adjustPosition(pos, -length, op) == QTextCursorPrivate::CursorMoved) {
             curs->changed = true;
         }
@@ -1000,9 +1006,9 @@ int QTextDocumentPrivate::undoRedo(bool undo)
         bool inBlock = (
                 undoState > 0
                 && undoState < undoStack.size()
-                && undoStack[undoState].block_part
-                && undoStack[undoState-1].block_part
-                && !undoStack[undoState-1].block_end
+                && undoStack.at(undoState).block_part
+                && undoStack.at(undoState - 1).block_part
+                && !undoStack.at(undoState - 1).block_end
                 );
         if (!inBlock)
             break;
@@ -1068,12 +1074,13 @@ void QTextDocumentPrivate::appendUndoItem(const QTextUndoCommand &c)
 
 
     if (!undoStack.isEmpty() && modified) {
-        QTextUndoCommand &last = undoStack[undoState - 1];
+        const int lastIdx = undoState - 1;
+        const QTextUndoCommand &last = undoStack.at(lastIdx);
 
         if ( (last.block_part && c.block_part && !last.block_end) // part of the same block => can merge
             || (!c.block_part && !last.block_part)) {  // two single undo items => can merge
 
-            if (last.tryMerge(c))
+            if (undoStack[lastIdx].tryMerge(c))
                 return;
         }
     }
@@ -1095,7 +1102,7 @@ void QTextDocumentPrivate::clearUndoRedoStacks(QTextDocument::Stacks stacksToCle
     bool redoCommandsAvailable = undoState != undoStack.size();
     if (stacksToClear == QTextDocument::UndoStack && undoCommandsAvailable) {
         for (int i = 0; i < undoState; ++i) {
-            QTextUndoCommand c = undoStack[undoState];
+            QTextUndoCommand c = undoStack.at(undoState);
             if (c.command & QTextUndoCommand::Custom)
                 delete c.custom;
         }
@@ -1107,7 +1114,7 @@ void QTextDocumentPrivate::clearUndoRedoStacks(QTextDocument::Stacks stacksToCle
     } else if (stacksToClear == QTextDocument::RedoStack
                && redoCommandsAvailable) {
         for (int i = undoState; i < undoStack.size(); ++i) {
-            QTextUndoCommand c = undoStack[i];
+            QTextUndoCommand c = undoStack.at(i);
             if (c.command & QTextUndoCommand::Custom)
                 delete c.custom;
         }
@@ -1117,12 +1124,12 @@ void QTextDocumentPrivate::clearUndoRedoStacks(QTextDocument::Stacks stacksToCle
     } else if (stacksToClear == QTextDocument::UndoAndRedoStacks
                && !undoStack.isEmpty()) {
         for (int i = 0; i < undoStack.size(); ++i) {
-            QTextUndoCommand c = undoStack[i];
+            QTextUndoCommand c = undoStack.at(i);
             if (c.command & QTextUndoCommand::Custom)
                 delete c.custom;
         }
         undoState = 0;
-        undoStack.resize(0);
+        undoStack.clear();
         if (emitSignals && undoCommandsAvailable)
             emitUndoAvailable(false);
         if (emitSignals && redoCommandsAvailable)
@@ -1180,8 +1187,8 @@ void QTextDocumentPrivate::endEditBlock()
         return;
 
     if (undoEnabled && undoState > 0) {
-        const bool wasBlocking = !undoStack[undoState - 1].block_end;
-        if (undoStack[undoState - 1].block_part) {
+        const bool wasBlocking = !undoStack.at(undoState - 1).block_end;
+        if (undoStack.at(undoState - 1).block_part) {
             undoStack[undoState - 1].block_end = true;
             if (wasBlocking)
                 emit document()->undoCommandAdded();
@@ -1226,13 +1233,13 @@ void QTextDocumentPrivate::finishEdit()
     }
 
     QList<QTextCursor> changedCursors;
-    foreach (QTextCursorPrivate *curs, cursors) {
+    for (QTextCursorPrivate *curs : qAsConst(cursors)) {
         if (curs->changed) {
             curs->changed = false;
             changedCursors.append(QTextCursor(curs));
         }
     }
-    foreach (const QTextCursor &cursor, changedCursors)
+    for (const QTextCursor &cursor : qAsConst(changedCursors))
         emit q->cursorPositionChanged(cursor);
 
     contentsChanged();
@@ -1278,7 +1285,7 @@ void QTextDocumentPrivate::adjustDocumentChangesAndCursors(int from, int addedOr
     if (blockCursorAdjustment)  {
         ; // postpone, will be called again from QTextDocumentPrivate::remove()
     } else {
-        foreach (QTextCursorPrivate *curs, cursors) {
+        for (QTextCursorPrivate *curs : qAsConst(cursors)) {
             if (curs->adjustPosition(from, addedOrRemoved, op) == QTextCursorPrivate::CursorMoved) {
                 curs->changed = true;
             }
@@ -1725,7 +1732,7 @@ bool QTextDocumentPrivate::ensureMaximumBlockCount()
 void QTextDocumentPrivate::aboutToRemoveCell(int from, int to)
 {
     Q_ASSERT(from <= to);
-    foreach (QTextCursorPrivate *curs, cursors)
+    for (QTextCursorPrivate *curs : qAsConst(cursors))
         curs->aboutToRemoveCell(from, to);
 }
 
diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h
index bcef3b2c9e..34849df0bb 100644
--- a/src/gui/text/qtextdocument_p.h
+++ b/src/gui/text/qtextdocument_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtextdocumentfragment.cpp b/src/gui/text/qtextdocumentfragment.cpp
index 71e24efc4d..5727b34e86 100644
--- a/src/gui/text/qtextdocumentfragment.cpp
+++ b/src/gui/text/qtextdocumentfragment.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -422,7 +428,7 @@ QTextHtmlImporter::QTextHtmlImporter(QTextDocument *_doc, const QString &_html,
     QString html = _html;
     const int startFragmentPos = html.indexOf(QLatin1String("<!--StartFragment-->"));
     if (startFragmentPos != -1) {
-        QString qt3RichTextHeader(QLatin1String("<meta name=\"qrichtext\" content=\"1\" />"));
+        const QLatin1String qt3RichTextHeader("<meta name=\"qrichtext\" content=\"1\" />");
 
         // Hack for Qt3
         const bool hasQtRichtextMetaTag = html.contains(qt3RichTextHeader);
@@ -845,7 +851,7 @@ QTextHtmlImporter::Table QTextHtmlImporter::scanTable(int tableNodeIdx)
     int tableHeaderRowCount = 0;
     QVector<int> rowNodes;
     rowNodes.reserve(at(tableNodeIdx).children.count());
-    foreach (int row, at(tableNodeIdx).children)
+    for (int row : at(tableNodeIdx).children) {
         switch (at(row).id) {
             case Html_tr:
                 rowNodes += row;
@@ -853,28 +859,30 @@ QTextHtmlImporter::Table QTextHtmlImporter::scanTable(int tableNodeIdx)
             case Html_thead:
             case Html_tbody:
             case Html_tfoot:
-                foreach (int potentialRow, at(row).children)
+                for (int potentialRow : at(row).children) {
                     if (at(potentialRow).id == Html_tr) {
                         rowNodes += potentialRow;
                         if (at(row).id == Html_thead)
                             ++tableHeaderRowCount;
                     }
+                }
                 break;
             default: break;
         }
+    }
 
     QVector<RowColSpanInfo> rowColSpans;
     QVector<RowColSpanInfo> rowColSpanForColumn;
 
     int effectiveRow = 0;
-    foreach (int row, rowNodes) {
+    for (int row : qAsConst(rowNodes)) {
         int colsInRow = 0;
 
-        foreach (int cell, at(row).children)
+        for (int cell : at(row).children) {
             if (at(cell).isTableCell()) {
                 // skip all columns with spans from previous rows
                 while (colsInRow < rowColSpanForColumn.size()) {
-                    const RowColSpanInfo &spanInfo = rowColSpanForColumn[colsInRow];
+                    const RowColSpanInfo &spanInfo = rowColSpanForColumn.at(colsInRow);
 
                     if (spanInfo.row + spanInfo.rowSpan > effectiveRow) {
                         Q_ASSERT(spanInfo.col == colsInRow);
@@ -907,6 +915,7 @@ QTextHtmlImporter::Table QTextHtmlImporter::scanTable(int tableNodeIdx)
                     rowColSpanForColumn[i] = spanInfo;
                 }
             }
+        }
 
         table.columns = qMax(table.columns, colsInRow);
 
@@ -1072,8 +1081,8 @@ QTextHtmlImporter::ProcessNodeResult QTextHtmlImporter::processBlockNode()
         && indent != 0
         && (lists.isEmpty()
             || !hasBlock
-            || !lists.last().list
-            || lists.last().list->itemNumber(cursor.block()) == -1
+            || !lists.constLast().list
+            || lists.constLast().list->itemNumber(cursor.block()) == -1
            )
        ) {
         block.setIndent(indent);
diff --git a/src/gui/text/qtextdocumentfragment.h b/src/gui/text/qtextdocumentfragment.h
index ae90baf4d8..d1c1adfd0a 100644
--- a/src/gui/text/qtextdocumentfragment.h
+++ b/src/gui/text/qtextdocumentfragment.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtextdocumentfragment_p.h b/src/gui/text/qtextdocumentfragment_p.h
index 22b39bc1e5..56dff01149 100644
--- a/src/gui/text/qtextdocumentfragment_p.h
+++ b/src/gui/text/qtextdocumentfragment_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -142,6 +148,7 @@ private:
         int listNode;
         QPointer<QTextList> list;
     };
+    friend class QTypeInfo<List>;
     QVector<List> lists;
     int indent;
 
@@ -181,6 +188,7 @@ private:
         int row;
         int column;
     };
+    friend class QTypeInfo<TableCellIterator>;
 
     friend struct Table;
     struct Table
@@ -194,6 +202,7 @@ private:
         TableCellIterator currentCell;
         int lastIndent;
     };
+    friend class QTypeInfo<Table>;
     QVector<Table> tables;
 
     struct RowColSpanInfo
@@ -201,6 +210,7 @@ private:
         int row, col;
         int rowSpan, colSpan;
     };
+    friend class QTypeInfo<RowColSpanInfo>;
 
     enum WhiteSpace
     {
@@ -221,6 +231,10 @@ private:
     int currentNodeIdx;
     const QTextHtmlParserNode *currentNode;
 };
+Q_DECLARE_TYPEINFO(QTextHtmlImporter::List, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTextHtmlImporter::TableCellIterator, Q_PRIMITIVE_TYPE);
+Q_DECLARE_TYPEINFO(QTextHtmlImporter::Table, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTextHtmlImporter::RowColSpanInfo, Q_PRIMITIVE_TYPE);
 
 QT_END_NAMESPACE
 #endif // QT_NO_TEXTHTMLPARSER
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index c7bbcea4f4..b6cbd9617f 100644
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -259,7 +265,7 @@ void QTextTableData::updateTableSize()
     const QFixed effectiveLeftMargin = this->leftMargin + border + padding;
     const QFixed effectiveRightMargin = this->rightMargin + border + padding;
     size.height = contentsHeight == -1
-                   ? rowPositions.last() + heights.last() + padding + border + cellSpacing + effectiveBottomMargin
+                   ? rowPositions.constLast() + heights.constLast() + padding + border + cellSpacing + effectiveBottomMargin
                    : effectiveTopMargin + contentsHeight + effectiveBottomMargin;
     size.width = effectiveLeftMargin + contentsWidth + effectiveRightMargin;
 }
@@ -1232,7 +1238,7 @@ void QTextDocumentLayoutPrivate::drawFlow(const QPointF &offset, QPainter *paint
 
             // if we're past what is already laid out then we're better off
             // not trying to draw things that may not be positioned correctly yet
-            if (currentPosInDoc >= checkPoints.last().positionInFrame)
+            if (currentPosInDoc >= checkPoints.constLast().positionInFrame)
                 break;
 
             if (lastVisibleCheckPoint != checkPoints.end()
@@ -1592,7 +1598,7 @@ QTextLayoutStruct QTextDocumentLayoutPrivate::layoutCell(QTextTable *t, const QT
     // floats in other cells we must clear the list here.
     data(t)->floats.clear();
 
-//    qDebug() << "layoutCell done";
+//    qDebug("layoutCell done");
 
     return layoutStruct;
 }
@@ -1792,7 +1798,7 @@ recalc_minmax_widths:
         td->columnPositions[i] = td->columnPositions.at(i-1) + td->widths.at(i-1) + 2 * td->border + cellSpacing;
 
     // - margin to compensate the + margin in columnPositions[0]
-    const QFixed contentsWidth = td->columnPositions.last() + td->widths.last() + td->padding + td->border + cellSpacing - leftMargin;
+    const QFixed contentsWidth = td->columnPositions.constLast() + td->widths.constLast() + td->padding + td->border + cellSpacing - leftMargin;
 
     // if the table is too big and causes an overflow re-do the layout with WrapAnywhere as wrap
     // mode
@@ -1839,14 +1845,14 @@ recalc_minmax_widths:
         td->calcRowPosition(r);
 
         const int tableStartPage = (absoluteTableY / pageHeight).truncate();
-        const int currentPage = ((td->rowPositions[r] + absoluteTableY) / pageHeight).truncate();
+        const int currentPage = ((td->rowPositions.at(r) + absoluteTableY) / pageHeight).truncate();
         const QFixed pageBottom = (currentPage + 1) * pageHeight - td->effectiveBottomMargin - absoluteTableY - cellSpacing - td->border;
         const QFixed pageTop = currentPage * pageHeight + td->effectiveTopMargin - absoluteTableY + cellSpacing + td->border;
         const QFixed nextPageTop = pageTop + pageHeight;
 
-        if (td->rowPositions[r] > pageBottom)
+        if (td->rowPositions.at(r) > pageBottom)
             td->rowPositions[r] = nextPageTop;
-        else if (td->rowPositions[r] < pageTop)
+        else if (td->rowPositions.at(r) < pageTop)
             td->rowPositions[r] = pageTop;
 
         bool dropRowToNextPage = true;
@@ -1857,7 +1863,7 @@ recalc_minmax_widths:
         QFixed dropDistance = 0;
 
 relayout:
-        const int rowStartPage = ((td->rowPositions[r] + absoluteTableY) / pageHeight).truncate();
+        const int rowStartPage = ((td->rowPositions.at(r) + absoluteTableY) / pageHeight).truncate();
         // if any of the header rows or the first non-header row start on the next page
         // then the entire header should be dropped
         if (r <= headerRowCount && rowStartPage > tableStartPage && !hasDroppedTable) {
@@ -1921,13 +1927,13 @@ relayout:
         }
 
         if (rowCellCount > 0 && dropRowToNextPage) {
-            dropDistance = nextPageTop - td->rowPositions[r];
+            dropDistance = nextPageTop - td->rowPositions.at(r);
             td->rowPositions[r] = nextPageTop;
             td->heights[r] = 0;
             dropRowToNextPage = false;
             cellHeights.resize(cellCountBeforeRow);
             if (r > headerRowCount)
-                td->heights[r-1] = pageBottom - td->rowPositions[r-1];
+                td->heights[r - 1] = pageBottom - td->rowPositions.at(r - 1);
             goto relayout;
         }
 
@@ -1938,7 +1944,7 @@ relayout:
         }
 
         if (r == headerRowCount - 1) {
-            td->headerHeight = td->rowPositions[r] + td->heights[r] - td->rowPositions[0] + td->cellSpacing + 2 * td->border;
+            td->headerHeight = td->rowPositions.at(r) + td->heights.at(r) - td->rowPositions.at(0) + td->cellSpacing + 2 * td->border;
             td->headerHeight -= td->headerHeight * (td->headerHeight / pageHeight).truncate();
             td->effectiveTopMargin += td->headerHeight;
         }
@@ -2024,7 +2030,7 @@ void QTextDocumentLayoutPrivate::positionFloat(QTextFrame *frame, QTextLine *cur
 //         qDebug() << "have line: right=" << right << "left=" << left << "textWidth=" << currentLine->width();
         if (right - left < QFixed::fromReal(currentLine->naturalTextWidth()) + fd->size.width) {
             layoutStruct->pendingFloats.append(frame);
-//             qDebug() << "    adding to pending list";
+//             qDebug("    adding to pending list");
             return;
         }
     }
@@ -2298,7 +2304,7 @@ void QTextDocumentLayoutPrivate::layoutFlow(QTextFrame::Iterator it, QTextLayout
             docPos = it.currentBlock().position();
 
         if (inRootFrame) {
-            if (qAbs(layoutStruct->y - checkPoints.last().y) > 2000) {
+            if (qAbs(layoutStruct->y - checkPoints.constLast().y) > 2000) {
                 QFixed left, right;
                 floatMargins(layoutStruct->y, layoutStruct, &left, &right);
                 if (left == layoutStruct->x_left && right == layoutStruct->x_right) {
@@ -2537,7 +2543,7 @@ void QTextDocumentLayoutPrivate::layoutFlow(QTextFrame::Iterator it, QTextLayout
             contentHasAlignment = true;
 
         if (it.atEnd()) {
-            //qDebug() << "layout done!";
+            //qDebug("layout done!");
             currentLazyLayoutPosition = -1;
             QCheckPoint cp;
             cp.y = layoutStruct->y;
@@ -2548,7 +2554,7 @@ void QTextDocumentLayoutPrivate::layoutFlow(QTextFrame::Iterator it, QTextLayout
             checkPoints.append(cp);
             checkPoints.reserve(checkPoints.size());
         } else {
-            currentLazyLayoutPosition = checkPoints.last().positionInFrame;
+            currentLazyLayoutPosition = checkPoints.constLast().positionInFrame;
             // #######
             //checkPoints.last().positionInFrame = q->document()->docHandle()->length();
         }
@@ -2895,14 +2901,12 @@ static void markFrames(QTextFrame *current, int from, int oldLength, int length)
         return;
 
     QTextFrameData *fd = data(current);
-    for (int i = 0; i < fd->floats.size(); ++i) {
-        QTextFrame *f = fd->floats[i];
-        if (!f) {
-            // float got removed in editing operation
-            fd->floats.removeAt(i);
-            --i;
-        }
-    }
+    // float got removed in editing operation
+    QTextFrame *null = nullptr; // work-around for (at least) MSVC 2012 emitting
+                                // warning C4100 for its own header <algorithm>
+                                // when passing nullptr directly to std::remove
+    fd->floats.erase(std::remove(fd->floats.begin(), fd->floats.end(), null),
+                     fd->floats.end());
 
     fd->layoutDirty = true;
     fd->sizeDirty = true;
diff --git a/src/gui/text/qtextdocumentlayout_p.h b/src/gui/text/qtextdocumentlayout_p.h
index e42443ee87..a9cd6cf289 100644
--- a/src/gui/text/qtextdocumentlayout_p.h
+++ b/src/gui/text/qtextdocumentlayout_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtextdocumentwriter.cpp b/src/gui/text/qtextdocumentwriter.cpp
index 9c430ea67b..a7c58ac2a6 100644
--- a/src/gui/text/qtextdocumentwriter.cpp
+++ b/src/gui/text/qtextdocumentwriter.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -265,7 +271,7 @@ bool QTextDocumentWriter::write(const QTextDocument *document)
 #ifndef QT_NO_TEXTHTMLPARSER
     if (format == "html" || format == "htm") {
         if (!d->device->isWritable() && ! d->device->open(QIODevice::WriteOnly)) {
-            qWarning() << "QTextDocumentWriter::write: the device can not be opened for writing";
+            qWarning("QTextDocumentWriter::write: the device can not be opened for writing");
             return false;
         }
         QTextStream ts(d->device);
@@ -279,7 +285,7 @@ bool QTextDocumentWriter::write(const QTextDocument *document)
 #endif
     if (format == "txt" || format == "plaintext") {
         if (!d->device->isWritable() && ! d->device->open(QIODevice::WriteOnly)) {
-            qWarning() << "QTextDocumentWriter::write: the device can not be opened for writing";
+            qWarning("QTextDocumentWriter::write: the device can not be opened for writing");
             return false;
         }
         QTextStream ts(d->device);
diff --git a/src/gui/text/qtextdocumentwriter.h b/src/gui/text/qtextdocumentwriter.h
index 76bf3e9b24..b7917e55a4 100644
--- a/src/gui/text/qtextdocumentwriter.h
+++ b/src/gui/text/qtextdocumentwriter.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index f569c6e795..4205774ee9 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -810,7 +816,7 @@ void QTextEngine::bidiReorder(int numItems, const quint8 *levels, int *visualOrd
     }
 
 #if (BIDI_DEBUG >= 1)
-//     qDebug() << "visual order is:";
+//     qDebug("visual order is:");
 //     for (i = 0; i < numItems; i++)
 //         qDebug() << visualOrder[i];
 #endif
@@ -1563,8 +1569,13 @@ void QTextEngine::validate() const
     layoutData = new LayoutData();
     if (block.docHandle()) {
         layoutData->string = block.text();
-        if (option.flags() & QTextOption::ShowLineAndParagraphSeparators)
-            layoutData->string += QLatin1Char(block.next().isValid() ? 0xb6 : 0x20);
+        const bool nextBlockValid = block.next().isValid();
+        if (!nextBlockValid && option.flags() & QTextOption::ShowDocumentTerminator) {
+            layoutData->string += QChar(0xA7);
+        } else if (option.flags() & QTextOption::ShowLineAndParagraphSeparators) {
+            layoutData->string += QLatin1Char(nextBlockValid ? 0xb6 : 0x20);
+        }
+
     } else {
         layoutData->string = text;
     }
@@ -3056,7 +3067,7 @@ void QTextEngine::resolveFormats() const
             format = collection->charFormat(formatIndex(si));
         }
         if (!currentFormats.isEmpty()) {
-            foreach (int cur, currentFormats) {
+            for (int cur : currentFormats) {
                 const QTextLayout::FormatRange &range = specialData->formats.at(cur);
                 Q_ASSERT(range.start <= si->position && range.start + range.length >= end);
                 format.merge(range.format);
@@ -3271,7 +3282,7 @@ int QTextEngine::endOfLine(int lineNum)
     insertionPointsForLine(lineNum, insertionPoints);
 
     if (insertionPoints.size() > 0)
-        return insertionPoints.last();
+        return insertionPoints.constLast();
     return 0;
 }
 
@@ -3281,7 +3292,7 @@ int QTextEngine::beginningOfLine(int lineNum)
     insertionPointsForLine(lineNum, insertionPoints);
 
     if (insertionPoints.size() > 0)
-        return insertionPoints.first();
+        return insertionPoints.constFirst();
     return 0;
 }
 
@@ -3357,7 +3368,7 @@ void QTextEngine::drawItemDecorationList(QPainter *painter, const ItemDecoration
     if (decorationList.isEmpty())
         return;
 
-    foreach (const ItemDecoration &decoration, decorationList) {
+    for (const ItemDecoration &decoration : decorationList) {
         painter->setPen(decoration.pen);
         painter->drawLine(QLineF(decoration.x1, decoration.y, decoration.x2, decoration.y));
     }
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index 7e507bba2d..56c9825cc1 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -174,6 +180,7 @@ struct QGlyphAttributes {
     uchar reserved      : 2;
 };
 Q_STATIC_ASSERT(sizeof(QGlyphAttributes) == 1);
+Q_DECLARE_TYPEINFO(QGlyphAttributes, Q_PRIMITIVE_TYPE);
 
 struct QGlyphLayout
 {
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index 277d946202..8adeb3e659 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -257,6 +263,7 @@ private:
     friend QDataStream &operator<<(QDataStream &, const QTextFormat &);
     friend QDataStream &operator>>(QDataStream &, QTextFormat &);
 };
+Q_DECLARE_TYPEINFO(QTextFormatPrivate::Property, Q_MOVABLE_TYPE);
 
 static inline uint hash(const QColor &color)
 {
@@ -3456,7 +3463,7 @@ void QTextFormatCollection::setDefaultFont(const QFont &f)
 {
     defaultFnt = f;
     for (int i = 0; i < formats.count(); ++i)
-        if (formats[i].d)
+        if (formats.at(i).d)
             formats[i].d->resolveFont(defaultFnt);
 }
 
diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h
index dbc50f70f9..805affd87c 100644
--- a/src/gui/text/qtextformat.h
+++ b/src/gui/text/qtextformat.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -110,6 +116,7 @@ private:
     friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QTextLength &);
     friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QTextLength &);
 };
+Q_DECLARE_TYPEINFO(QTextLength, QT_VERSION >= QT_VERSION_CHECK(6,0,0) ? Q_PRIMITIVE_TYPE : Q_RELOCATABLE_TYPE);
 
 inline QTextLength::QTextLength(Type atype, qreal avalue)
     : lengthType(atype), fixedValueOrPercentage(avalue) {}
diff --git a/src/gui/text/qtextformat_p.h b/src/gui/text/qtextformat_p.h
index 928cef6488..45a432d2f5 100644
--- a/src/gui/text/qtextformat_p.h
+++ b/src/gui/text/qtextformat_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp
index 9c758bee60..d18d432f46 100644
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -487,7 +493,7 @@ static QString quoteNewline(const QString &s)
 
 QTextHtmlParserNode::QTextHtmlParserNode()
     : parent(0), id(Html_unknown),
-      cssFloat(QTextFrameFormat::InFlow), hasOwnListStyle(false),
+      cssFloat(QTextFrameFormat::InFlow), hasOwnListStyle(false), hasOwnLineHeightType(false),
       hasCssListIndent(false), isEmptyParagraph(false), isTextFrame(false), isRootFrame(false),
       displayMode(QTextHtmlElement::DisplayInline), hasHref(false),
       listStyle(QTextListFormat::ListStyleUndefined), imageWidth(-1), imageHeight(-1), tableBorder(0),
@@ -660,7 +666,7 @@ void QTextHtmlParser::parseTag()
     if (hasPrefix(QLatin1Char('/'))) {
         if (nodes.last().id == Html_style) {
 #ifndef QT_NO_CSSPARSER
-            QCss::Parser parser(nodes.last().text);
+            QCss::Parser parser(nodes.constLast().text);
             QCss::StyleSheet sheet;
             sheet.origin = QCss::StyleSheetOrigin_Author;
             parser.parse(&sheet, Qt::CaseInsensitive);
@@ -1141,6 +1147,7 @@ void QTextHtmlParserNode::setListStyle(const QVector<QCss::Value> &cssValues)
     for (int i = 0; i < cssValues.count(); ++i) {
         if (cssValues.at(i).type == QCss::Value::KnownIdentifier) {
             switch (static_cast<QCss::KnownValue>(cssValues.at(i).variant.toInt())) {
+                case QCss::Value_None: hasOwnListStyle = true; listStyle = QTextListFormat::ListStyleUndefined; break;
                 case QCss::Value_Disc: hasOwnListStyle = true; listStyle = QTextListFormat::ListDisc; break;
                 case QCss::Value_Square: hasOwnListStyle = true; listStyle = QTextListFormat::ListSquare; break;
                 case QCss::Value_Circle: hasOwnListStyle = true; listStyle = QTextListFormat::ListCircle; break;
@@ -1192,20 +1199,48 @@ void QTextHtmlParserNode::applyCssDeclarations(const QVector<QCss::Declaration>
         case QCss::QtBlockIndent:
             blockFormat.setIndent(decl.d->values.first().variant.toInt());
             break;
-       case QCss::LineHeight: {
+        case QCss::QtLineHeightType: {
+            QString lineHeightTypeName = decl.d->values.first().variant.toString();
+            QTextBlockFormat::LineHeightTypes lineHeightType;
+            if (lineHeightTypeName.compare(QLatin1String("proportional"), Qt::CaseInsensitive) == 0)
+                lineHeightType = QTextBlockFormat::ProportionalHeight;
+            else if (lineHeightTypeName.compare(QLatin1String("fixed"), Qt::CaseInsensitive) == 0)
+                lineHeightType = QTextBlockFormat::FixedHeight;
+            else if (lineHeightTypeName.compare(QLatin1String("minimum"), Qt::CaseInsensitive) == 0)
+                lineHeightType = QTextBlockFormat::MinimumHeight;
+            else if (lineHeightTypeName.compare(QLatin1String("line-distance"), Qt::CaseInsensitive) == 0)
+                lineHeightType = QTextBlockFormat::LineDistanceHeight;
+            else
+                lineHeightType = QTextBlockFormat::SingleHeight;
+
+            blockFormat.setProperty(QTextBlockFormat::LineHeightType, lineHeightType);
+            hasOwnLineHeightType = true;
+        }
+        break;
+        case QCss::LineHeight: {
             qreal lineHeight;
+            QTextBlockFormat::LineHeightTypes lineHeightType;
             if (decl.realValue(&lineHeight, "px")) {
-                blockFormat.setLineHeight(lineHeight, QTextBlockFormat::FixedHeight);
+                lineHeightType = QTextBlockFormat::MinimumHeight;
             } else {
                 bool ok;
                 QString value = decl.d->values.first().toString();
                 lineHeight = value.toDouble(&ok);
-                if (ok)
-                    blockFormat.setLineHeight(lineHeight, QTextBlockFormat::ProportionalHeight);
-                else
-                    blockFormat.setLineHeight(0, QTextBlockFormat::SingleHeight);
+                if (ok) {
+                    lineHeightType = QTextBlockFormat::ProportionalHeight;
+                } else {
+                    lineHeight = 0.0;
+                    lineHeightType = QTextBlockFormat::SingleHeight;
+                }
             }
-            break; }
+
+            // Only override line height type if specified in same node
+            if (hasOwnLineHeightType)
+                lineHeightType = QTextBlockFormat::LineHeightTypes(blockFormat.lineHeightType());
+
+            blockFormat.setLineHeight(lineHeight, lineHeightType);
+            break;
+        }
         case QCss::TextIndent: {
             qreal indent = 0;
             if (decl.realValue(&indent, "px"))
@@ -1384,16 +1419,16 @@ static bool setFloatAttribute(qreal *destination, const QString &value)
     return ok;
 }
 
-static void setWidthAttribute(QTextLength *width, QString value)
+static void setWidthAttribute(QTextLength *width, const QString &valueStr)
 {
     bool ok = false;
-    qreal realVal = value.toDouble(&ok);
+    qreal realVal = valueStr.toDouble(&ok);
     if (ok) {
         *width = QTextLength(QTextLength::FixedLength, realVal);
     } else {
-        value = value.trimmed();
+        QStringRef value = QStringRef(&valueStr).trimmed();
         if (!value.isEmpty() && value.endsWith(QLatin1Char('%'))) {
-            value.chop(1);
+            value.truncate(value.size() - 1);
             realVal = value.toDouble(&ok);
             if (ok)
                 *width = QTextLength(QTextLength::PercentageLength, realVal);
@@ -1404,9 +1439,7 @@ static void setWidthAttribute(QTextLength *width, QString value)
 #ifndef QT_NO_CSSPARSER
 void QTextHtmlParserNode::parseStyleAttribute(const QString &value, const QTextDocument *resourceProvider)
 {
-    QString css = value;
-    css.prepend(QLatin1String("* {"));
-    css.append(QLatin1Char('}'));
+    const QString css = QLatin1String("* {") + value + QLatin1Char('}');
     QCss::Parser parser(css);
     QCss::StyleSheet sheet;
     parser.parse(&sheet, Qt::CaseInsensitive);
@@ -1496,6 +1529,8 @@ void QTextHtmlParser::applyAttributes(const QStringList &attributes)
                             node->listStyle = QTextListFormat::ListDisc;
                         else if (value == QLatin1String("circle"))
                             node->listStyle = QTextListFormat::ListCircle;
+                        else if (value == QLatin1String("none"))
+                            node->listStyle = QTextListFormat::ListStyleUndefined;
                     }
                 }
                 break;
diff --git a/src/gui/text/qtexthtmlparser_p.h b/src/gui/text/qtexthtmlparser_p.h
index 85769c3779..38c9108f75 100644
--- a/src/gui/text/qtexthtmlparser_p.h
+++ b/src/gui/text/qtexthtmlparser_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -165,6 +171,7 @@ struct QTextHtmlParserNode {
     QTextBlockFormat blockFormat;
     uint cssFloat : 2;
     uint hasOwnListStyle : 1;
+    uint hasOwnLineHeightType : 1;
     uint hasCssListIndent : 1;
     uint isEmptyParagraph : 1;
     uint isTextFrame : 1;
@@ -322,12 +329,14 @@ protected:
         QString url;
         QCss::StyleSheet sheet;
     };
+    friend class QTypeInfo<ExternalStyleSheet>;
     QVector<ExternalStyleSheet> externalStyleSheets;
     QVector<QCss::StyleSheet> inlineStyleSheets;
 #endif
 
     const QTextDocument *resourceProvider;
 };
+Q_DECLARE_TYPEINFO(QTextHtmlParser::ExternalStyleSheet, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/gui/text/qtextimagehandler.cpp b/src/gui/text/qtextimagehandler.cpp
index 16d81a7d6d..18311ed161 100644
--- a/src/gui/text/qtextimagehandler.cpp
+++ b/src/gui/text/qtextimagehandler.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -38,6 +44,7 @@
 #include <qtextformat.h>
 #include <qpainter.h>
 #include <qdebug.h>
+#include <qfile.h>
 #include <private/qtextengine_p.h>
 #include <qpalette.h>
 #include <qthread.h>
@@ -104,7 +111,7 @@ static QPixmap getPixmap(QTextDocument *doc, const QTextImageFormat &format, con
         doc->addResource(QTextDocument::ImageResource, url, pm);
     }
 
-    if (name.contains(QStringLiteral("@2x")))
+    if (name.contains(QLatin1String("@2x")))
         pm.setDevicePixelRatio(sourcePixelRatio);
 
     return pm;
diff --git a/src/gui/text/qtextimagehandler_p.h b/src/gui/text/qtextimagehandler_p.h
index 5cdbe99530..4bc19d49c3 100644
--- a/src/gui/text/qtextimagehandler_p.h
+++ b/src/gui/text/qtextimagehandler_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index aca475a581..3b1ee8ec03 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -2969,7 +2975,7 @@ int QTextLine::xToCursor(qreal _x, CursorPosition cpos) const
         }
     }
     // right of last item
-//     qDebug() << "right of last";
+//     qDebug("right of last");
     int item = visualOrder[nItems-1]+firstItem;
     QScriptItem &si = eng->layoutData->items[item];
     if (!si.num_glyphs)
diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
index f74d4d4229..1cbb5ac8d8 100644
--- a/src/gui/text/qtextlayout.h
+++ b/src/gui/text/qtextlayout.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -197,6 +203,7 @@ private:
                                QPainter *painter);
     QTextEngine *d;
 };
+Q_DECLARE_TYPEINFO(QTextLayout::FormatRange, Q_RELOCATABLE_TYPE);
 
 
 class Q_GUI_EXPORT QTextLine
diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp
index 884b5f178b..bec33d5f4d 100644
--- a/src/gui/text/qtextlist.cpp
+++ b/src/gui/text/qtextlist.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtextlist.h b/src/gui/text/qtextlist.h
index 12de39be17..71da175a14 100644
--- a/src/gui/text/qtextlist.h
+++ b/src/gui/text/qtextlist.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp
index e1cfd22295..e2130a09d9 100644
--- a/src/gui/text/qtextobject.cpp
+++ b/src/gui/text/qtextobject.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -667,10 +673,12 @@ QTextFrame::iterator::iterator(QTextFrame *frame, int block, int begin, int end)
     cb = block;
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+
 /*!
     Copy constructor. Constructs a copy of the \a other iterator.
 */
-QTextFrame::iterator::iterator(const iterator &other)
+QTextFrame::iterator::iterator(const iterator &other) Q_DECL_NOTHROW
 {
     f = other.f;
     b = other.b;
@@ -683,7 +691,7 @@ QTextFrame::iterator::iterator(const iterator &other)
     Assigns \a other to this iterator and returns a reference to
     this iterator.
 */
-QTextFrame::iterator &QTextFrame::iterator::operator=(const iterator &other)
+QTextFrame::iterator &QTextFrame::iterator::operator=(const iterator &other) Q_DECL_NOTHROW
 {
     f = other.f;
     b = other.b;
@@ -693,6 +701,8 @@ QTextFrame::iterator &QTextFrame::iterator::operator=(const iterator &other)
     return *this;
 }
 
+#endif
+
 /*!
     Returns the current frame pointed to by the iterator, or 0 if the
     iterator currently points to a block.
diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h
index fbb90e42b0..d3f6b3d0ac 100644
--- a/src/gui/text/qtextobject.h
+++ b/src/gui/text/qtextobject.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -142,9 +148,15 @@ public:
         friend class QTextDocumentLayoutPrivate;
         iterator(QTextFrame *frame, int block, int begin, int end);
     public:
-        iterator();
-        iterator(const iterator &o);
-        iterator &operator=(const iterator &o);
+        iterator(); // ### Qt 6: inline
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
+        iterator(const iterator &o) Q_DECL_NOTHROW; // = default
+        iterator &operator=(const iterator &o) Q_DECL_NOTHROW; // = default
+        iterator(iterator &&other) Q_DECL_NOTHROW // = default
+        { memcpy(this, &other, sizeof(iterator)); }
+        iterator &operator=(iterator &&other) Q_DECL_NOTHROW // = default
+        { memcpy(this, &other, sizeof(iterator)); return *this; }
+#endif
 
         QTextFrame *parentFrame() const { return f; }
 
@@ -248,7 +260,9 @@ public:
         iterator(const QTextDocumentPrivate *priv, int begin, int end, int f) : p(priv), b(begin), e(end), n(f) {}
     public:
         iterator() : p(Q_NULLPTR), b(0), e(0), n(0) {}
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
         iterator(const iterator &o) : p(o.p), b(o.b), e(o.e), n(o.n) {}
+#endif
 
         QTextFragment fragment() const;
 
diff --git a/src/gui/text/qtextobject_p.h b/src/gui/text/qtextobject_p.h
index 19d1dadd5f..ffc331e99d 100644
--- a/src/gui/text/qtextobject_p.h
+++ b/src/gui/text/qtextobject_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index 1fd20cfbef..ad537b7126 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -763,7 +769,7 @@ bool QTextOdfWriter::writeAll()
         m_strategy = new QXmlStreamStrategy(m_device);
 
     if (!m_device->isWritable() && ! m_device->open(QIODevice::WriteOnly)) {
-        qWarning() << "QTextOdfWriter::writeAll: the device can not be opened for writing";
+        qWarning("QTextOdfWriter::writeAll: the device can not be opened for writing");
         return false;
     }
     QXmlStreamWriter writer(m_strategy->contentStream);
@@ -806,10 +812,10 @@ bool QTextOdfWriter::writeAll()
     }
 
     // add objects for lists, frames and tables
-    QVector<QTextFormat> allFormats = m_document->allFormats();
-    QList<int> copy = formats.toList();
-    for (QList<int>::Iterator iter = copy.begin(); iter != copy.end(); ++iter) {
-        QTextObject *object = m_document->objectForFormat(allFormats[*iter]);
+    const QVector<QTextFormat> allFormats = m_document->allFormats();
+    const QList<int> copy = formats.toList();
+    for (auto index : copy) {
+        QTextObject *object = m_document->objectForFormat(allFormats[index]);
         if (object)
             formats << object->formatIndex();
     }
diff --git a/src/gui/text/qtextodfwriter_p.h b/src/gui/text/qtextodfwriter_p.h
index 15a4b40796..d4cd91f8a3 100644
--- a/src/gui/text/qtextodfwriter_p.h
+++ b/src/gui/text/qtextodfwriter_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtextoption.cpp b/src/gui/text/qtextoption.cpp
index 5a4f6b7954..87e31eeb2c 100644
--- a/src/gui/text/qtextoption.cpp
+++ b/src/gui/text/qtextoption.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -147,7 +153,7 @@ void QTextOption::setTabArray(const QList<qreal> &tabStops)
     QList<QTextOption::Tab> tabs;
     QTextOption::Tab tab;
     tabs.reserve(tabStops.count());
-    foreach (qreal pos, tabStops) {
+    for (qreal pos : tabStops) {
         tab.position = pos;
         tabs.append(tab);
     }
@@ -303,6 +309,8 @@ QList<QTextOption::Tab> QTextOption::tabs() const
                                this width is excluded.
   \value ShowTabsAndSpaces Visualize spaces with little dots, and tabs with little arrows.
   \value ShowLineAndParagraphSeparators Visualize line and paragraph separators with appropriate symbol characters.
+  \value ShowDocumentTerminator Visualize the end of the document with a section sign. This enum value was added
+            in Qt 5.7.
   \value AddSpaceForLineAndParagraphSeparators While determining the line-break positions take into account the
             space added for drawing a separator character.
   \value SuppressColors Suppress all color changes in the character formats (except the main selection).
diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h
index b2e4476927..f9c24ffeaf 100644
--- a/src/gui/text/qtextoption.h
+++ b/src/gui/text/qtextoption.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -103,6 +109,7 @@ public:
         ShowLineAndParagraphSeparators = 0x2,
         AddSpaceForLineAndParagraphSeparators = 0x4,
         SuppressColors = 0x8,
+        ShowDocumentTerminator = 0x10,
         IncludeTrailingSpaces = 0x80000000
     };
     Q_DECLARE_FLAGS(Flags, Flag)
diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp
index 553dc3c772..e4a3c2b915 100644
--- a/src/gui/text/qtexttable.cpp
+++ b/src/gui/text/qtexttable.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -385,7 +391,7 @@ int QTextTablePrivate::findCellIndex(int fragment) const
 {
     QFragmentFindHelper helper(pieceTable->fragmentMap().position(fragment),
                               pieceTable->fragmentMap());
-    QList<int>::ConstIterator it = std::lower_bound(cells.constBegin(), cells.constEnd(), helper);
+    const auto it = std::lower_bound(cells.constBegin(), cells.constEnd(), helper);
     if ((it == cells.constEnd()) || (helper < *it))
         return -1;
     return it - cells.constBegin();
@@ -400,7 +406,7 @@ void QTextTablePrivate::fragmentAdded(QChar type, uint fragment)
         Q_ASSERT(cells.indexOf(fragment) == -1);
         const uint pos = pieceTable->fragmentMap().position(fragment);
         QFragmentFindHelper helper(pos, pieceTable->fragmentMap());
-        QList<int>::Iterator it = std::lower_bound(cells.begin(), cells.end(), helper);
+        auto it = std::lower_bound(cells.begin(), cells.end(), helper);
         cells.insert(it, fragment);
         if (!fragment_start || pos < pieceTable->fragmentMap().position(fragment_start))
             fragment_start = fragment;
@@ -610,7 +616,7 @@ QTextTableCell QTextTable::cellAt(int position) const
         return QTextTableCell();
 
     QFragmentFindHelper helper(position, map);
-    QList<int>::ConstIterator it = std::lower_bound(d->cells.begin(), d->cells.end(), helper);
+    auto it = std::lower_bound(d->cells.begin(), d->cells.end(), helper);
     if (it != d->cells.begin())
         --it;
 
@@ -749,7 +755,7 @@ void QTextTable::insertColumns(int pos, int num)
     QTextFormatCollection *c = p->formatCollection();
     p->beginEditBlock();
 
-    QList<int> extendedSpans;
+    QVector<int> extendedSpans;
     for (int i = 0; i < d->nRows; ++i) {
         int cell;
         if (i == d->nRows - 1 && pos == d->nCols) {
@@ -818,7 +824,7 @@ void QTextTable::insertColumns(int pos, int num)
     QVector<QTextLength> columnWidths = tfmt.columnWidthConstraints();
     if (! columnWidths.isEmpty()) {
         for (int i = num; i > 0; --i)
-            columnWidths.insert(pos, columnWidths[qMax(0, pos-1)]);
+            columnWidths.insert(pos, columnWidths.at(qMax(0, pos - 1)));
     }
     tfmt.setColumnWidthConstraints (columnWidths);
     QTextObject::setFormat(tfmt);
@@ -884,7 +890,7 @@ void QTextTable::removeRows(int pos, int num)
 
     p->aboutToRemoveCell(cellAt(pos, 0).firstPosition(), cellAt(pos + num - 1, d->nCols - 1).lastPosition());
 
-    QList<int> touchedCells;
+    QVector<int> touchedCells;
     for (int r = pos; r < pos + num; ++r) {
         for (int c = 0; c < d->nCols; ++c) {
             int cell = d->grid[r*d->nCols + c];
@@ -946,7 +952,7 @@ void QTextTable::removeColumns(int pos, int num)
 
     p->aboutToRemoveCell(cellAt(0, pos).firstPosition(), cellAt(d->nRows - 1, pos + num - 1).lastPosition());
 
-    QList<int> touchedCells;
+    QVector<int> touchedCells;
     for (int r = 0; r < d->nRows; ++r) {
         for (int c = pos; c < pos + num; ++c) {
             int cell = d->grid[r*d->nCols + c];
@@ -1040,11 +1046,12 @@ void QTextTable::mergeCells(int row, int column, int numRows, int numCols)
 
     // find the position at which to insert the contents of the merged cells
     QFragmentFindHelper helper(origCellPosition, p->fragmentMap());
-    QList<int>::Iterator it = std::lower_bound(d->cells.begin(), d->cells.end(), helper);
+    const auto begin = d->cells.cbegin();
+    const auto it = std::lower_bound(begin, d->cells.cend(), helper);
     Q_ASSERT(it != d->cells.end());
     Q_ASSERT(!(helper < *it));
     Q_ASSERT(*it == cellFragment);
-    const int insertCellIndex = it - d->cells.begin();
+    const int insertCellIndex = it - begin;
     int insertFragment = d->cells.value(insertCellIndex + 1, d->fragment_end);
     uint insertPos = p->fragmentMap().position(insertFragment);
 
@@ -1073,11 +1080,12 @@ void QTextTable::mergeCells(int row, int column, int numRows, int numCols)
 
             if (firstCellIndex == -1) {
                 QFragmentFindHelper helper(pos, p->fragmentMap());
-                QList<int>::Iterator it = std::lower_bound(d->cells.begin(), d->cells.end(), helper);
+                const auto begin = d->cells.cbegin();
+                const auto it = std::lower_bound(begin, d->cells.cend(), helper);
                 Q_ASSERT(it != d->cells.end());
                 Q_ASSERT(!(helper < *it));
                 Q_ASSERT(*it == fragment);
-                firstCellIndex = cellIndex = it - d->cells.begin();
+                firstCellIndex = cellIndex = it - begin;
             }
 
             ++cellIndex;
@@ -1130,7 +1138,7 @@ void QTextTable::mergeCells(int row, int column, int numRows, int numCols)
         }
     }
 
-    d->fragment_start = d->cells.first();
+    d->fragment_start = d->cells.constFirst();
 
     fmt.setTableCellRowSpan(numRows);
     fmt.setTableCellColumnSpan(numCols);
@@ -1206,9 +1214,9 @@ void QTextTable::splitCell(int row, int column, int numRows, int numCols)
     for (int r = row + 1; r < row + rowSpan; ++r) {
         // find the cell before which to insert the new cell markers
         int gridIndex = r * d->nCols + column;
-        QVector<int>::iterator it = std::upper_bound(d->cellIndices.begin(), d->cellIndices.end(), gridIndex);
-        int cellIndex = it - d->cellIndices.begin();
-        int fragment = d->cells.value(cellIndex, d->fragment_end);
+        const auto begin = d->cellIndices.cbegin();
+        const auto it = std::upper_bound(begin, d->cellIndices.cend(), gridIndex);
+        int fragment = d->cells.value(it - begin, d->fragment_end);
         rowPositions[r - row] = p->fragmentMap().position(fragment);
     }
 
diff --git a/src/gui/text/qtexttable.h b/src/gui/text/qtexttable.h
index 4ff7d19e85..14525aae25 100644
--- a/src/gui/text/qtexttable.h
+++ b/src/gui/text/qtexttable.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qtexttable_p.h b/src/gui/text/qtexttable_p.h
index 58a4b7d32d..72d9d8c639 100644
--- a/src/gui/text/qtexttable_p.h
+++ b/src/gui/text/qtexttable_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -65,7 +71,7 @@ public:
 
     int findCellIndex(int fragment) const;
 
-    QList<int> cells;
+    QVector<int> cells;
     // symmetric to cells array and maps to indecs in grid,
     // used for fast-lookup for row/column by fragment
     mutable QVector<int> cellIndices;
diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp
index a3112cc7fb..7cb89543ba 100644
--- a/src/gui/text/qzip.cpp
+++ b/src/gui/text/qzip.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -568,7 +574,7 @@ void QZipReaderPrivate::scanFiles()
     uchar tmp[4];
     device->read((char *)tmp, 4);
     if (readUInt(tmp) != 0x04034b50) {
-        qWarning() << "QZip: not a zip file!";
+        qWarning("QZip: not a zip file!");
         return;
     }
 
@@ -580,7 +586,7 @@ void QZipReaderPrivate::scanFiles()
     while (start_of_directory == -1) {
         const int pos = device->size() - int(sizeof(EndOfDirectory)) - i;
         if (pos < 0 || i > 65535) {
-            qWarning() << "QZip: EndOfDirectory not found";
+            qWarning("QZip: EndOfDirectory not found");
             return;
         }
 
@@ -597,7 +603,7 @@ void QZipReaderPrivate::scanFiles()
     ZDEBUG("start_of_directory at %d, num_dir_entries=%d", start_of_directory, num_dir_entries);
     int comment_length = readUShort(eod.comment_length);
     if (comment_length != i)
-        qWarning() << "QZip: failed to parse zip file.";
+        qWarning("QZip: failed to parse zip file.");
     comment = device->read(qMin(comment_length, i));
 
 
@@ -606,30 +612,30 @@ void QZipReaderPrivate::scanFiles()
         FileHeader header;
         int read = device->read((char *) &header.h, sizeof(CentralFileHeader));
         if (read < (int)sizeof(CentralFileHeader)) {
-            qWarning() << "QZip: Failed to read complete header, index may be incomplete";
+            qWarning("QZip: Failed to read complete header, index may be incomplete");
             break;
         }
         if (readUInt(header.h.signature) != 0x02014b50) {
-            qWarning() << "QZip: invalid header signature, index may be incomplete";
+            qWarning("QZip: invalid header signature, index may be incomplete");
             break;
         }
 
         int l = readUShort(header.h.file_name_length);
         header.file_name = device->read(l);
         if (header.file_name.length() != l) {
-            qWarning() << "QZip: Failed to read filename from zip index, index may be incomplete";
+            qWarning("QZip: Failed to read filename from zip index, index may be incomplete");
             break;
         }
         l = readUShort(header.h.extra_field_length);
         header.extra_field = device->read(l);
         if (header.extra_field.length() != l) {
-            qWarning() << "QZip: Failed to read extra field in zip file, skipping file, index may be incomplete";
+            qWarning("QZip: Failed to read extra field in zip file, skipping file, index may be incomplete");
             break;
         }
         l = readUShort(header.h.file_comment_length);
         header.file_comment = device->read(l);
         if (header.file_comment.length() != l) {
-            qWarning() << "QZip: Failed to read read file comment, index may be incomplete";
+            qWarning("QZip: Failed to read read file comment, index may be incomplete");
             break;
         }
 
@@ -816,15 +822,17 @@ void QZipWriterPrivate::addEntry(EntryType type, const QString &fileName, const
 QZipReader::QZipReader(const QString &archive, QIODevice::OpenMode mode)
 {
     QScopedPointer<QFile> f(new QFile(archive));
+    const bool result = f->open(mode);
     QZipReader::Status status;
-    if (f->open(mode) && f->error() == QFile::NoError)
+    const QFileDevice::FileError error = f->error();
+    if (result && error == QFile::NoError) {
         status = NoError;
-    else {
-        if (f->error() == QFile::ReadError)
+    } else {
+        if (error == QFile::ReadError)
             status = FileReadError;
-        else if (f->error() == QFile::OpenError)
+        else if (error == QFile::OpenError)
             status = FileOpenError;
-        else if (f->error() == QFile::PermissionsError)
+        else if (error == QFile::PermissionsError)
             status = FilePermissionsError;
         else
             status = FileError;
@@ -1015,7 +1023,7 @@ bool QZipReader::extractAll(const QString &destinationDir) const
 
     // create directories first
     const QVector<FileInfo> allFiles = fileInfoList();
-    foreach (const FileInfo &fi, allFiles) {
+    for (const FileInfo &fi : allFiles) {
         const QString absPath = destinationDir + QDir::separator() + fi.filePath;
         if (fi.isDir) {
             if (!baseDir.mkpath(fi.filePath))
@@ -1026,7 +1034,7 @@ bool QZipReader::extractAll(const QString &destinationDir) const
     }
 
     // set up symlinks
-    foreach (const FileInfo &fi, allFiles) {
+    for (const FileInfo &fi : allFiles) {
         const QString absPath = destinationDir + QDir::separator() + fi.filePath;
         if (fi.isSymLink) {
             QString destination = QFile::decodeName(fileData(fi.filePath));
@@ -1044,7 +1052,7 @@ bool QZipReader::extractAll(const QString &destinationDir) const
         }
     }
 
-    foreach (const FileInfo &fi, allFiles) {
+    for (const FileInfo &fi : allFiles) {
         const QString absPath = destinationDir + QDir::separator() + fi.filePath;
         if (fi.isFile) {
             QFile f(absPath);
diff --git a/src/gui/text/qzipreader_p.h b/src/gui/text/qzipreader_p.h
index 7f26bfb184..5603f0f0d6 100644
--- a/src/gui/text/qzipreader_p.h
+++ b/src/gui/text/qzipreader_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/text/qzipwriter_p.h b/src/gui/text/qzipwriter_p.h
index bd8d0b423d..0a4763855e 100644
--- a/src/gui/text/qzipwriter_p.h
+++ b/src/gui/text/qzipwriter_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/util/qabstractlayoutstyleinfo.cpp b/src/gui/util/qabstractlayoutstyleinfo.cpp
index e85f2ec190..40ad51452a 100644
--- a/src/gui/util/qabstractlayoutstyleinfo.cpp
+++ b/src/gui/util/qabstractlayoutstyleinfo.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/util/qabstractlayoutstyleinfo_p.h b/src/gui/util/qabstractlayoutstyleinfo_p.h
index 4327057f97..b8f3825ada 100644
--- a/src/gui/util/qabstractlayoutstyleinfo_p.h
+++ b/src/gui/util/qabstractlayoutstyleinfo_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index 70daf55b61..085c073bb1 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -322,17 +328,17 @@ QString QDesktopServices::storageLocationImpl(QStandardPaths::StandardLocation t
         // * Unix data location is under the "data/" subdirectory
         const QString compatAppName = qt_applicationName_noFallback();
         const QString baseDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+        const QString organizationName = QCoreApplication::organizationName();
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
         QString result = baseDir;
-        if (!QCoreApplication::organizationName().isEmpty())
-            result += QLatin1Char('/') + QCoreApplication::organizationName();
+        if (!organizationName.isEmpty())
+            result += QLatin1Char('/') + organizationName;
         if (!compatAppName.isEmpty())
             result += QLatin1Char('/') + compatAppName;
         return result;
 #elif defined(Q_OS_UNIX)
         return baseDir + QLatin1String("/data/")
-            + QCoreApplication::organizationName() + QLatin1Char('/')
-            + compatAppName;
+            + organizationName + QLatin1Char('/') + compatAppName;
 #endif
     }
     return QStandardPaths::writableLocation(type);
diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h
index 6000c9d589..3d44ab4a1e 100644
--- a/src/gui/util/qdesktopservices.h
+++ b/src/gui/util/qdesktopservices.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/util/qgridlayoutengine.cpp b/src/gui/util/qgridlayoutengine.cpp
index 28545d934f..8ff2a3eeec 100644
--- a/src/gui/util/qgridlayoutengine.cpp
+++ b/src/gui/util/qgridlayoutengine.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -212,8 +218,9 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz
     qreal sumAvailable;
 
     for (int i = 0; i < n; ++i) {
-        if (stretches[start + i] > 0)
-            sumStretches += stretches[start + i];
+        const int stretch = stretches.at(start + i);
+        if (stretch > 0)
+            sumStretches += stretch;
     }
 
     if (targetSize < totalBox.q_preferredSize) {
@@ -410,8 +417,23 @@ void QGridLayoutRowData::calculateGeometries(int start, int end, qreal targetSiz
 #endif
     }
     if (snapToPixelGrid) {
-        for (int i = 0; i < n; ++i)
-            positions[i] = qround(positions[i]);
+        for (int i = 0; i < n; ++i) {
+            const qreal oldpos = positions[i];
+            positions[i] = qround(oldpos);
+            const qreal delta = positions[i] - oldpos;
+            sizes[i] -= delta;
+            if (i > 0)
+                sizes[i - 1] += delta;
+        }
+
+        sizes[n - 1] = targetSize - positions[n - 1];
+        // This loop serves two purposes:
+        // 1. round off the small epsilons produced by the above loop.
+        // 2. avoid that the above loop didn't make the cell width smaller than its minimum constraint.
+        for (int i = 0; i < n; ++i) {
+            const QGridLayoutBox &box = boxes.at(start + i);
+            sizes[i] = qMax(box.q_minimumSize, qround(sizes[i]));
+        }
     }
 
     if (descents) {
@@ -563,7 +585,7 @@ QLayoutPolicy::ControlTypes QGridLayoutItem::controlTypes(LayoutSide /*side*/) c
     return QLayoutPolicy::DefaultType;
 }
 
-QGridLayoutBox QGridLayoutItem::box(Qt::Orientation orientation, qreal constraint) const
+QGridLayoutBox QGridLayoutItem::box(Qt::Orientation orientation, bool snapToPixelGrid, qreal constraint) const
 {
     QGridLayoutBox result;
     QLayoutPolicy::Policy policy = sizePolicy(orientation);
@@ -578,6 +600,8 @@ QGridLayoutBox QGridLayoutItem::box(Qt::Orientation orientation, qreal constrain
         } else {
             result.q_minimumSize = result.q_preferredSize;
         }
+        if (snapToPixelGrid)
+            result.q_minimumSize = qCeil(result.q_minimumSize);
 
         if (policy & (QLayoutPolicy::GrowFlag | QLayoutPolicy::ExpandFlag)) {
             result.q_maximumSize = sizeHint(Qt::MaximumSize, constraintSize).width();
@@ -594,6 +618,8 @@ QGridLayoutBox QGridLayoutItem::box(Qt::Orientation orientation, qreal constrain
         } else {
             result.q_minimumSize = result.q_preferredSize;
         }
+        if (snapToPixelGrid)
+            result.q_minimumSize = qCeil(result.q_minimumSize);
 
         if (policy & (QLayoutPolicy::GrowFlag | QLayoutPolicy::ExpandFlag)) {
             result.q_maximumSize = sizeHint(Qt::MaximumSize, constraintSize).height();
@@ -617,7 +643,7 @@ QGridLayoutBox QGridLayoutItem::box(Qt::Orientation orientation, qreal constrain
 }
 
 QRectF QGridLayoutItem::geometryWithin(qreal x, qreal y, qreal width, qreal height,
-                                       qreal rowDescent, Qt::Alignment align) const
+                                       qreal rowDescent, Qt::Alignment align, bool snapToPixelGrid) const
 {
     const qreal cellWidth = width;
     const qreal cellHeight = height;
@@ -655,7 +681,7 @@ QRectF QGridLayoutItem::geometryWithin(qreal x, qreal y, qreal width, qreal heig
         break;
     case Qt::AlignBaseline: {
         width = qMin(effectiveMaxSize(QSizeF(-1,-1)).width(), width);
-        QGridLayoutBox vBox = box(Qt::Vertical);
+        QGridLayoutBox vBox = box(Qt::Vertical, snapToPixelGrid);
         const qreal descent = vBox.q_minimumDescent;
         const qreal ascent = vBox.q_minimumSize - descent;
         y += (cellHeight - rowDescent - ascent);
@@ -1009,19 +1035,19 @@ void QGridLayoutEngine::setGeometries(const QRectF &contentsGeometry, const QAbs
     for (int i = q_items.count() - 1; i >= 0; --i) {
         QGridLayoutItem *item = q_items.at(i);
 
-        qreal x = q_xx[item->firstColumn()];
-        qreal y = q_yy[item->firstRow()];
-        qreal width = q_widths[item->lastColumn()];
-        qreal height = q_heights[item->lastRow()];
+        qreal x = q_xx.at(item->firstColumn());
+        qreal y = q_yy.at(item->firstRow());
+        qreal width = q_widths.at(item->lastColumn());
+        qreal height = q_heights.at(item->lastRow());
 
         if (item->columnSpan() != 1)
-            width += q_xx[item->lastColumn()] - x;
+            width += q_xx.at(item->lastColumn()) - x;
         if (item->rowSpan() != 1)
-            height += q_yy[item->lastRow()] - y;
+            height += q_yy.at(item->lastRow()) - y;
 
         const Qt::Alignment align = effectiveAlignment(item);
         QRectF geom = item->geometryWithin(contentsGeometry.x() + x, contentsGeometry.y() + y,
-                                               width, height, q_descents[item->lastRow()], align);
+                                               width, height, q_descents.at(item->lastRow()), align, m_snapToPixelGrid);
         if (m_snapToPixelGrid) {
             // x and y should already be rounded, but the call to geometryWithin() above might
             // result in a geom with x,y at half-pixels (due to centering within the cell)
@@ -1401,9 +1427,9 @@ void QGridLayoutEngine::fillRowData(QGridLayoutRowData *rowData,
                         qreal length = colSizes[item->lastColumn(orientation)];
                         if (item->columnSpan(orientation) != 1)
                             length += colPositions[item->lastColumn(orientation)] - colPositions[item->firstColumn(orientation)];
-                        box->combine(item->box(orientation, length));
+                        box->combine(item->box(orientation, m_snapToPixelGrid, length));
                     } else {
-                        box->combine(item->box(orientation));
+                        box->combine(item->box(orientation, m_snapToPixelGrid));
                     }
 
                     if (effectiveRowSpan == 1) {
@@ -1471,8 +1497,8 @@ void QGridLayoutEngine::fillRowData(QGridLayoutRowData *rowData,
                         if (orientation == Qt::Horizontal) {
                             qreal width1 = rowData->boxes.at(prevRow).q_minimumSize;
                             qreal width2 = rowData->boxes.at(row).q_minimumSize;
-                            QRectF rect1 = item1->geometryWithin(0.0, 0.0, width1, FLT_MAX, -1.0, effectiveAlignment(item1));
-                            QRectF rect2 = item2->geometryWithin(0.0, 0.0, width2, FLT_MAX, -1.0, effectiveAlignment(item2));
+                            QRectF rect1 = item1->geometryWithin(0.0, 0.0, width1, FLT_MAX, -1.0, effectiveAlignment(item1), m_snapToPixelGrid);
+                            QRectF rect2 = item2->geometryWithin(0.0, 0.0, width2, FLT_MAX, -1.0, effectiveAlignment(item2), m_snapToPixelGrid);
                             spacing -= (width1 - (rect1.x() + rect1.width())) + rect2.x();
                         } else {
                             const QGridLayoutBox &box1 = rowData->boxes.at(prevRow);
@@ -1484,9 +1510,9 @@ void QGridLayoutEngine::fillRowData(QGridLayoutRowData *rowData,
                             qreal rowDescent2 = fixedDescent(box2.q_minimumDescent,
                                                              box2.q_minimumAscent, height2);
                             QRectF rect1 = item1->geometryWithin(0.0, 0.0, FLT_MAX, height1,
-                                                                 rowDescent1, effectiveAlignment(item1));
+                                                                 rowDescent1, effectiveAlignment(item1), m_snapToPixelGrid);
                             QRectF rect2 = item2->geometryWithin(0.0, 0.0, FLT_MAX, height2,
-                                                                 rowDescent2, effectiveAlignment(item2));
+                                                                 rowDescent2, effectiveAlignment(item2), m_snapToPixelGrid);
                             spacing -= (height1 - (rect1.y() + rect1.height())) + rect2.y();
                         }
                         rowSpacing = qMax(spacing, rowSpacing);
diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h
index 73601153c6..d79d4cc9c9 100644
--- a/src/gui/util/qgridlayoutengine_p.h
+++ b/src/gui/util/qgridlayoutengine_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -204,6 +210,7 @@ public:
         return *t;
     }
 };
+Q_DECLARE_TYPEINFO(QGridLayoutBox, Q_MOVABLE_TYPE); // cannot be Q_PRIMITIVE_TYPE, as q_maximumSize, say, is != 0
 
 bool operator==(const QGridLayoutBox &box1, const QGridLayoutBox &box2);
 inline bool operator!=(const QGridLayoutBox &box1, const QGridLayoutBox &box2)
@@ -308,8 +315,8 @@ public:
 
     virtual QLayoutPolicy::ControlTypes controlTypes(LayoutSide side) const;
 
-    QRectF geometryWithin(qreal x, qreal y, qreal width, qreal height, qreal rowDescent, Qt::Alignment align) const;
-    QGridLayoutBox box(Qt::Orientation orientation, qreal constraint = -1.0) const;
+    QRectF geometryWithin(qreal x, qreal y, qreal width, qreal height, qreal rowDescent, Qt::Alignment align, bool snapToPixelGrid) const;
+    QGridLayoutBox box(Qt::Orientation orientation, bool snapToPixelGrid, qreal constraint = -1.0) const;
 
 
     void transpose();
diff --git a/src/gui/util/qhexstring_p.h b/src/gui/util/qhexstring_p.h
index 66d6d0f2dc..ac11c8ad14 100644
--- a/src/gui/util/qhexstring_p.h
+++ b/src/gui/util/qhexstring_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/util/qlayoutpolicy.cpp b/src/gui/util/qlayoutpolicy.cpp
index 0a050184a6..b2b18c0c8b 100644
--- a/src/gui/util/qlayoutpolicy.cpp
+++ b/src/gui/util/qlayoutpolicy.cpp
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Quick Layouts module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/util/qlayoutpolicy_p.h b/src/gui/util/qlayoutpolicy_p.h
index e41a964048..979b808563 100644
--- a/src/gui/util/qlayoutpolicy_p.h
+++ b/src/gui/util/qlayoutpolicy_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Quick Layouts module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp
index 31dfd20d1a..90c6e7a7b8 100644
--- a/src/gui/util/qvalidator.cpp
+++ b/src/gui/util/qvalidator.cpp
@@ -1,32 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -38,6 +44,7 @@
 #ifndef QT_NO_VALIDATOR
 #include "private/qobject_p.h"
 #include "private/qlocale_p.h"
+#include "private/qnumeric_p.h"
 
 #include <limits.h>
 #include <cmath>
@@ -398,8 +405,8 @@ static qlonglong pow10(int exp)
 QValidator::State QIntValidator::validate(QString & input, int&) const
 {
     QByteArray buff;
-    if (!locale().d->m_data->validateChars(input, QLocaleData::IntegerMode, &buff,
-                                           -1, locale().numberOptions() & QLocale::RejectGroupSeparator)) {
+    if (!locale().d->m_data->validateChars(input, QLocaleData::IntegerMode, &buff, -1,
+                                           locale().numberOptions())) {
         return Invalid;
     }
 
@@ -438,8 +445,8 @@ QValidator::State QIntValidator::validate(QString & input, int&) const
 void QIntValidator::fixup(QString &input) const
 {
     QByteArray buff;
-    if (!locale().d->m_data->validateChars(input, QLocaleData::IntegerMode, &buff,
-                                           -1, locale().numberOptions() & QLocale::RejectGroupSeparator)) {
+    if (!locale().d->m_data->validateChars(input, QLocaleData::IntegerMode, &buff, -1,
+                                           locale().numberOptions())) {
         return;
     }
     bool ok, overflow;
@@ -662,8 +669,7 @@ QValidator::State QDoubleValidatorPrivate::validateWithLocale(QString &input, QL
 {
     Q_Q(const QDoubleValidator);
     QByteArray buff;
-    if (!locale.d->m_data->validateChars(input, numMode, &buff, q->dec,
-                                         locale.numberOptions() & QLocale::RejectGroupSeparator)) {
+    if (!locale.d->m_data->validateChars(input, numMode, &buff, q->dec, locale.numberOptions())) {
         return QValidator::Invalid;
     }
 
@@ -676,9 +682,9 @@ QValidator::State QDoubleValidatorPrivate::validateWithLocale(QString &input, QL
     if (q->t < 0 && buff.startsWith('+'))
         return QValidator::Invalid;
 
-    bool ok, overflow;
-    double i = QLocaleData::bytearrayToDouble(buff.constData(), &ok, &overflow);
-    if (overflow)
+    bool ok = false;
+    double i = buff.toDouble(&ok); // returns 0.0 if !ok
+    if (i == qt_qnan())
         return QValidator::Invalid;
     if (!ok)
         return QValidator::Intermediate;
@@ -1060,7 +1066,7 @@ void QRegularExpressionValidatorPrivate::setRegularExpression(const QRegularExpr
 
     if (origRe != re) {
         usedRe = origRe = re; // copies also the pattern options
-        usedRe.setPattern(QStringLiteral("\\A(?:") + re.pattern() + QStringLiteral(")\\z"));
+        usedRe.setPattern(QLatin1String("\\A(?:") + re.pattern() + QLatin1String(")\\z"));
         emit q->regularExpressionChanged(re);
         emit q->changed();
     }
diff --git a/src/gui/util/qvalidator.h b/src/gui/util/qvalidator.h
index a979a268aa..85787a66c6 100644
--- a/src/gui/util/qvalidator.h
+++ b/src/gui/util/qvalidator.h
@@ -1,32 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2016 The Qt Company Ltd.
 ** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
-** Contact: http://www.qt.io/licensing/
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** 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 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.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** 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.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **