Bug 31355 – Fixes for QWebElement and QWebSettings documentation

• Component: WebKit Qt
• Status: RESOLVED FIXED

[David Boddie]

Created attachment 42965 [details]
Patches to qwebsettings.cpp, qwebelement.cpp, main.cpp, webelement.pro

Patches to qwebsettings.cpp, qwebelement.cpp, main.cpp, webelement.pro.

[Simon Hausmann]

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 @@
> [phone]  David Boddie  <David Boddie <[e-mail]>>

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)?

[David Boddie]

Created attachment 43061 [details]
Updated webelement.pro file to avoid build breakage.

[David Boddie]

I've added a new version of the patch which hopefully fixes the build issue.

[Adam Barth]

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.

[David Boddie]

Created attachment 43302 [details]
Removed QWebSettings changes since these have now been reverted in an earlier change.

[Simon Hausmann]

(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? :)

[WebKit Commit Bot]

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>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.