1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove nativeResourceForWindow warning.

Browse Source 
The warning is useful for pointing out the the return
value will be null. However, code that correctly
checks the return value (such as qt_macWindowIsTextured),
still causes the warning to be printed.

Change-Id: I3828992b3d5e7b08451cf0e051b937fa9d9536d3
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
This commit is contained in:
Morten Johan Sørvig 2013-04-15 14:23:52 +02:00 committed by The Qt Project
parent b381581579
commit 8ddcc18ac1
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/cocoa/qcocoanativeinterface.mm
View File

@ -85,10 +85,8 @@ void *QCocoaNativeInterface::nativeResourceForContext(const QByteArray &resource
void *QCocoaNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window) void *QCocoaNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window)
{ {
if (!window->handle()) { if (!window->handle())
qWarning("QCocoaNativeInterface::nativeResourceForWindow: Native window has not been created.");
return 0; return 0;
}
if (resourceString == "nsopenglcontext") { if (resourceString == "nsopenglcontext") {
return static_cast<QCocoaWindow *>(window->handle())->currentContext()->nsOpenGLContext(); return static_cast<QCocoaWindow *>(window->handle())->currentContext()->nsOpenGLContext();