Summary: | [Qt] Build fix: Qt::escape is deprecated in Qt5 | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Pierre Rossi <pierre.rossi> | ||||||
Component: | New Bugs | Assignee: | Pierre Rossi <pierre.rossi> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | menard, ossy, webkit.review.bot | ||||||
Priority: | P2 | ||||||||
Version: | 528+ (Nightly build) | ||||||||
Hardware: | Unspecified | ||||||||
OS: | Unspecified | ||||||||
Bug Depends on: | 69206 | ||||||||
Bug Blocks: | |||||||||
Attachments: |
|
Description
Pierre Rossi
2011-09-30 12:43:37 PDT
Created attachment 109332 [details]
Patch
Comment on attachment 109332 [details]
Patch
r=me
Comment on attachment 109332 [details] Patch Clearing flags on attachment: 109332 Committed r96421: <http://trac.webkit.org/changeset/96421> All reviewed patches have been landed. Closing bug. It broke the WK2 bot ... :-/ In file included from /ramdisk/qt-linux-32-release-webkit2/build/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp:79: /ramdisk/qt-linux-32-release-webkit2/build/Source/JavaScriptCore/wtf/qt/UtilsQt.h: In function ‘QString escapeHtml(const QString&)’: /ramdisk/qt-linux-32-release-webkit2/build/Source/JavaScriptCore/wtf/qt/UtilsQt.h:31: error: ‘const class QString’ has no member named ‘toHtmlEscaped’ Reopen to fix it ... Guys, what kind of Qt5 branch do you use? I updated Qt5 yesterday and "toHtmlEscaped" isn't exist in it. Rolled out by http://trac.webkit.org/changeset/96455 to make WK2 bot happier to be able catch regressions on WebKit trunk. My bad, I guess I should have put commit-queue: - on this one. The commit is on the public gitorious though: http://qt.gitorious.org/qt/qtbase/commit/b863df7de926448cf0057272c16da04b7cfb11ee (In reply to comment #9) > My bad, I guess I should have put commit-queue: - on this one. > > The commit is on the public gitorious though: http://qt.gitorious.org/qt/qtbase/commit/b863df7de926448cf0057272c16da04b7cfb11ee It is on the public gitorious on *master*. What we track is the stable combination in Qt5, which the CI sha keys, the one you have when you use the Qt5 repo and init-repository, the one you get with git pull and git submodule update. Now It went through the CI we can land it. Created attachment 109478 [details]
Patch for landing
Comment on attachment 109478 [details]
Patch for landing
We shouldn't land it before updating the buildbot ... :S
Comment on attachment 109478 [details]
Patch for landing
Let's go ahead. And I'll update Qt on the bot ASAP.
Landed manually in http://trac.webkit.org/changeset/96503 (And I updated the buildbot too.) Comment on attachment 109478 [details] Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=109478&action=review I fixed the changelog before landing .... > Source/JavaScriptCore/ChangeLog:8 > + Reviewed by Andreas. Reviewed by Andreas Kling. > Source/WebCore/ChangeLog:8 > + Reviewed by Andreas. Reviewed by Andreas. |