[Webkit-unassigned] [Bug 88874] [Qt][Win]QtTestBrowser somehow picks up DumpRenderTree's main.cpp, causing a failure to link

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=88874


Simon Hausmann <hausmann at webkit.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #147092|review?                     |review+
               Flag|                            |




--- Comment #8 from Simon Hausmann <hausmann at webkit.org>  2012-06-13 00:25:23 PST ---
(From update of attachment 147092)
View in context: https://bugs.webkit.org/attachment.cgi?id=147092&action=review

r=me, but I'll land it manually with adjusted ChangeLog.

> ChangeLog:4
> +        Rename main.cpp in QtTestBrowser because on Windows
> +        it conflicts with main.cpp from DumpRenderTree.

The format of this file isn't quite correct. I'll fix it when landing this manually. Joel, you can use Tools/Scripts/prepare-ChangeLog to create a template entry in all affected ChangeLogs to suite the WebKit style.

> Tools/QtTestBrowser/main.cpp:-6
> -/*
> - * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
> - * Copyright (C) 2009 Girish Ramakrishnan <girish at forwardbias.in>
> - * Copyright (C) 2006 George Staikos <staikos at kde.org>
> - * Copyright (C) 2006 Dirk Mueller <mueller at kde.org>
> -- 

This looks incomplete to me, the file has more lines than that. In git status (or git show --name-status HEAD) this should really show up as file rename, and then it should appear here also.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.