Summary: | [Qt] Buildfix for newer Qt5 | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Csaba Osztrogonác <ossy> | ||||||
Component: | Tools / Tests | Assignee: | Csaba Osztrogonác <ossy> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Blocker | CC: | abecsi, cmarcelo, hausmann, menard, ossy, webkit.review.bot, zoltan | ||||||
Priority: | P1 | Keywords: | Qt, QtTriaged | ||||||
Version: | 528+ (Nightly build) | ||||||||
Hardware: | All | ||||||||
OS: | All | ||||||||
Attachments: |
|
Description
Csaba Osztrogonác
2012-06-19 02:38:28 PDT
Created attachment 148296 [details]
Patch
Comment on attachment 148296 [details]
Patch
r=me. this is safe to land even before the update.
Comment on attachment 148296 [details] Patch Attachment 148296 [details] did not pass qt-ews (qt): Output: http://queues.webkit.org/results/12973661 Comment on attachment 148296 [details]
Patch
We need ifdef guards for Qt 4.8 build. :-/
(In reply to comment #4) > (From update of attachment 148296 [details]) > We need ifdef guards for Qt 4.8 build. :-/ I think it would be easier to change the calls to clear() with a null pointer assignment, i.e. foopointer.clear(); with foopointer = 0; and thus avoid the #ifdefs. (In reply to comment #5) > (In reply to comment #4) > > (From update of attachment 148296 [details] [details]) > > We need ifdef guards for Qt 4.8 build. :-/ > > I think it would be easier to change the calls to clear() with a null pointer assignment, i.e. > > foopointer.clear(); > > with > > foopointer = 0; > > and thus avoid the #ifdefs. let me check and fix it *** Bug 89029 has been marked as a duplicate of this bug. *** (In reply to comment #6) > (In reply to comment #5) > > (In reply to comment #4) > > > (From update of attachment 148296 [details] [details] [details]) > > > We need ifdef guards for Qt 4.8 build. :-/ > > > > I think it would be easier to change the calls to clear() with a null pointer assignment, i.e. > > > > foopointer.clear(); > > > > with > > > > foopointer = 0; > > > > and thus avoid the #ifdefs. > > let me check and fix it I think there is a fix in qtbase for the clear() function in a newer hash, it just did not make it to the supermodule yet. (In reply to comment #8) > I think there is a fix in qtbase for the clear() function in a newer hash, it just did not make it to the supermodule yet. The latest Qt5 hash contains QPointer.clear(), but Qt 4.8's QPointer() doesn't. Created attachment 148308 [details]
Patch
Use zero assignment instead of QPointer.clear(), because Qt4's QPointer class doesn't have clear method.
Comment on attachment 148308 [details] Patch Landed in http://trac.webkit.org/changeset/120704 |