Bug 36745 - [Qt] qmake/symbian build failure
Summary: [Qt] qmake/symbian build failure
Status: CLOSED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Qt (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC S60 3rd edition
: P2 Normal
Assignee: Stanislav Paltis
URL:
Keywords: Qt
Depends on:
Blocks: 35784
  Show dependency treegraph
 
Reported: 2010-03-29 01:47 PDT by t.zander
Modified: 2010-04-06 02:12 PDT (History)
3 users (show)

See Also:


Attachments
fix (647 bytes, patch)
2010-03-29 02:03 PDT, t.zander
hausmann: review-
hausmann: commit-queue-
Details | Formatted Diff | Diff
updated patch (864 bytes, patch)
2010-03-29 02:33 PDT, t.zander
hausmann: review+
hausmann: commit-queue-
Details | Formatted Diff | Diff
Proposed patch to fix a build break on Symbian QTWebkit build. (1.10 KB, text/plain)
2010-03-30 12:06 PDT, Stanislav Paltis
no flags Details
Modified previous patch to convert Tabs to spaces (1.13 KB, patch)
2010-03-30 13:01 PDT, Stanislav Paltis
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description t.zander 2010-03-29 01:47:46 PDT
to make webkit compile on a linux box using gcce and cross compiling to arm for symbian I found that the attached change was required.
Comment 1 t.zander 2010-03-29 02:03:05 PDT
Created attachment 51886 [details]
fix
Comment 2 WebKit Review Bot 2010-03-29 02:07:12 PDT
Attachment 51886 [details] did not pass style-queue:

Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1
Total errors found: 0 in 0 files


If any of these errors are false positives, please file a bug against check-webkit-style.
Comment 3 Simon Hausmann 2010-03-29 02:19:45 PDT
Comment on attachment 51886 [details]
fix

In Qt 4.6 the variable is called defFilePath. This patch would break support building with def files against Qt 4.6.

How about simply setting both variables? :)
Comment 4 Simon Hausmann 2010-03-29 02:20:18 PDT
(In reply to comment #2)
> Attachment 51886 [details] did not pass style-queue:
> 
> Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1
> Total errors found: 0 in 0 files
> 
> 
> If any of these errors are false positives, please file a bug against
> check-webkit-style.

I think the reason for this is because the patch doesn't apply with -p1 but only with -p0.
Comment 5 t.zander 2010-03-29 02:33:39 PDT
Created attachment 51891 [details]
updated patch
Comment 6 Simon Hausmann 2010-03-29 03:22:13 PDT
Comment on attachment 51891 [details]
updated patch

Looks good to me.

I'll land it manually to add a link to bugzilla to the ChangeLog.
Comment 7 Simon Hausmann 2010-03-29 03:44:49 PDT
Committed r56714: <http://trac.webkit.org/changeset/56714>
Comment 8 Simon Hausmann 2010-03-29 03:45:59 PDT
Revision r56714 cherry-picked into qtwebkit-2.0 with commit 5df858f8f4da97d738f8e957eabc8398a1e5bfb4
Comment 9 Stanislav Paltis 2010-03-30 12:06:19 PDT
Created attachment 52063 [details]
Proposed patch to fix a build break on Symbian QTWebkit build.

This patch fixes comment character from ";" to "#" in the "symbian" section of .pro file. 
Was discovered while running qmake on Webcore.pro with QT 4.6.2 for Symbian.
Was getting an error at line 2940:
Parse Error (;; defFilePath is for Qt4.6 compatibility')
Unterminated conditional block at end of file.
Comment 10 WebKit Review Bot 2010-03-30 12:11:52 PDT
Attachment 52063 [details] did not pass style-queue:

Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1
File not a recognized type to check. Skipping: "WebCore/WebCore.pro"
WebCore/ChangeLog:8:  Line contains tab character.  [whitespace/tab] [5]
WebCore/ChangeLog:9:  Line contains tab character.  [whitespace/tab] [5]
Total errors found: 2 in 2 files


If any of these errors are false positives, please file a bug against check-webkit-style.
Comment 11 Stanislav Paltis 2010-03-30 13:01:04 PDT
Created attachment 52072 [details]
Modified previous patch to convert Tabs to spaces
Comment 12 Laszlo Gombos 2010-03-30 19:59:02 PDT
Comment on attachment 52072 [details]
Modified previous patch to convert Tabs to spaces

r+, thanks for the patch. 

Next time please make sure the text is properly aligned in the ChangeLog. 

This time I fix the ChangeLog when I commit.
Comment 13 Laszlo Gombos 2010-03-30 20:37:18 PDT
Landed as http://trac.webkit.org/changeset/56822.
Comment 14 Simon Hausmann 2010-04-06 01:05:18 PDT
cherry-pick-for-backport: <r56822>
Comment 15 Simon Hausmann 2010-04-06 02:12:20 PDT
Revision r56714 cherry-picked into qtwebkit-2.0 with commit 5df858f8f4da97d738f8e957eabc8398a1e5bfb4
Comment 16 Simon Hausmann 2010-04-06 02:12:41 PDT
Revision r56822 cherry-picked into qtwebkit-2.0 with commit 4b42600cfd2bc353ecbc64efc03b7aaf6d7e0bbf