Include the code that we need

[mike-burns]

• cin and cout require iostream.
• QT_VERSION requires QtGlobal.
• QSocketNotifier requires QSocketNotifier.
• Unrelated to includes: let Qt figure out the spec.

Found by Jeremy Evans on behalf of the OpenBSD project.

[mhoran]

Let's #include <QSocketNotifier> in the .cpp file instead.

[mike-burns]

Yup, that also works.

[mhoran]

@jferris (or anyone on a Mac) -- could you test this out? We removed the -spec argument from qmake as it does not support additional platforms without modification. Also, qmake seems to be able to figure out the spec on its own, and on OS X correctly detects clang instead of GCC.

I had tested this previously (on the breakpad branch) but never merged it in. I would expect things to be fine but I do not know the history of why the spec was set manually. It seems to have stuck around from when it was originally added to the Rakefile, and later moved to CapybaraWebkitBuilder.

[jferris]

(or anyone on a Mac)

I'm not on a Mac anymore.

I do not know the history of why the spec was set manually.

When I first started the project, it didn't compile correctly on OS X without the spec. I forget what the exact error was. This may have been improved since the early Qt versions we started on (maybe 4.6).

[nritholtz]

Hey @mhoran. If you can tell me the steps of what I need to do, I can test it out on my Mac laptop.

[mhoran]

Thanks @nritholtz! Check out the include-things branch. All that needs to be checked is whether this branch still compiles on a Mac. rake build should be sufficient.

[nritholtz]

@mhoran Here is gist with output after checking out include-things branch and running rake build.

Please let me know if there is anything I can do to help.

[mhoran]

It looks like it was successful, despite the warning. Not sure where that's coming from. If you try to run the specs (bundle && rake), do they pass? (I know you have a separate issue for the compatibility specs).

Thanks!

[nritholtz]

Here's the bundle && rake results.
The only spec I see that failed is the selenium one, which I know is failing due to me having a newer version of Firefox. I have a PR, #740, which bumps the version to support latest Firefox versions, which should have this spec pass.

[mhoran]

Awesome, thanks!

[mhoran]

Merged as 0506f24.