Upgrade to Qt 4.8.5

[vitallium]

Upgrade to Qt 4.8.5

#11452

[ariya]

Hmm, I think you should do this to 1.9 branch?

[ariya]

Seems that I can cherry-pick it to 1.9 branch just fine, I'll do that!

[ariya]

BTW, is src/qt/qmake/qmake.exe intentional?

[vitallium]

No. Let me check PR once more

[vitallium]

Ok. I removed src/qt/qmake/qmake.exe. It looks good now.

[ariya]

Somehow the build fails on OS X:

duplicate symbol qInitResources_WebKit()     in:
    qrc_WebKit.o
    /Users/ariya/dev/ofilabs/phantomjs/src/qt/lib/libQtWebKit.a(qrc_WebKit.o)
duplicate symbol qCleanupResources_WebKit()     in:
    qrc_WebKit.o
    /Users/ariya/dev/ofilabs/phantomjs/src/qt/lib/libQtWebKit.a(qrc_WebKit.o)
duplicate symbol _qCleanupResources_WebKit__dest_instance__ in:
    qrc_WebKit.o
    /Users/ariya/dev/ofilabs/phantomjs/src/qt/lib/libQtWebKit.a(qrc_WebKit.o)
duplicate symbol qInitResources_InspectorBackendStub()     in:
    qrc_InspectorBackendStub.o
    /Users/ariya/dev/ofilabs/phantomjs/src/qt/lib/libQtWebKit.a(qrc_InspectorBackendStub.o)
duplicate symbol qCleanupResources_InspectorBackendStub()     in:
    qrc_InspectorBackendStub.o
    /Users/ariya/dev/ofilabs/phantomjs/src/qt/lib/libQtWebKit.a(qrc_InspectorBackendStub.o)
duplicate symbol _qCleanupResources_InspectorBackendStub__dest_instance__ in:
    qrc_InspectorBackendStub.o
    /Users/ariya/dev/ofilabs/phantomjs/src/qt/lib/libQtWebKit.a(qrc_InspectorBackendStub.o)

Does it ring a bell?

[vitallium]

I'll try to fix it.

[vitallium]

I've updated PR. @ariya could you check it again?

[ariya]

@vitallium Checking and testing...

[ariya]

@vitallium Hmm, still the same problem. Is there a diff between this and your previous one?

[vitallium]

@ariya unfortunately no. This problem is Mac only. Will continue investigation.

[vitallium]

Finally! I resolved the issue with duplicate symbols. I'm sure it will compile on OS X now :)

[JamesMGreene]

🤘

[vitallium]

/cc @ariya We can merge this pull request. :)

[ariya]

Is there a new commit here? I don't seem to spot it.

[vitallium]

@ariya, no, there is no. I want to keep this upgrade in one commit.

[ariya]

Sounds good, I will check this.

[ariya]

Works well, it is landed now! Thank you so much @vitallium :)