Bug 69162

Summary: [Qt] Build fix: Qt::escape is deprecated in Qt5
Product: WebKit Reporter: Pierre Rossi <pierre.rossi>
Component: New BugsAssignee: 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 Flags
Patch
none
Patch for landing none

Pierre Rossi
Reported 2011-09-30 12:43:37 PDT
[Qt] Build fix: Qt::escape is deprecated in Qt5
Attachments
Patch (8.61 KB, patch)
2011-09-30 12:59 PDT, Pierre Rossi 		no flags
DetailsFormatted DiffDiff
Patch for landing (8.01 KB, patch)
2011-10-03 06:04 PDT, Alexis Menard (darktears) 		no flags
DetailsFormatted DiffDiff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.
Pierre Rossi
Comment 1 2011-09-30 12:59:05 PDT
Created attachment 109332 [details] Patch
Andreas Kling
Comment 2 2011-09-30 13:28:10 PDT
Comment on attachment 109332 [details] Patch r=me
WebKit Review Bot
Comment 3 2011-09-30 13:46:49 PDT
Comment on attachment 109332 [details] Patch Clearing flags on attachment: 109332 Committed r96421: <http://trac.webkit.org/changeset/96421>
WebKit Review Bot
Comment 4 2011-09-30 13:46:53 PDT
All reviewed patches have been landed. Closing bug.
Csaba Osztrogonác
Comment 5 2011-09-30 23:47:41 PDT
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’
Csaba Osztrogonác
Comment 6 2011-09-30 23:47:54 PDT
Reopen to fix it ...
Csaba Osztrogonác
Comment 7 2011-10-01 00:10:57 PDT
Guys, what kind of Qt5 branch do you use? I updated Qt5 yesterday and "toHtmlEscaped" isn't exist in it.
Csaba Osztrogonác
Comment 8 2011-10-01 00:23:12 PDT
Rolled out by http://trac.webkit.org/changeset/96455 to make WK2 bot happier to be able catch regressions on WebKit trunk.
Pierre Rossi
Comment 9 2011-10-01 00:57:14 PDT
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
Alexis Menard (darktears)
Comment 10 2011-10-03 05:58:58 PDT
(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.
Alexis Menard (darktears)
Comment 11 2011-10-03 06:04:39 PDT
Created attachment 109478 [details] Patch for landing
Csaba Osztrogonác
Comment 12 2011-10-03 06:13:38 PDT
Comment on attachment 109478 [details] Patch for landing We shouldn't land it before updating the buildbot ... :S
Csaba Osztrogonác
Comment 13 2011-10-03 08:26:39 PDT
Comment on attachment 109478 [details] Patch for landing Let's go ahead. And I'll update Qt on the bot ASAP.
Csaba Osztrogonác
Comment 14 2011-10-03 08:58:12 PDT
Landed manually in http://trac.webkit.org/changeset/96503 (And I updated the buildbot too.)
Csaba Osztrogonác
Comment 15 2011-10-03 08:58:52 PDT
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.
Note You need to log in before you can comment on or make changes to this bug.