Building Qt interface - qt_draw_glyphs causes link failure

I wanted to incorporate Firefox/Gecko as a Qt Widget
(suggested here: https://wiki.mozilla.org/Embedding/NewApi )
(build instructions here: 
https://wiki.mozilla.org/Embedding/NewApi/QtLinux )


Problem is...I'm using the latest build of Qt4 from Debian/Experimental 
(Qt 4.7.0~beta2-3) and Qt Creator (2.0.0.1).
Everything 'appears' to complete normally as I am using the libraries in 
other projects without problems.

However, when I attempt to build the Embedded Firefox with these Qt 
libraries, the project fails to compile.
Everything I've tried results in a fail during the linking phase of 
libxul.so and an error message pointing to unmet dependencies.
The unmet dependency is the call to qt_draw_glyphs. The patch 
moz-central/gfx/cairo/cairo-qt-surface.cpp (fix Bug 29092 - Fix glyphs 
rendering for cairo-qpainter-surface) makes changes that tests for the 
Qt Version in two places.
  +#if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || 
defined(QT_GLYPHS_API_BACKPORT)

I get the code...makes sense. However, using my locally built Qt the 
version comes back as 4.7.0.
Any attempt to point the build process to the 'right' sources 
(declaration/definition of qt_draw_glyphs code in Qt - qpainter_p.h) 
from a local source repository doesn't help. It's almost as if the 
mozilla qt build is hardwired to look in /usr/lib and /usr/include and 
ignore the rest.

Has any one built the Mozilla Qt with 4.7.0?

There is very little discussion about the patch. Best I can find is this 
discussion thread from the Qt bug reports
( 
http://bugreports.qt.nokia.com/browse/QTBUG-9630?page=com.atlassian.jira.plugin.system.issuetabpanels%3Aall-tabpanel 
).

Is there a workaround to calling qt_draw_glyphs?

Regards,
Scott Furry