Bug 40313

Summary: [Qt] Fix #ifdef statements in QtTestBrowser's main.cpp file...
Product: WebKit Reporter: Dawit A. <adawit>
Component: WebKit QtAssignee: Nobody <webkit-unassigned>
Status: CLOSED FIXED    
Severity: Normal CC: hausmann, kent.hansen
Priority: P5 Keywords: Qt
Version: 528+ (Nightly build)   
Hardware: PC   
OS: Linux   
Bug Depends on:    
Bug Blocks: 35784    
Attachments:
Description Flags
Patch laszlo.gombos: review-

Dawit A.
Reported 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
Attachments
Patch (1.65 KB, patch)
2010-06-08 11:41 PDT, Dawit A. 		laszlo.gombos: review-
DetailsFormatted DiffDiff
View All Add attachment proposed patch, testcase, etc.
Dawit A.
Comment 1 2010-06-08 11:41:12 PDT
Created attachment 58164 [details] Patch Trivial fix for the #ifdef statements...
Laszlo Gombos
Comment 2 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.
Dawit A.
Comment 3 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.
Kent Hansen
Comment 4 2010-06-15 04:23:44 PDT
Committed r56575: <http://trac.webkit.org/changeset/56575>
Simon Hausmann
Comment 5 2010-06-15 07:13:59 PDT
Revision r56575 cherry-picked into qtwebkit-2.0 with commit a114f863da6c67ed95cd31630b9bfd758b87d293
Note You need to log in before you can comment on or make changes to this bug.