diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 17:46:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-12 17:46:51 (GMT) |
| commit | d366c69bbd02a25c61df2e99ed842fa14ec2d643 (patch) | |
| tree | fb635f7643878d0990b56e6b93791ecc6d5828b2 /src/opengl | |
| parent | 97f7299854197c6093aaefc1ec174209d68892e7 (diff) | |
| parent | 3ee89bc0830f69d44f272eff5a0c886bff33c92e (diff) | |
| download | Qt-d366c69bbd02a25c61df2e99ed842fa14ec2d643.zip Qt-d366c69bbd02a25c61df2e99ed842fa14ec2d643.tar.gz Qt-d366c69bbd02a25c61df2e99ed842fa14ec2d643.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Properly emit geometryChanged() when the position change.
QCoreApplication::library path, ensure mutex lock ordering
Fix memory leak.
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl_mac.mm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/opengl/qgl_mac.mm b/src/opengl/qgl_mac.mm index 4d7532e..66fe7d3 100644 --- a/src/opengl/qgl_mac.mm +++ b/src/opengl/qgl_mac.mm @@ -804,17 +804,22 @@ void QGLContext::generateFontDisplayLists(const QFont & /* fnt */, int /* listBa static CFBundleRef qt_getOpenGLBundle() { CFBundleRef bundle = 0; + CFStringRef urlString = QCFString::toCFStringRef(QLatin1String("/System/Library/Frameworks/OpenGL.framework")); QCFType<CFURLRef> url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, - QCFString::toCFStringRef(QLatin1String("/System/Library/Frameworks/OpenGL.framework")), kCFURLPOSIXPathStyle, false); + urlString, kCFURLPOSIXPathStyle, false); if (url) bundle = CFBundleCreate(kCFAllocatorDefault, url); + CFRelease(urlString); return bundle; } void *QGLContext::getProcAddress(const QString &proc) const { - return CFBundleGetFunctionPointerForName(QCFType<CFBundleRef>(qt_getOpenGLBundle()), - QCFString(proc)); + CFStringRef procName = QCFString(proc).toCFStringRef(proc); + void *result = CFBundleGetFunctionPointerForName(QCFType<CFBundleRef>(qt_getOpenGLBundle()), + procName); + CFRelease(procName); + return result; } #ifndef QT_MAC_USE_COCOA /***************************************************************************** |