diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-06-24 09:52:41 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-06-24 09:52:41 (GMT) |
| commit | cf2f72f4f61f3a9e0e7573379c33bb341eeba7be (patch) | |
| tree | 06fbd459f62f87344e7db973a0a9f3050cece825 /src/s60installs/eabi | |
| parent | 164728f711136356a6c3482f762321b01c9d82dd (diff) | |
| parent | 705b0f958a6071341b10cbd51917e1378356491b (diff) | |
| download | Qt-cf2f72f4f61f3a9e0e7573379c33bb341eeba7be.zip Qt-cf2f72f4f61f3a9e0e7573379c33bb341eeba7be.tar.gz Qt-cf2f72f4f61f3a9e0e7573379c33bb341eeba7be.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/image/qpixmap_raster_symbian.cpp
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
src/gui/styles/qs60style.cpp
src/network/bearer/qnetworkconfigmanager_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtOpenGLu.def
src/s60installs/bwins/QtOpenVGu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
Diffstat (limited to 'src/s60installs/eabi')
| -rw-r--r-- | src/s60installs/eabi/QtGuiu.def | 3 | ||||
| -rw-r--r-- | src/s60installs/eabi/QtOpenVGu.def | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index 4ca71e9..95a5dbd 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -12753,4 +12753,5 @@ EXPORTS _ZN11QTextEngine18positionInLigatureEPK11QScriptItemi6QFixedS3_ib @ 12752 NONAME _ZN14QPaintEngineEx18drawStaticTextItemEP15QStaticTextItem @ 12753 NONAME _ZNK14QPaintEngineEx23supportsTransformationsEfRK10QTransform @ 12754 NONAME - + _ZNK11QPixmapData15toVolatileImageEv @ 12755 NONAME + _ZNK14QVolatileImage13constImageRefEv @ 12756 NONAME diff --git a/src/s60installs/eabi/QtOpenVGu.def b/src/s60installs/eabi/QtOpenVGu.def index 5b083bd..e2cdbcf 100644 --- a/src/s60installs/eabi/QtOpenVGu.def +++ b/src/s60installs/eabi/QtOpenVGu.def @@ -215,4 +215,4 @@ EXPORTS _ZN13QVGPixmapData35createFromNativeImageHandleProviderEv @ 214 NONAME _ZN13QVGPixmapData12forceToImageEb @ 215 NONAME _ZNK16QVGWindowSurface8featuresEv @ 216 NONAME - + _ZNK13QVGPixmapData15toVolatileImageEv @ 217 NONAME |