Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Add Qt 4.8 support to deploy script, along with some patches to qt #173

Merged
merged 2 commits into from
Nov 17, 2011
Merged

Add Qt 4.8 support to deploy script, along with some patches to qt #173

merged 2 commits into from
Nov 17, 2011

Conversation

lfranchi
Copy link
Contributor

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.

  • This adds a --qt-4.8 parameter to the script. That will trigger a git checkout and the 4.8 codepaths
  • This also adds a --headless parameter that may be passed in along with --qt-4.8. This makes it a lighthouse build
  • This disables static builds for Qt 4.8. QtWebkit-2.2 cannot be built statically. As far as I am aware this cannot be worked around; the splitting up of WebKit into WebCore/WebKit/WebKit2 leads to cyclic static dependencies that cannot be satisfied.
  • I suck at bash so I apologize in advance. Comments welcome.

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.

@lfranchi
Copy link
Contributor Author

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.

@lfranchi lfranchi mentioned this pull request Nov 16, 2011
@ariya
Copy link
Owner

ariya commented Nov 17, 2011

Looks awesome indeed!

One minor thing: presumably once Qt 4.8 we can just download the tarball vs clone the repo?

@lfranchi
Copy link
Contributor Author

Yep, once it's released we can just do the tarball and apply the patches to that. Thanks!

@ariya
Copy link
Owner

ariya commented Nov 19, 2011

Does static build works?

@lfranchi
Copy link
Contributor Author

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.

@ariya
Copy link
Owner

ariya commented Nov 19, 2011

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?

@lfranchi
Copy link
Contributor Author

Hmm it should still do that... see line 83 or so of the build script?

@ariya
Copy link
Owner

ariya commented Nov 19, 2011

Ah, you're right! I screwed up my build, nothing is wrong with the script. Thanks!

@ariya
Copy link
Owner

ariya commented Dec 22, 2011

The funny thing is that static build on Mac works (see the Mac version of the script)

@lfranchi
Copy link
Contributor Author

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.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants