diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-10-25 14:56:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-10-25 14:56:51 +0200 |
| commit | bd0258ed73ecee28fba4c21027b2c2afd1b6af39 (patch) | |
| tree | 136e780c13e0019382a315758d20e8ea43cf1c2d /src/s60installs/eabi | |
| parent | cb4eb590d4af9978a0d60402f3c4ab99b6f4ede4 (diff) | |
| parent | ec6543371108bbe24fb8d98eb1ff057c641a0e9d (diff) | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/declarative/qml/qdeclarativetypeloader.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/opengl/qgl.cpp
src/opengl/qgl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro
tests/auto/declarative/qdeclarativewebview/qdeclarativewebview.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qclipboard/test/test.pro
tests/auto/qsound/qsound.pro
Diffstat (limited to 'src/s60installs/eabi')
| -rw-r--r-- | src/s60installs/eabi/QtGuiu.def | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index 3606f9cb98..83e1851973 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -12198,6 +12198,7 @@ EXPORTS _ZNK11QPixmapData15toVolatileImageEv @ 12197 NONAME _ZNK14QVolatileImage13constImageRefEv @ 12198 NONAME _Z43qt_s60_setPartialScreenAutomaticTranslationb @ 12199 NONAME +<<<<<<< HEAD _Z18qt_addBitmapToPathffPKhiiiP12QPainterPath @ 12200 NONAME _Z22qt_fontdata_from_indexi @ 12201 NONAME _Z27qt_isExtendedRadialGradientRK6QBrush @ 12202 NONAME @@ -12799,4 +12800,10 @@ EXPORTS _ZN11QTextEngine20resetFontEngineCacheEv @ 12798 NONAME _ZN14QWidgetPrivate16_q_cleanupWinIdsEv @ 12799 NONAME _ZN19QApplicationPrivate28symbianHandleLiteModeStartupEv @ 12800 NONAME +======= + _ZN12QApplication22aboutToUseGpuResourcesEv @ 12200 NONAME + _ZN12QApplication26aboutToReleaseGpuResourcesEv @ 12201 NONAME + _ZN19QApplicationPrivate26emitAboutToUseGpuResourcesEv @ 12202 NONAME + _ZN19QApplicationPrivate30emitAboutToReleaseGpuResourcesEv @ 12203 NONAME +>>>>>>> origin/4.7 |