Changeset 846 for trunk/src/opengl/qwindowsurface_x11gl_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_x11gl_p.h (modified) (2 diffs)

trunk/src/opengl/qwindowsurface_x11gl_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -69 +69 @@
     void setGeometry(const QRect &rect);
     bool scroll(const QRegion &area, int dx, int dy);
+    QPixmap grabWidget(const QWidget *widget, const QRect& rectangle = QRect()) const;
 
 private:
-    GC      m_GC;
+    GC      m_windowGC;
+    GC      m_pixmapGC;
     QPixmap m_backBuffer;
     QWidget *m_window;