diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-06-06 11:19:45 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-06-06 11:19:45 (GMT) |
| commit | 872da4c22ed2a82c7e2624b8aef8ebba6c1323d9 (patch) | |
| tree | cd786e093b64b8685a5d49bd48778a9650ee241f /src/s60installs | |
| parent | 1a74ca1d05c7c819db89a82de613d73244b7a980 (diff) | |
| parent | ed2b7e6c592dcf24de2bf34a693f54b5dd569194 (diff) | |
| download | Qt-872da4c22ed2a82c7e2624b8aef8ebba6c1323d9.zip Qt-872da4c22ed2a82c7e2624b8aef8ebba6c1323d9.tar.gz Qt-872da4c22ed2a82c7e2624b8aef8ebba6c1323d9.tar.bz2 | |
Merge branch '4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontengine_ft.cpp
src/s60installs/bwins/QtGuiu.def
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/bwins/QtGuiu.def | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index f4a3481..8fc5333 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -14034,3 +14034,7 @@ EXPORTS ?releaseAllGpuResources@QSymbianGraphicsSystemEx@@UAEXXZ @ 14033 NONAME ; void QSymbianGraphicsSystemEx::releaseAllGpuResources(void) ?cursorMoveStyle@QLineControl@@QBE?AW4CursorMoveStyle@Qt@@XZ @ 14034 NONAME ; enum Qt::CursorMoveStyle QLineControl::cursorMoveStyle(void) const ?hasBCM2727@QSymbianGraphicsSystemEx@@UAE_NXZ @ 14035 NONAME ; bool QSymbianGraphicsSystemEx::hasBCM2727(void) + ?hasStaticContentsSupport@QWindowSurface@@QBE_NXZ @ 14036 NONAME ; bool QWindowSurface::hasStaticContentsSupport(void) const + ?hasPartialUpdateSupport@QWindowSurface@@QBE_NXZ @ 14037 NONAME ; bool QWindowSurface::hasPartialUpdateSupport(void) const + ??0QSymbianGraphicsSystemEx@@QAE@XZ @ 14038 NONAME ABSENT ; QSymbianGraphicsSystemEx::QSymbianGraphicsSystemEx(void) + ?hasBCM2727@QSymbianGraphicsSystemEx@@SA_NXZ @ 14039 NONAME ; bool QSymbianGraphicsSystemEx::hasBCM2727(void) |