Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (120 commits)
  Disable autotest broken by the change to QCache in 7ab0bed
  Generate glyphs in un-transformed coordinate system.
  Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT
  Reset trailingSpaces in relayout
  Prevent QPixmapCache potentially growing indefinitely.
  Allocate 16-byte aligned memory independent of platform for raster pool.
  Fix trailing spaces problem by not adding it to QScriptLine.length
  fix build for desktop
  Dragging in nested views no longer works as expected
  Fix the build with -qtnamespace configure options
  Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)
  Fix implicit height not growing when pre-edit text wraps.
  Removed the unnecessary dependency of the QtHelp module on the QtXml one
  Modified \since command behavior slightly to handle project and version.
  Added an additional check to workaround an issue on Windows.
  Fix leak in State element.
  Fix leak in bindings created by PropertyChanges.
  Revert readonly BorderImage::sourceSize change
  URLs used with scheme handler use appropriate encoding for scheme
  Update license headers
  ...

1 files changed, 9 insertions, 0 deletions

diff --git a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro
index b5645a3..ca8f4f4 100644
--- a/tools/qvfb/qvfb.pro
+++ b/tools/qvfb/qvfb.pro
@@ -8,6 +8,9 @@ DESTDIR         = ../../bin
 target.path=$$[QT_INSTALL_BINS]
 INSTALLS += target
 
+DEPENDPATH      += ../../include
+INCLUDEPATH     += ../../src/gui/embedded
+
 FORMS           = config.ui
 HEADERS         = qvfb.h \
 		  qvfbview.h \
@@ -33,6 +36,12 @@ SOURCES         = qvfb.cpp \
                   ../../src/gui/embedded/qwslock.cpp \
                   ../../src/gui/embedded/qwssignalhandler.cpp
 
+!embedded {
+    DEFINES         += QT_NO_QWS_SIGNALHANDLER
+    HEADERS         += ../../src/gui/embedded/qlock_p.h
+    SOURCES         += ../../src/gui/embedded/qlock.cpp
+}
+
 include(../shared/deviceskin/deviceskin.pri)
 
 contains(QT_CONFIG, opengl) {