Attachment 123337 Details for Bug 76657 – Patch

[patch] Patch

bug-76657-20120120141139.patch (text/plain), 1.53 KB, created by Anselmo L. S. Melo on 2012-01-20 09:12:39 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Anselmo L. S. Melo

Created: 2012-01-20 09:12:39 PST

Size: 1.53 KB

patch

obsolete

>Subversion Revision: 105508
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 339e9b5b246afc206f8faff2549e7fb043ede815..bbbbe523ad11a726ebcd280b96d7b00e738b85e8 100755
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2012-01-20  Anselmo L. S. Melo  <anselmo.melo@openbossa.org>
>+
>+        [Qt] Fix the build with the newes Qt5 hashes
>+        https://bugs.webkit.org/show_bug.cgi?id=76657
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests are needed, it was a build fix.
>+
>+        * platform/graphics/cairo/OpenGLShims.cpp:
>+        (WebCore::getProcAddress): Qt5 modified the return of QGLContext::getProcAddress().
>+
> 2012-01-20  Kinuko Yasuda  <kinuko@chromium.org>
> 
>         Add DataTransferItems support for drag-and-drop'ed files and texts
>diff --git a/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp b/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp
>index 28316e0e4a5391c4511605bde2867cf9e1840eaa..2994cd2c939a0506c10c8b109a381bc21b3e8ba9 100644
>--- a/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp
>+++ b/Source/WebCore/platform/graphics/cairo/OpenGLShims.cpp
>@@ -42,7 +42,7 @@ OpenGLFunctionTable* openGLFunctionTable()
> #if PLATFORM(QT)
> static void* getProcAddress(const char* procName)
> {
>-    return QGLContext::currentContext()->getProcAddress(QString::fromLatin1(procName));
>+    return reinterpret_cast<void*>(QGLContext::currentContext()->getProcAddress(QString::fromLatin1(procName)));
> }
> #else
> typedef void* (*glGetProcAddressType) (const char* procName);

Actions: View | Formatted Diff | Diff

Attachments on bug 76657: 123179 | 123337 | 123350