diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-04-29 16:24:37 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-04-29 16:24:37 (GMT) |
| commit | 1308909157ec62d1f55135ce40090d7383e0db17 (patch) | |
| tree | cc481f7cdc229a498a210836ec0f4a7cada24646 /src/s60installs | |
| parent | 78821cd51c69757a7b4e711c495e702adf97d682 (diff) | |
| parent | 43503e38d91c0e8375c2d5993de201419ba854ec (diff) | |
| download | Qt-1308909157ec62d1f55135ce40090d7383e0db17.zip Qt-1308909157ec62d1f55135ce40090d7383e0db17.tar.gz Qt-1308909157ec62d1f55135ce40090d7383e0db17.tar.bz2 | |
Fix merge conflict
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/bwins/QtGuiu.def | 1 | ||||
| -rw-r--r-- | src/s60installs/eabi/QtGuiu.def | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index 26a0761..45a8d7b 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -12981,4 +12981,5 @@ EXPORTS ?depth@QVolatileImage@@QBEHXZ @ 12980 NONAME ; int QVolatileImage::depth(void) const ?releaseCachedResources@QGraphicsSystem@@UAEXXZ @ 12981 NONAME ; void QGraphicsSystem::releaseCachedResources(void) ?qt_s60_setPartialScreenInputMode@@YAX_N@Z @ 12982 NONAME ; void qt_s60_setPartialScreenInputMode(bool) + ?paintingActive@QVolatileImage@@QBE_NXZ @ 12983 NONAME ; bool QVolatileImage::paintingActive(void) const diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index fafa07b..1914e1f 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -12183,4 +12183,5 @@ EXPORTS _ZN15QGraphicsSystem22releaseCachedResourcesEv @ 12182 NONAME _Z32qt_s60_setPartialScreenInputModeb @ 12183 NONAME _Z29qt_draw_decoration_for_glyphsP8QPainterPKjPK11QFixedPointiP11QFontEngineRK5QFontRK15QTextCharFormat @ 12184 NONAME + _ZNK14QVolatileImage14paintingActiveEv @ 12186 NONAME |