diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2011-06-08 12:38:22 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2011-06-08 12:38:22 (GMT) |
| commit | be25f9e17eac2b99d83951dbc0bd1b6e09d91e57 (patch) | |
| tree | e10e3bade3973f66907e3152daeb4fc6cfe247a8 /src/s60installs/eabi/QtOpenGLu.def | |
| parent | 33db4e2533b3e4e07d37b651b65491195be403ab (diff) | |
| parent | f6909d47b981720cb87cb96454cdf9ea493383ee (diff) | |
| download | Qt-be25f9e17eac2b99d83951dbc0bd1b6e09d91e57.zip Qt-be25f9e17eac2b99d83951dbc0bd1b6e09d91e57.tar.gz Qt-be25f9e17eac2b99d83951dbc0bd1b6e09d91e57.tar.bz2 | |
Merge remote branch 'upstream/4.8' into qt-4.8-from-4.7
Conflicts:
src/gui/styles/qs60style.cpp
Diffstat (limited to 'src/s60installs/eabi/QtOpenGLu.def')
| -rw-r--r-- | src/s60installs/eabi/QtOpenGLu.def | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/s60installs/eabi/QtOpenGLu.def b/src/s60installs/eabi/QtOpenGLu.def index 2b67d2c..695829c 100644 --- a/src/s60installs/eabi/QtOpenGLu.def +++ b/src/s60installs/eabi/QtOpenGLu.def @@ -763,9 +763,9 @@ EXPORTS _ZTI27QGLContextGroupResourceBase @ 762 NONAME ABSENT _ZTV22QGLContextResourceBase @ 763 NONAME ABSENT _ZTV27QGLContextGroupResourceBase @ 764 NONAME ABSENT - _ZThn104_N20QGLTextureGlyphCacheD0Ev @ 765 NONAME ABSENT - _ZThn104_N20QGLTextureGlyphCacheD1Ev @ 766 NONAME ABSENT - _ZThn8_NK16QGLWindowSurface8featuresEv @ 767 NONAME ABSENT + _ZThn104_N20QGLTextureGlyphCacheD0Ev @ 765 NONAME + _ZThn104_N20QGLTextureGlyphCacheD1Ev @ 766 NONAME + _ZThn8_NK16QGLWindowSurface8featuresEv @ 767 NONAME _ZN14QGLSignalProxy18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 768 NONAME _ZN14QGLSignalProxy25staticMetaObjectExtraDataE @ 769 NONAME DATA 8 _ZN16QGLShaderProgram18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 770 NONAME |