Bug 40313 - [Qt] Fix #ifdef statements in QtTestBrowser's main.cpp file...
Summary: [Qt] Fix #ifdef statements in QtTestBrowser's main.cpp file...
Status: CLOSED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Qt (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC Linux
: P5 Normal
Assignee: Nobody
URL:
Keywords: Qt
Depends on:
Blocks: 35784
  Show dependency tree / graph
 
Reported: 2010-06-08 11:36 PDT by Dawit A.
Modified: 2010-06-15 07:14 PDT (History)
2 users (show)

See Also:

Attachments
Patch (1.65 KB, patch)
2010-06-08 11:41 PDT, Dawit A. 		laszlo.gombos: review-
Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Dawit A. 2010-06-08 11:36:28 PDT 
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
Comment 1 Dawit A. 2010-06-08 11:41:12 PDT 
Created attachment 58164 [details]
Patch

Trivial fix for the #ifdef statements...
Comment 2 Laszlo Gombos 2010-06-08 12:34:28 PDT 
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.
Comment 3 Dawit A. 2010-06-08 13:44:51 PDT 
(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.
Comment 4 Kent Hansen 2010-06-15 04:23:44 PDT 
Committed r56575: <http://trac.webkit.org/changeset/56575>
Comment 5 Simon Hausmann 2010-06-15 07:13:59 PDT 
Revision r56575 cherry-picked into qtwebkit-2.0 with commit a114f863da6c67ed95cd31630b9bfd758b87d293