[Qt] Fix #ifdef statements in QtTestBrowser's main.cpp file...

• Component: WebKit Qt
• Status: CLOSED FIXED

[Dawit A.]

No idea if using "#ifdef Q_WS_MAEMO_5 && defined(Q_WS_S60" is intentional in WebKitTools/QtTestBrowser/main.cpp, but gcc throws up the following warning:

qtwebkit/WebKitTools/QtTestBrowser/main.cpp:88:21: warning: extra tokens at end of #ifdef directive
qtwebkit/WebKitTools/QtTestBrowser/main.cpp:675:21: warning: extra tokens at end of #ifdef directive
qtwebkit/WebKitTools/QtTestBrowser/main.cpp:776:21: warning: extra tokens at end of #ifdef directive

[Dawit A.]

Created attachment 58164 [details]
Patch

Trivial fix for the #ifdef statements...

[Laszlo Gombos]

Comment on attachment 58164 [details]
Patch

This has been fixed some time back - http://trac.webkit.org/changeset/56575; that is why the patch does not seems to apply against the trunk any more.

[Dawit A.]

(In reply to comment #2)
> (From update of attachment 58164 [details])
> This has been fixed some time back - http://trac.webkit.org/changeset/56575; that is why the patch does not seems to apply against the trunk any more.

Can the fix then be cherry picked back into the qtwebkit-2.0 branch or is it too late for that ? It definitely is not fixed the qtwebkit 2.0 branch as I updated my copy to check before submitting the patch.

[Kent Hansen]

Committed r56575: <http://trac.webkit.org/changeset/56575>

[Simon Hausmann]

Revision r56575 cherry-picked into qtwebkit-2.0 with commit a114f863da6c67ed95cd31630b9bfd758b87d293