Bug 65410 – [Qt][WK2] Fix the build afer r92014

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Balazs Kelemen]

The bug is in Qt. qwindowdefs.h should not define a typedef for such a popular word as Region.
The fix is indeed ugly and I hope it would be fixed in Qt soon.

[Balazs Kelemen]

Created attachment 102432 [details]
Patch

[Noam Rosenthal]

Comment on attachment 102432 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=102432&action=review

> Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp:38
> +// Fix for the intrusive typedef in qwindowdefs.h until it has been fixed in Qt.

Was a bug filed with Qt?

> Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp:40
> +#define Region WebCore::Region
> +#endif

Adding "using WebCore::Region" inside the "namespace WebKit" clause should do the trick as well.
In either case, I believe this problem is confined to X11, so let's #ifdef it.

#ifdef Q_WS_X11
using WebCore::Region;
#endif

seems a bit less intrusive than a new #define Region :)

[Balazs Kelemen]

Created attachment 102437 [details]
Patch

[Balazs Kelemen]

(In reply to comment #2)
> (From update of attachment 102432 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=102432&action=review
> 
> > Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp:38
> > +// Fix for the intrusive typedef in qwindowdefs.h until it has been fixed in Qt.
> 
> Was a bug filed with Qt?

Not yet.

> 
> > Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp:40
> > +#define Region WebCore::Region
> > +#endif
> 
> Adding "using WebCore::Region" inside the "namespace WebKit" clause should do the trick as well.

Good point.

> In either case, I believe this problem is confined to X11, so let's #ifdef it.
> 
> #ifdef Q_WS_X11
> using WebCore::Region;
> #endif
> 
> seems a bit less intrusive than a new #define Region :)

These suggestions had been incorporated into the new patch.

[Balazs Kelemen]

Comment on attachment 102437 [details]
Patch

Clearing flags on attachment: 102437

Committed r92052: <http://trac.webkit.org/changeset/92052>

[Balazs Kelemen]

All reviewed patches have been landed.  Closing bug.