1 files changed, 51 insertions, 19 deletions
diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp
index 2b8e611dff..8049e303a7 100644
--- a/src/gui/kernel/qsurfaceformat.cpp
+++ b/src/gui/kernel/qsurfaceformat.cpp
@@ -1,40 +1,32 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -196,6 +188,9 @@ public:
 
 /*!
     Constructs a default initialized QSurfaceFormat.
+
+    \note By default OpenGL 2.0 is requested since this provides the highest
+    grade of portability between platforms and OpenGL implementations.
 */
 QSurfaceFormat::QSurfaceFormat() : d(new QSurfaceFormatPrivate)
 {
@@ -730,6 +725,43 @@ int QSurfaceFormat::swapInterval() const
     return d->swapInterval;
 }
 
+Q_GLOBAL_STATIC(QSurfaceFormat, qt_default_surface_format)
+
+/*!
+    Sets the global default surface \a format.
+
+    This format is used by default in QOpenGLContext, QWindow, QOpenGLWidget and
+    similar classes.
+
+    It can always be overridden on a per-instance basis by using the class in
+    question's own setFormat() function. However, it is often more convenient to
+    set the format for all windows once at the start of the application. It also
+    guarantees proper behavior in cases where shared contexts are required,
+    because settings the format via this function guarantees that all contexts
+    and surfaces, even the ones created internally by Qt, will use the same
+    format.
+
+    \since 5.4
+    \sa defaultFormat()
+ */
+void QSurfaceFormat::setDefaultFormat(const QSurfaceFormat &format)
+{
+    *qt_default_surface_format() = format;
+}
+
+/*!
+    Returns the global default surface format.
+
+    When setDefaultFormat() is not called, this is a default-constructed QSurfaceFormat.
+
+    \since 5.4
+    \sa setDefaultFormat()
+ */
+QSurfaceFormat QSurfaceFormat::defaultFormat()
+{
+    return *qt_default_surface_format();
+}
+
 /*!
     Returns \c true if all the options of the two QSurfaceFormat objects
     \a a and \a b are equal.