Bug 93996 – [Qt] Use Q_SLOTS and Q_SIGNALS instead of slots and signals

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Qt

[Lauro Moura Maranhao Neto]

Use Q_* instead of slots and signals to avoid compile errors when including 3rd party headers.

[Lauro Moura Maranhao Neto]

Created attachment 158379 [details]
Patch

[WebKit Review Bot]

Comment on attachment 158379 [details]
Patch

Rejecting attachment 158379 [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:
CT (content): Merge conflict in LayoutTests/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 WebKitTestRunner needs layoutTestController.dumpResourceLoadCallbacks

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/13492689

[Rafael Brandao]

Comment on attachment 158379 [details]
Patch

The error seems unrelated. cq+ again.

[WebKit Review Bot]

Comment on attachment 158379 [details]
Patch

Clearing flags on attachment: 158379

Committed r125603: <http://trac.webkit.org/changeset/125603>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.

[Simon Hausmann]

Hm, did you actually encounter this problem for real?

[Lauro Moura Maranhao Neto]

(In reply to comment #6)
> Hm, did you actually encounter this problem for real?

Yes, we had conflicts when experimenting with libsoup.

[Balazs Kelemen]

(In reply to comment #7)
> (In reply to comment #6)
> > Hm, did you actually encounter this problem for real?
> 
> Yes, we had conflicts when experimenting with libsoup.

In this case the macro style should be a guideline otherwise it will break periodically. I suggest to mention this on webkit-qt, and also we should implement it in check-webkit-style.