EXT-5969 build and merge a shippable pixmap-based llqtwebkit for viewer2.0/linux

Maybe also: EXT-4495 flash content crashes Webkit on Linux
meow-7.2.2
Tofu Linden 2010-03-04 17:22:22 +00:00
parent 496e6e1948
commit 7498504c92
2 changed files with 7 additions and 3 deletions

View File

@ -44,7 +44,11 @@
#include "media_plugin_base.h"
// set to 1 if you're using the version of llqtwebkit that's QPixmap-ified
#define LL_QTWEBKIT_USES_PIXMAPS 0
#if LL_LINUX
# define LL_QTWEBKIT_USES_PIXMAPS 1
#else
# define LL_QTWEBKIT_USES_PIXMAPS 0
#endif // LL_LINUX
#if LL_LINUX
# include "linux_volume_catcher.h"

View File

@ -974,9 +974,9 @@ anguage Infrstructure (CLI) international standard</string>
<key>linux</key>
<map>
<key>md5sum</key>
<string>4c75b2f1e8524c7844ee3ea1cd59a3db</string>
<string>4b1913c509ea8bec78523960700d7005</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100209b.tar.bz2</uri>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100304.tar.bz2</uri>
</map>
<key>windows</key>
<map>