Changeset 846 for trunk/src/openvg/qpixmapdata_vg_p.h

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:

• . (modified) (1 prop)
• src/openvg/qpixmapdata_vg_p.h (modified) (5 diffs)

trunk/src/openvg/qpixmapdata_vg_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -65 +65 @@
 class QEglContext;
 class QVGImagePool;
+
 
 #if !defined(QT_NO_EGL)
@@ -88 +89 @@
     void resize(int width, int height);
     void fromImage(const QImage &image, Qt::ImageConversionFlags flags);
+
+
+
+
+
+
 
     void fill(const QColor &color);
@@ -127 +134 @@
 protected:
     int metric(QPaintDevice::PaintDeviceMetric metric) const;
+
 
 #if defined(Q_OS_SYMBIAN)
@@ -136 +144 @@
     QVGPixmapData *prevLRU;
     bool inLRU;
+
     friend class QVGImagePool;
+
 
 #if !defined(QT_NO_EGL)