Bug 103870 - Fix compilation for Qt5.0.0 stable branch.
Summary: Fix compilation for Qt5.0.0 stable branch.
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Qt (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Michael Brüning
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-12-03 02:33 PST by Michael Brüning
Modified: 2012-12-05 09:49 PST (History)
13 users (show)

See Also:


Attachments
Patch (2.45 KB, patch)
2012-12-03 02:52 PST, Michael Brüning
no flags Details | Formatted Diff | Diff
Patch (6.67 KB, patch)
2012-12-04 13:02 PST, Andras Becsi
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Brüning 2012-12-03 02:33:20 PST
QWindow::pos() and QQuickItem::pos() have been renamed to position().
Comment 1 Michael Brüning 2012-12-03 02:42:08 PST
Patch has been made in QtWebKit module in Qt 5 by Lars Knoll and I am moving it to trunk as building against the stable branch of Qt 5 is not possible at the moment and it will be necessary once the RC is released.

If this patch goes in, the bots will need to be updated to a recent stable Qt5 version (e.g. f67e9c6bf28a2ced359d20bbd78478b15d6146d2 or later).

(Apologies for the incomplete description, accidentally hit return prematurely when adding CCs.)
Comment 2 Michael Brüning 2012-12-03 02:52:47 PST
Created attachment 177217 [details]
Patch
Comment 3 Early Warning System Bot 2012-12-03 02:58:59 PST
Comment on attachment 177217 [details]
Patch

Attachment 177217 [details] did not pass qt-wk2-ews (qt):
Output: http://queues.webkit.org/results/15117327
Comment 4 Csaba Osztrogonác 2012-12-03 03:03:04 PST
Simon, should we update the bots to stable/f67e9c6bf28a2ced359d20bbd78478b15d6146d2 ?
Comment 5 Simon Hausmann 2012-12-03 07:29:59 PST
No objections at all from my side :)
Comment 6 Andras Becsi 2012-12-04 13:02:15 PST
Created attachment 177531 [details]
Patch
Comment 7 Andras Becsi 2012-12-04 13:05:59 PST
(In reply to comment #6)
> Created an attachment (id=177531) [details]
> Patch

For the sake of convenience I squashed all the patches neede from the stable branch.

As soon as the bots have been updated to the latest stable these fixes are needed.
Comment 8 Early Warning System Bot 2012-12-04 13:06:32 PST
Comment on attachment 177531 [details]
Patch

Attachment 177531 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/15119926
Comment 9 Early Warning System Bot 2012-12-04 13:08:35 PST
Comment on attachment 177531 [details]
Patch

Attachment 177531 [details] did not pass qt-wk2-ews (qt):
Output: http://queues.webkit.org/results/15120965
Comment 10 Csaba Osztrogonác 2012-12-05 09:49:12 PST
Comment on attachment 177531 [details]
Patch

Clearing flags on attachment: 177531

Committed r136707: <http://trac.webkit.org/changeset/136707>
Comment 11 Csaba Osztrogonác 2012-12-05 09:49:18 PST
All reviewed patches have been landed.  Closing bug.