diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-10 15:34:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-10 15:34:49 (GMT) |
| commit | 704dd92581783d91ccd234d58896d7078eed14a5 (patch) | |
| tree | 29d20b77fb3760cd47e980acc74432624e841be4 /tools | |
| parent | c21ec3f5a4cce90218a70a1ef657cd38fb20027f (diff) | |
| parent | b318fc0800c3081af16a38614b95dd50a82b6bbb (diff) | |
| download | Qt-704dd92581783d91ccd234d58896d7078eed14a5.zip Qt-704dd92581783d91ccd234d58896d7078eed14a5.tar.gz Qt-704dd92581783d91ccd234d58896d7078eed14a5.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
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 RTL layout for fonts when non-printable character has an advance
Fix regression in tst_qrawfont
Make it compile on mac
Fixed compiling error in qvfb.
micro optimizations
fix "comparison between signed and unsigned" warnings
on windows, don't resolve the gdi32's symbols for each QRawFont instance
fix typo in the docs
QRawFont: add missed operator !=
optimize QGlyphRun's operator == a bit
QGlyphRun: make operator != inlined
QGlyphRun: don't detach if the decoration wasn't actually changed
QPA event loop: Set a timeout != 0 if there are no timers.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qvfb/qvfb.pro | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro index df68c97..ca8f4f4 100644 --- a/tools/qvfb/qvfb.pro +++ b/tools/qvfb/qvfb.pro @@ -19,7 +19,10 @@ HEADERS = qvfb.h \ gammaview.h \ qvfbprotocol.h \ qvfbshmem.h \ - qvfbmmap.h + qvfbmmap.h \ + ../../src/gui/embedded/qlock_p.h \ + ../../src/gui/embedded/qwslock_p.h \ + ../../src/gui/embedded/qwssignalhandler_p.h SOURCES = qvfb.cpp \ qvfbview.cpp \ @@ -28,7 +31,10 @@ SOURCES = qvfb.cpp \ qanimationwriter.cpp \ qvfbprotocol.cpp \ qvfbshmem.cpp \ - qvfbmmap.cpp + qvfbmmap.cpp \ + ../../src/gui/embedded/qlock.cpp \ + ../../src/gui/embedded/qwslock.cpp \ + ../../src/gui/embedded/qwssignalhandler.cpp !embedded { DEFINES += QT_NO_QWS_SIGNALHANDLER |