Changeset 561 for trunk/src/plugins/graphicssystems/opengl/main.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/plugins/graphicssystems/opengl/main.cpp (modified) (5 diffs)

trunk/src/plugins/graphicssystems/opengl/main.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -42 +42 @@
 #include <private/qgraphicssystemplugin_p.h>
 #include <private/qgraphicssystem_gl_p.h>
+#include <qgl.h>
 
 QT_BEGIN_NAMESPACE
@@ -54 +55 @@
 QStringList QGLGraphicsSystemPlugin::keys() const
 {
-    return QStringList(QLatin1String("OpenGL"));
+    QStringList list;
+    list << QLatin1String("OpenGL") << QLatin1String("OpenGL1");
+#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)
+    list << QLatin1String("OpenGL2");
+#endif
+    return list;
 }
 
 QGraphicsSystem* QGLGraphicsSystemPlugin::create(const QString& system)
 {
+    if (system.toLower() == QLatin1String("opengl1")) {
+        QGL::setPreferredPaintEngine(QPaintEngine::OpenGL);
+        return new QGLGraphicsSystem;
+    }
+
+#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)
+    if (system.toLower() == QLatin1String("opengl2")) {
+        QGL::setPreferredPaintEngine(QPaintEngine::OpenGL2);
+        return new QGLGraphicsSystem;
+    }
+#endif
+
     if (system.toLower() == QLatin1String("opengl"))
         return new QGLGraphicsSystem;