Bug 31355

Summary: Fixes for QWebElement and QWebSettings documentation
Product: WebKit Reporter: David Boddie <dboddie>
Component: WebKit QtAssignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: commit-queue, hausmann
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: All   
OS: All   
Attachments:
Description Flags
Patches to qwebsettings.cpp, qwebelement.cpp, main.cpp, webelement.pro
hausmann: review-
Updated webelement.pro file to avoid build breakage.
abarth: review-
Removed QWebSettings changes since these have now been reverted in an earlier change. none

Description David Boddie 2009-11-11 08:47:56 PST
Created attachment 42965 [details]
Patches to qwebsettings.cpp, qwebelement.cpp, main.cpp, webelement.pro

Patches to qwebsettings.cpp, qwebelement.cpp, main.cpp, webelement.pro.
Comment 1 Simon Hausmann 2009-11-11 13:11:18 PST
Comment on attachment 42965 [details]
Patches to qwebsettings.cpp, qwebelement.cpp, main.cpp, webelement.pro

> Index: WebKit/qt/ChangeLog
> ===================================================================
> --- WebKit/qt/ChangeLog	(revision 50807)
> +++ WebKit/qt/ChangeLog	(working copy)
> @@ -1,3 +1,19 @@
> +2009-11-11  David Boddie  <David Boddie <dboddie@trolltech.com>>

It looks like your name appears once too much :-)

> Index: WebKit/qt/docs/webkitsnippets/webelement/webelement.pro
> ===================================================================
> --- WebKit/qt/docs/webkitsnippets/webelement/webelement.pro	(revision 50806)
> +++ WebKit/qt/docs/webkitsnippets/webelement/webelement.pro	(working copy)
> @@ -1,5 +1,6 @@
>  TEMPLATE = app
>  CONFIG -= app_bundle
> +QT       += webkit
>  SOURCES   = main.cpp
>  include(../../../../../WebKit.pri)
>  QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR

Hm, this is going to break the build of the snippet inside the WebKit tree. Could you try guarding it with CONFIG(QTDIR_build)?
Comment 2 David Boddie 2009-11-12 05:28:51 PST
Created attachment 43061 [details]
Updated webelement.pro file to avoid build breakage.
Comment 3 David Boddie 2009-11-12 05:29:23 PST
I've added a new version of the patch which hopefully fixes the build issue.
Comment 4 Adam Barth 2009-11-14 22:45:28 PST
Comment on attachment 43061 [details]
Updated webelement.pro file to avoid build breakage.

Checking style for patch 43061 from bug 31355.
Patch failed to apply and check style
patching file WebKit/qt/ChangeLog
Hunk #1 succeeded at 1 with fuzz 3.
patching file WebKit/qt/Api/qwebelement.cpp
patching file WebKit/qt/Api/qwebsettings.cpp
Hunk #1 FAILED at 495.
Hunk #2 FAILED at 515.
Hunk #3 FAILED at 525.
Hunk #4 FAILED at 541.
4 out of 4 hunks FAILED -- saving rejects to file WebKit/qt/Api/qwebsettings.cpp.rej
patch -p0 "WebKit/qt/Api/qwebsettings.cpp" returned 1.  Pass --force to ignore patch failures.
Comment 5 David Boddie 2009-11-16 05:59:51 PST
Created attachment 43302 [details]
Removed QWebSettings changes since these have now been reverted in an earlier change.
Comment 6 Simon Hausmann 2009-11-22 09:56:14 PST
(In reply to comment #5)
> Created an attachment (id=43302) [details]
> Removed QWebSettings changes since these have now been reverted in an earlier
> change.

David, did you mean to set review=? on this attachment? :)
Comment 7 WebKit Commit Bot 2009-11-23 07:17:27 PST
Comment on attachment 43302 [details]
Removed QWebSettings changes since these have now been reverted in an earlier change.

Clearing flags on attachment: 43302

Committed r51308: <http://trac.webkit.org/changeset/51308>
Comment 8 WebKit Commit Bot 2009-11-23 07:17:33 PST
All reviewed patches have been landed.  Closing bug.