-
Notifications
You must be signed in to change notification settings - Fork 5.7k
Add Qt 4.8 support to deploy script, along with some patches to qt #173
Conversation
|
Oh, one more thing---of course these patches are all real git commits in clones of the respective projects. Once you've merged the phantomjs-experimental building branch, I'm more than happy to merge them into whatever repo you would like to use. |
|
Looks awesome indeed! One minor thing: presumably once Qt 4.8 we can just download the tarball vs clone the repo? |
Add Qt 4.8 support to deploy script, along with some patches to Qt. http://code.google.com/p/phantomjs/issues/detail?id=197 http://code.google.com/p/phantomjs/issues/detail?id=6 http://code.google.com/p/phantomjs/issues/detail?id=163
|
Yep, once it's released we can just do the tarball and apply the patches to that. Thanks! |
|
Does static build works? |
|
No, no static build of QtWebkit. See my comment in the pull request description---the official line from darktears at least is that it's impossible. |
|
While we look for 4.8 static solution, can you fix the configure so that it's still static build for compiling it with 4.7? |
|
Hmm it should still do that... see line 83 or so of the build script? |
|
Ah, you're right! I screwed up my build, nothing is wrong with the script. Thanks! |
|
The funny thing is that static build on Mac works (see the Mac version of the script) |
|
Interesting... I guess the ld on os x is a bit more lenient? Once webkit/qt is built as a part of phantomjs it should be fixable---it might be enough to disable webkit2 building maybe? Not entirely sure, I can't remember which modules are interconnected. |
This adds support for building Qt-4.8 from git with some patches to the build script. You might not want all of those patches so I'll describe them below.
qt48_enable_debugger.patch
Hardcodes the script debugger to enabled. Hacky, but the user won't have to manually enable the script debugger on startup this way---we know she wants to be debugging it if she's using the inspector.
qt48_fix_inspector.patch
The meat of the work. This updates the websocket code to support versions >6 so that newer Webkits can be debug clients. It also fixes a few bugs in the inspector backend that makes the inspector fail. I've not had these extensively reviewed upstream yet but I'll be grabbing jturcotte on irc soon.
qt48_headless_and_pdf_fixes.patch
Patches for Qt's QPDF QPrinter backend merged from the wkhml project. Also contains modifications to the 'minimal' lighthouse platform plugin to support fonts. Allows for a fully-functional headless backend when using Qt 4.8 configured with -qpa.