diff options
| author | Vladimir Vukicevic <vladimir@pobox.com> | 2009-06-14 20:43:05 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-06-16 11:03:46 +0100 |
| commit | 22587f57bd5d1b4440d936cd4655a7e8fcebdf36 (patch) | |
| tree | f7f4224e598d8a23b1a643016c880b7c91d5ff84 /build | |
| parent | 7d3881114add18d5934073d0b04755d343ea38c6 (diff) | |
Import Qt backend by Mozilla
Written by Vladimir Vukicevic to enable integration with Qt embedded
devices, this backend allows cairo code to target QPainter, and use
it as a source for other cairo backends.
This imports the sources from mozilla-central:
http://mxr.mozilla.org/mozilla-central/find?text=&kind=text&string=cairo-qpainter
renames them from cairo-qpainter to cairo-qt, and integrates the patch
by Oleg Romashin:
https://bugs.freedesktop.org/attachment.cgi?id=18953
And then attempts to restore 'make check' to full functionality.
However:
- C++ does not play well with the PLT symbol hiding, and leaks into the
global namespace. 'make check' fails at check-plt.sh
- Qt embeds a GUI into QApplication which it requires to construct any
QPainter drawable, i.e. used by the boilerplate to create a cairo-qt
surface, and this leaks fonts (cairo-ft-fonts no less) causing assertion
failures that all cairo objects are accounted for upon destruction.
[Updated by Chris Wilson]
Acked-by: Jeff Muizelaar <jeff@infidigm.net>
Acked-by: Carl Worth <cworth@cworth.org>
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile.win32.features | 1 | ||||
| -rw-r--r-- | build/Makefile.win32.features-h | 3 | ||||
| -rw-r--r-- | build/configure.ac.features | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features index 764639ce5..3029c50fc 100644 --- a/build/Makefile.win32.features +++ b/build/Makefile.win32.features @@ -3,6 +3,7 @@ CAIRO_HAS_XLIB_SURFACE=0 CAIRO_HAS_XLIB_XRENDER_SURFACE=0 CAIRO_HAS_XCB_SURFACE=0 +CAIRO_HAS_QT_SURFACE=0 CAIRO_HAS_QUARTZ_SURFACE=0 CAIRO_HAS_QUARTZ_FONT=0 CAIRO_HAS_QUARTZ_IMAGE_SURFACE=0 diff --git a/build/Makefile.win32.features-h b/build/Makefile.win32.features-h index dcefdbc0d..3cfc54245 100644 --- a/build/Makefile.win32.features-h +++ b/build/Makefile.win32.features-h @@ -14,6 +14,9 @@ endif ifeq ($(CAIRO_HAS_XCB_SURFACE),1) @echo "#define CAIRO_HAS_XCB_SURFACE 1" >> src/cairo-features.h endif +ifeq ($(CAIRO_HAS_QT_SURFACE),1) + @echo "#define CAIRO_HAS_QT_SURFACE 1" >> src/cairo-features.h +endif ifeq ($(CAIRO_HAS_QUARTZ_SURFACE),1) @echo "#define CAIRO_HAS_QUARTZ_SURFACE 1" >> src/cairo-features.h endif diff --git a/build/configure.ac.features b/build/configure.ac.features index 1901a18d7..d3d321fd1 100644 --- a/build/configure.ac.features +++ b/build/configure.ac.features @@ -363,6 +363,7 @@ AC_DEFUN([CAIRO_REPORT], echo " Image: yes (always builtin)" echo " Xlib: $use_xlib" echo " Xlib Xrender: $use_xlib_xrender" + echo " Qt: $use_qt" echo " Quartz: $use_quartz" echo " Quartz-image: $use_quartz_image" echo " XCB: $use_xcb" |