Changeset 561 for trunk/src/opengl/qgl_mac.mm

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/opengl/qgl_mac.mm (modified) (6 diffs)

trunk/src/opengl/qgl_mac.mm

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -461 +461 @@
         aglDestroyContext((AGLContext)d->cx);
 #else
+    QMacCocoaAutoReleasePool pool;
     [static_cast<NSOpenGLContext *>(d->cx) release];
 #endif
@@ -494 +495 @@
     [static_cast<NSOpenGLContext *>(d->cx) makeCurrentContext];
 #endif
-    currentCtx = this;
-    if (!qgl_context_storage.hasLocalData() && QThread::currentThread())
-        qgl_context_storage.setLocalData(new QGLThreadContext);
-    if (qgl_context_storage.hasLocalData())
-        qgl_context_storage.localData()->context = this;
+    QGLContextPrivate::setCurrentContext(this);
 }
 
@@ -657 +654 @@
         return;
 
-    currentCtx = 0;
-    if (qgl_context_storage.hasLocalData())
-        qgl_context_storage.localData()->context = 0;
+    QGLContextPrivate::setCurrentContext(0);
 #ifndef QT_MAC_USE_COCOA
     aglSetCurrentContext(0);