[Qt] Fix debug Windows build
Created attachment 162558 [details] Patch
Comment on attachment 162558 [details] Patch Rejecting attachment 162558 [details] from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: F/ChangeLog CONFLICT (content): Merge conflict in Source/WTF/ChangeLog Failed to merge in the changes. Patch failed at 0001 ENH: Add Logging to StringImpl to track String Types When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. Full output: http://queues.webkit.org/results/13778366
Committed r127819: <http://trac.webkit.org/changeset/127819>