Added version() and setVersion() convenience API to QSurfaceFormat.

This lets you write code like format.version() >= qMakePair(3, 2), and
format.setVersion(4, 2) instead of format.setMajorVersion(4);
format.setMinorVersion(2);

Change-Id: Ib052091cc12865ea0d5db52e468ed6cd28f14840
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

src/gui/kernel/qsurfaceformat.cpp

@@ -583,6 +583,30 @@ int QSurfaceFormat::minorVersion() const
     return d->minor;
 }
 
+/*!
+    Returns a QPair<int, int> representing the OpenGL version.
+
+    Useful for version checks, for example format.version() >= qMakePair(3, 2)
+*/
+QPair<int, int> QSurfaceFormat::version() const
+{
+    return qMakePair(d->major, d->minor);
+}
+
+/*!
+    Sets the desired \a major and \a minor OpenGL versions.
+
+    The default version is 2.0.
+*/
+void QSurfaceFormat::setVersion(int major, int minor)
+{
+    if (d->minor != minor || d->major != major) {
+        detach();
+        d->minor = minor;
+        d->major = major;
+    }
+}
+
 /*!
     Returns true if all the options of the two QSurfaceFormat objects
     \a a and \a b are equal.

src/gui/kernel/qsurfaceformat.h

@@ -42,6 +42,7 @@
 #define QSURFACEFORMAT_H
 
 #include <QtCore/qglobal.h>
+#include <QtCore/qpair.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -120,6 +121,9 @@ public:
     void setMinorVersion(int minorVersion);
     int minorVersion() const;
 
+    QPair<int, int> version() const;
+    void setVersion(int major, int minor);
+
     bool stereo() const;
     void setStereo(bool enable);
 

tests/auto/gui/kernel/kernel.pro

@@ -15,6 +15,7 @@ SUBDIRS=\
    qmouseevent_modal \
    qpalette \
    qscreen \
+   qsurfaceformat \
    qtouchevent \
    qwindow \
    qguiapplication \

tests/auto/gui/kernel/qsurfaceformat/qsurfaceformat.pro

@@ -0,0 +1,8 @@
+CONFIG += testcase
+CONFIG += parallel_test
+TARGET = tst_qsurfaceformat
+
+QT += core-private gui-private testlib
+
+SOURCES  += tst_qsurfaceformat.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

tests/auto/gui/kernel/qsurfaceformat/tst_qsurfaceformat.cpp

@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite 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 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.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** 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$
+**
+****************************************************************************/
+
+#include <qsurfaceformat.h>
+
+#include <QtTest/QtTest>
+
+class tst_QSurfaceFormat: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void versionCheck_data();
+    void versionCheck();
+};
+
+void tst_QSurfaceFormat::versionCheck_data()
+{
+    QTest::addColumn<int>("formatMajor");
+    QTest::addColumn<int>("formatMinor");
+    QTest::addColumn<int>("compareMajor");
+    QTest::addColumn<int>("compareMinor");
+    QTest::addColumn<bool>("expected");
+
+    QTest::newRow("lower major, lower minor")
+        << 3 << 2 << 2 << 1 << true;
+    QTest::newRow("lower major, same minor")
+        << 3 << 2 << 2 << 2 << true;
+    QTest::newRow("lower major, greater minor")
+        << 3 << 2 << 2 << 3 << true;
+    QTest::newRow("same major, lower minor")
+        << 3 << 2 << 3 << 1 << true;
+    QTest::newRow("same major, same minor")
+        << 3 << 2 << 3 << 2 << true;
+    QTest::newRow("same major, greater minor")
+        << 3 << 2 << 3 << 3 << false;
+    QTest::newRow("greater major, lower minor")
+        << 3 << 2 << 4 << 1 << false;
+    QTest::newRow("greater major, same minor")
+        << 3 << 2 << 4 << 2 << false;
+    QTest::newRow("greater major, greater minor")
+        << 3 << 2 << 4 << 3 << false;
+}
+
+void tst_QSurfaceFormat::versionCheck()
+{
+    QFETCH( int, formatMajor );
+    QFETCH( int, formatMinor );
+    QFETCH( int, compareMajor );
+    QFETCH( int, compareMinor );
+    QFETCH( bool, expected );
+
+    QSurfaceFormat format;
+    format.setMinorVersion(formatMinor);
+    format.setMajorVersion(formatMajor);
+
+    QCOMPARE(format.version() >= qMakePair(compareMajor, compareMinor), expected);
+
+    format.setVersion(formatMajor, formatMinor);
+    QCOMPARE(format.version() >= qMakePair(compareMajor, compareMinor), expected);
+}
+
+#include <tst_qsurfaceformat.moc>
+QTEST_MAIN(tst_QSurfaceFormat);