Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (16 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
3 edited
18 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/plugins/graphicssystems/graphicssystems.pro

    r2 r561  
    11TEMPLATE = subdirs
    2 contains(QT_CONFIG, opengl):SUBDIRS += opengl
     2SUBDIRS += trace
     3!wince*:contains(QT_CONFIG, opengl):SUBDIRS += opengl
     4contains(QT_CONFIG, openvg):contains(QT_CONFIG, egl):SUBDIRS += openvg
     5
     6contains(QT_CONFIG, shivavg) {
     7    # Only works under X11 at present
     8    !win32:!embedded:!mac:SUBDIRS += shivavg
     9}

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

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the plugins of the Qt Toolkit.
    … …  
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
    … …  
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
    … …  
    4242#include <private/qgraphicssystemplugin_p.h>
    4343#include <private/qgraphicssystem_gl_p.h>
     44#include <qgl.h>
    4445
    4546QT_BEGIN_NAMESPACE
    … …  
    5455QStringList QGLGraphicsSystemPlugin::keys() const
    5556{
    56     return QStringList(QLatin1String("OpenGL"));
     57    QStringList list;
     58    list << QLatin1String("OpenGL") << QLatin1String("OpenGL1");
     59#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)
     60    list << QLatin1String("OpenGL2");
     61#endif
     62    return list;
    5763}
    5864
    5965QGraphicsSystem* QGLGraphicsSystemPlugin::create(const QString& system)
    6066{
     67    if (system.toLower() == QLatin1String("opengl1")) {
     68        QGL::setPreferredPaintEngine(QPaintEngine::OpenGL);
     69        return new QGLGraphicsSystem;
     70    }
     71
     72#if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)
     73    if (system.toLower() == QLatin1String("opengl2")) {
     74        QGL::setPreferredPaintEngine(QPaintEngine::OpenGL2);
     75        return new QGLGraphicsSystem;
     76    }
     77#endif
     78
    6179    if (system.toLower() == QLatin1String("opengl"))
    6280        return new QGLGraphicsSystem;
Note: See TracChangeset for help on using the changeset viewer.