Summary: | [Qt][WK2] Fix the build afer r92014 | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Balazs Kelemen <kbalazs> | ||||||
Component: | WebKit2 | Assignee: | Balazs Kelemen <kbalazs> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | kling, ossy | ||||||
Priority: | P2 | Keywords: | Qt, QtTriaged | ||||||
Version: | 528+ (Nightly build) | ||||||||
Hardware: | All | ||||||||
OS: | All | ||||||||
Attachments: |
|
Description
Balazs Kelemen
2011-07-30 04:38:16 PDT
Created attachment 102432 [details]
Patch
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 :) Created attachment 102437 [details]
Patch
(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. Comment on attachment 102437 [details] Patch Clearing flags on attachment: 102437 Committed r92052: <http://trac.webkit.org/changeset/92052> All reviewed patches have been landed. Closing bug. |