Changeset 846 for trunk/src/opengl/qwindowsurface_gl_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/opengl/qwindowsurface_gl_p.h (modified) (5 diffs)

trunk/src/opengl/qwindowsurface_gl_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])
@@ -67 +67 @@
 struct QGLWindowSurfacePrivate;
 
+
+
+
 class QGLWindowSurfaceGLPaintDevice : public QGLPaintDevice
 {
@@ -78 +81 @@
 };
 
-class QGLWindowSurface : public QObject, public QWindowSurface // , public QPaintDevice
+class QGLWindowSurface : public QObject, public QWindowSurface // , public QPaintDevice
 {
     Q_OBJECT
@@ -100 +103 @@
     static QGLFormat surfaceFormat;
 
+
+
+
 private slots:
     void deleted(QObject *object);
@@ -105 +111 @@
 private:
     void hijackWindow(QWidget *widget);
+
 
     QGLWindowSurfacePrivate *d_ptr;