diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-05-10 13:14:16 (GMT) |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2011-05-10 13:14:16 (GMT) |
| commit | baecfbc7f7e0ec7edddb74a2e760c685977e9084 (patch) | |
| tree | f9071063e3b8dfcc1b2fcb3236be84fce5b17091 /src/s60installs/eabi/QtOpenGLu.def | |
| parent | bde58ad1e7d2b38d2882aaf869e93b0415128836 (diff) | |
| parent | f3ddd2d995b7485cdc1c3420d254499904ff9dd9 (diff) | |
| download | Qt-baecfbc7f7e0ec7edddb74a2e760c685977e9084.zip Qt-baecfbc7f7e0ec7edddb74a2e760c685977e9084.tar.gz Qt-baecfbc7f7e0ec7edddb74a2e760c685977e9084.tar.bz2 | |
Merge remote branch 'qt/4.8' into master-qml-staging
Conflicts:
src/declarative/debugger/qdeclarativedebugserver.cpp
src/plugins/qmltooling/qmltooling.pro
Diffstat (limited to 'src/s60installs/eabi/QtOpenGLu.def')
| -rw-r--r-- | src/s60installs/eabi/QtOpenGLu.def | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/s60installs/eabi/QtOpenGLu.def b/src/s60installs/eabi/QtOpenGLu.def index 75763c5..44f7306 100644 --- a/src/s60installs/eabi/QtOpenGLu.def +++ b/src/s60installs/eabi/QtOpenGLu.def @@ -759,9 +759,9 @@ EXPORTS _ZNK14QGLPaintDevice9isFlippedEv @ 758 NONAME _ZNK16QGLWindowSurface8featuresEv @ 759 NONAME _ZNK26QGLFramebufferObjectFormat6mipmapEv @ 760 NONAME - _ZTI22QGLContextResourceBase @ 761 NONAME ABSENT + _ZTI22QGLContextResourceBase @ 761 NONAME _ZTI27QGLContextGroupResourceBase @ 762 NONAME - _ZTV22QGLContextResourceBase @ 763 NONAME ABSENT + _ZTV22QGLContextResourceBase @ 763 NONAME _ZTV27QGLContextGroupResourceBase @ 764 NONAME _ZThn104_N20QGLTextureGlyphCacheD0Ev @ 765 NONAME _ZThn104_N20QGLTextureGlyphCacheD1Ev @ 766 NONAME |