Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
16 edited
15 copied

Legend:

Unmodified
Added
Removed

  • trunk

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

    r561 r846  
    88    !win32:!embedded:!mac:SUBDIRS += shivavg
    99}
     10
     11
     12
     13

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    5757    QStringList list;
    5858    list << QLatin1String("OpenGL") << QLatin1String("OpenGL1");
    59 #if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)
     59#if !defined(QT_OPENGL_ES_1)
    6060    list << QLatin1String("OpenGL2");
     61
     62
     63
    6164#endif
    6265    return list;
    … …  
    6770    if (system.toLower() == QLatin1String("opengl1")) {
    6871        QGL::setPreferredPaintEngine(QPaintEngine::OpenGL);
    69         return new QGLGraphicsSystem;
     72        return new QGLGraphicsSystem;
    7073    }
    7174
    72 #if !defined(QT_OPENGL_ES_1) && !defined(QT_OPENGL_ES_1_CL)
     75#if !defined(QT_OPENGL_ES_1)
    7376    if (system.toLower() == QLatin1String("opengl2")) {
    7477        QGL::setPreferredPaintEngine(QPaintEngine::OpenGL2);
    75         return new QGLGraphicsSystem;
     78        return new QGLGraphicsSystem;
    7679    }
    7780#endif
    7881
     82
     83
     84
     85
     86
    7987    if (system.toLower() == QLatin1String("opengl"))
    80         return new QGLGraphicsSystem;
     88        return new QGLGraphicsSystem;
    8189
    8290    return 0;

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

    r597 r846  
    1111target.path += $$[QT_INSTALL_PLUGINS]/graphicssystems
    1212INSTALLS += target
     13
     14

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    4343#include <QtOpenVG/private/qpixmapdata_vg_p.h>
    4444#include <QtOpenVG/private/qwindowsurface_vg_p.h>
     45
     46
     47
     48
    4549
    4650QT_BEGIN_NAMESPACE
    … …  
    4852QVGGraphicsSystem::QVGGraphicsSystem()
    4953{
     54
    5055}
    5156
    … …  
    6570QWindowSurface *QVGGraphicsSystem::createWindowSurface(QWidget *widget) const
    6671{
     72
     73
     74
     75
     76
    6777    return new QVGWindowSurface(widget);
    6878}

  • trunk/src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/plugins/graphicssystems/shivavg/shivavggraphicssystem.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/plugins/graphicssystems/shivavg/shivavggraphicssystem.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/plugins/graphicssystems/shivavg/shivavgwindowsurface.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/plugins/graphicssystems/shivavg/shivavgwindowsurface.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

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

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • trunk/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    8383        if (outputFile.open(QIODevice::WriteOnly)) {
    8484            QDataStream out(&outputFile);
    85             out.writeBytes("qttrace", 7);
    86             out << *buffer << updates;
     85            out.setFloatingPointPrecision(QDataStream::SinglePrecision);
     86
     87            out.writeBytes("qttraceV2", 9);
     88
     89            uint version = 1;
     90
     91            out << version << *buffer << updates;
    8792        }
    8893        delete buffer;

  • trunk/src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

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

    r597 r846  
    66
    77QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/graphicssystems
     8
    89
    910SOURCES = main.cpp qgraphicssystem_trace.cpp
Note: See TracChangeset for help on using the changeset viewer.