summaryrefslogtreecommitdiffstats
path: root/src/s60installs/eabi
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-24 04:21:43 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-24 04:21:43 (GMT)
commitc5212670f20f07733f16f00a318e0945b2721d22 (patch)
treeae4eeec6f2b6a14f3623974db1481e2c40ab3953 /src/s60installs/eabi
parent9ea81cbc63db063cd30797fd265a9002430ebd2f (diff)
parenta1839a7a067c47a328c1bdb651a89dc325cb0691 (diff)
downloadQt-c5212670f20f07733f16f00a318e0945b2721d22.zip
Qt-c5212670f20f07733f16f00a318e0945b2721d22.tar.gz
Qt-c5212670f20f07733f16f00a318e0945b2721d22.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix for EGL for symbian on 3.1/3.2/5.0, define QT_NO_EGL. Stub implementations for EGL for symbian
Diffstat (limited to 'src/s60installs/eabi')
-rw-r--r--src/s60installs/eabi/QtGuiu.def88
1 files changed, 44 insertions, 44 deletions
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index a735de1..569247a 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -11745,43 +11745,43 @@ EXPORTS
_ZN11QEglContext10getDisplayEP12QPaintDevice @ 11744 NONAME ABSENT
_ZN11QEglContext10waitClientEv @ 11745 NONAME ABSENT
_ZN11QEglContext10waitNativeEv @ 11746 NONAME ABSENT
- _ZN11QEglContext11doneCurrentEv @ 11747 NONAME ABSENT
+ _ZN11QEglContext11doneCurrentEv @ 11747 NONAME
_ZN11QEglContext11errorStringEi @ 11748 NONAME ABSENT
- _ZN11QEglContext11makeCurrentEi @ 11749 NONAME ABSENT
+ _ZN11QEglContext11makeCurrentEi @ 11749 NONAME
_ZN11QEglContext11openDisplayEP12QPaintDevice @ 11750 NONAME ABSENT
- _ZN11QEglContext11swapBuffersEi @ 11751 NONAME ABSENT
- _ZN11QEglContext12chooseConfigERK14QEglPropertiesN4QEgl16PixelFormatMatchE @ 11752 NONAME ABSENT
+ _ZN11QEglContext11swapBuffersEi @ 11751 NONAME
+ _ZN11QEglContext12chooseConfigERK14QEglPropertiesN4QEgl16PixelFormatMatchE @ 11752 NONAME
_ZN11QEglContext12hasExtensionEPKc @ 11753 NONAME ABSENT
- _ZN11QEglContext13createContextEPS_PK14QEglProperties @ 11754 NONAME ABSENT
- _ZN11QEglContext13createSurfaceEP12QPaintDevicePK14QEglProperties @ 11755 NONAME ABSENT
- _ZN11QEglContext14currentContextEN4QEgl3APIE @ 11756 NONAME ABSENT
+ _ZN11QEglContext13createContextEPS_PK14QEglProperties @ 11754 NONAME
+ _ZN11QEglContext13createSurfaceEP12QPaintDevicePK14QEglProperties @ 11755 NONAME
+ _ZN11QEglContext14currentContextEN4QEgl3APIE @ 11756 NONAME
_ZN11QEglContext14defaultDisplayEP12QPaintDevice @ 11757 NONAME ABSENT
- _ZN11QEglContext14destroySurfaceEi @ 11758 NONAME ABSENT
+ _ZN11QEglContext14destroySurfaceEi @ 11758 NONAME
_ZN11QEglContext14dumpAllConfigsEv @ 11759 NONAME ABSENT
- _ZN11QEglContext15lazyDoneCurrentEv @ 11760 NONAME ABSENT
- _ZN11QEglContext17setCurrentContextEN4QEgl3APIEPS_ @ 11761 NONAME ABSENT
+ _ZN11QEglContext15lazyDoneCurrentEv @ 11760 NONAME
+ _ZN11QEglContext17setCurrentContextEN4QEgl3APIEPS_ @ 11761 NONAME
_ZN11QEglContext7destroyEv @ 11762 NONAME ABSENT
- _ZN11QEglContextC1Ev @ 11763 NONAME ABSENT
- _ZN11QEglContextC2Ev @ 11764 NONAME ABSENT
- _ZN11QEglContextD1Ev @ 11765 NONAME ABSENT
- _ZN11QEglContextD2Ev @ 11766 NONAME ABSENT
- _ZN14QEglProperties11removeValueEi @ 11767 NONAME ABSENT
+ _ZN11QEglContextC1Ev @ 11763 NONAME
+ _ZN11QEglContextC2Ev @ 11764 NONAME
+ _ZN11QEglContextD1Ev @ 11765 NONAME
+ _ZN11QEglContextD2Ev @ 11766 NONAME
+ _ZN14QEglProperties11removeValueEi @ 11767 NONAME
_ZN14QEglProperties14dumpAllConfigsEv @ 11768 NONAME ABSENT
- _ZN14QEglProperties14setPixelFormatEN6QImage6FormatE @ 11769 NONAME ABSENT
- _ZN14QEglProperties17setRenderableTypeEN4QEgl3APIE @ 11770 NONAME ABSENT
- _ZN14QEglProperties19reduceConfigurationEv @ 11771 NONAME ABSENT
- _ZN14QEglProperties20setPaintDeviceFormatEP12QPaintDevice @ 11772 NONAME ABSENT
- _ZN14QEglProperties8setValueEii @ 11773 NONAME ABSENT
- _ZN14QEglPropertiesC1Ei @ 11774 NONAME ABSENT
- _ZN14QEglPropertiesC1Ev @ 11775 NONAME ABSENT
- _ZN14QEglPropertiesC2Ei @ 11776 NONAME ABSENT
- _ZN14QEglPropertiesC2Ev @ 11777 NONAME ABSENT
+ _ZN14QEglProperties14setPixelFormatEN6QImage6FormatE @ 11769 NONAME
+ _ZN14QEglProperties17setRenderableTypeEN4QEgl3APIE @ 11770 NONAME
+ _ZN14QEglProperties19reduceConfigurationEv @ 11771 NONAME
+ _ZN14QEglProperties20setPaintDeviceFormatEP12QPaintDevice @ 11772 NONAME
+ _ZN14QEglProperties8setValueEii @ 11773 NONAME
+ _ZN14QEglPropertiesC1Ei @ 11774 NONAME
+ _ZN14QEglPropertiesC1Ev @ 11775 NONAME
+ _ZN14QEglPropertiesC2Ei @ 11776 NONAME
+ _ZN14QEglPropertiesC2Ev @ 11777 NONAME
_ZNK11QEglContext12configAttribEiPi @ 11778 NONAME ABSENT
_ZNK11QEglContext16configPropertiesEi @ 11779 NONAME ABSENT
- _ZNK11QEglContext7isValidEv @ 11780 NONAME ABSENT
- _ZNK11QEglContext9isCurrentEv @ 11781 NONAME ABSENT
- _ZNK14QEglProperties5valueEi @ 11782 NONAME ABSENT
- _ZNK14QEglProperties8toStringEv @ 11783 NONAME ABSENT
+ _ZNK11QEglContext7isValidEv @ 11780 NONAME
+ _ZNK11QEglContext9isCurrentEv @ 11781 NONAME
+ _ZNK14QEglProperties5valueEi @ 11782 NONAME
+ _ZNK14QEglProperties8toStringEv @ 11783 NONAME
_ZNK11QFontEngine10glyphCacheEPvN21QFontEngineGlyphCache4TypeERK10QTransform @ 11784 NONAME
_ZNK20QGraphicsItemPrivate21effectiveBoundingRectERK6QRectF @ 11785 NONAME
_Z12qt_blurImageP8QPainterR6QImagefbbi @ 11786 NONAME
@@ -11973,25 +11973,25 @@ EXPORTS
_ZN20QGraphicsItemPrivate11children_atEP24QDeclarativeListPropertyI15QGraphicsObjectEi @ 11972 NONAME
_ZN20QGraphicsItemPrivate14children_countEP24QDeclarativeListPropertyI15QGraphicsObjectE @ 11973 NONAME
_ZN20QGraphicsItemPrivate15children_appendEP24QDeclarativeListPropertyI15QGraphicsObjectEPS1_ @ 11974 NONAME
- _ZN11QEglContext14destroyContextEv @ 11975 NONAME ABSENT
- _ZN14QEglProperties13setDeviceTypeEi @ 11976 NONAME ABSENT
+ _ZN11QEglContext14destroyContextEv @ 11975 NONAME
+ _ZN14QEglProperties13setDeviceTypeEi @ 11976 NONAME
_ZN4QEgl10clearErrorEv @ 11977 NONAME ABSENT
- _ZN4QEgl10extensionsEv @ 11978 NONAME ABSENT
- _ZN4QEgl11errorStringEi @ 11979 NONAME ABSENT
+ _ZN4QEgl10extensionsEv @ 11978 NONAME
+ _ZN4QEgl11errorStringEi @ 11979 NONAME
_ZN4QEgl11errorStringEv @ 11980 NONAME ABSENT
- _ZN4QEgl12chooseConfigEPK14QEglPropertiesNS_16PixelFormatMatchE @ 11981 NONAME ABSENT
- _ZN4QEgl12hasExtensionEPKc @ 11982 NONAME ABSENT
- _ZN4QEgl12nativePixmapEP7QPixmap @ 11983 NONAME ABSENT
- _ZN4QEgl12nativeWindowEP7QWidget @ 11984 NONAME ABSENT
- _ZN4QEgl13createSurfaceEP12QPaintDeviceiPK14QEglProperties @ 11985 NONAME ABSENT
- _ZN4QEgl13defaultConfigEiNS_3APIE6QFlagsINS_12ConfigOptionEE @ 11986 NONAME ABSENT
- _ZN4QEgl13nativeDisplayEv @ 11987 NONAME ABSENT
- _ZN4QEgl14dumpAllConfigsEv @ 11988 NONAME ABSENT
- _ZN4QEgl17eglCreateImageKHREiiiiPKi @ 11989 NONAME ABSENT
- _ZN4QEgl18eglDestroyImageKHREii @ 11990 NONAME ABSENT
+ _ZN4QEgl12chooseConfigEPK14QEglPropertiesNS_16PixelFormatMatchE @ 11981 NONAME
+ _ZN4QEgl12hasExtensionEPKc @ 11982 NONAME
+ _ZN4QEgl12nativePixmapEP7QPixmap @ 11983 NONAME
+ _ZN4QEgl12nativeWindowEP7QWidget @ 11984 NONAME
+ _ZN4QEgl13createSurfaceEP12QPaintDeviceiPK14QEglProperties @ 11985 NONAME
+ _ZN4QEgl13defaultConfigEiNS_3APIE6QFlagsINS_12ConfigOptionEE @ 11986 NONAME
+ _ZN4QEgl13nativeDisplayEv @ 11987 NONAME
+ _ZN4QEgl14dumpAllConfigsEv @ 11988 NONAME
+ _ZN4QEgl17eglCreateImageKHREiiiiPKi @ 11989 NONAME
+ _ZN4QEgl18eglDestroyImageKHREii @ 11990 NONAME
_ZN4QEgl5errorEv @ 11991 NONAME ABSENT
- _ZN4QEgl7displayEv @ 11992 NONAME ABSENT
- _ZNK11QEglContext12configAttribEi @ 11993 NONAME ABSENT
+ _ZN4QEgl7displayEv @ 11992 NONAME
+ _ZNK11QEglContext12configAttribEi @ 11993 NONAME
_ZNK11QEglContext16configPropertiesEv @ 11994 NONAME ABSENT
_ZNK19QItemSelectionRange7isEmptyEv @ 11995 NONAME