summaryrefslogtreecommitdiffstats
path: root/src/s60installs/eabi/QtGuiu.def
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-08 20:28:14 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-08 20:28:14 (GMT)
commit8d8f14314138139c8e538763fb6bb12f214587cf (patch)
treeffce3a537f094808b95aea14cae99c293f3f3bcc /src/s60installs/eabi/QtGuiu.def
parent198d903fa18d9f1d51615974d71de8236e97c2cd (diff)
parent285855b8fbbdc7ad428a0c66f6c4469d97e55769 (diff)
downloadQt-8d8f14314138139c8e538763fb6bb12f214587cf.zip
Qt-8d8f14314138139c8e538763fb6bb12f214587cf.tar.gz
Qt-8d8f14314138139c8e538763fb6bb12f214587cf.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed text rendering bug in raster engine when opacity != 1.0. Prevented race condition on texture destruction. More fix for QTBUG-14640:oci performance problem with qlonglong Doc: Fixing typo Fixed grabWidget sometimes returning uninitialized memory. Fix Malayalam Rendering - 'Ra' is PreBase Update .def files for QtGui and QtOpenVG Use 32bit textures for alpha textures after all. One more fix for dithering. Doc: Fixing typo Fix QTBUG-14640:oci performance problem with qlonglong 32bit => 16bit conversion has 4byte-aligned output. Fix gcc bug in qReallocAligned Prevented threading related crash in OpenGL module. Fix possible crash in QStaticText and QDeclarativeTextLayout Fix QTBUG-14132 oracle (xe) stored procedures with bind variables get errors
Diffstat (limited to 'src/s60installs/eabi/QtGuiu.def')
-rw-r--r--src/s60installs/eabi/QtGuiu.def3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index f772bcc..75bb026 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12101,4 +12101,7 @@ EXPORTS
_ZN19QApplicationPrivate25qmljsDebugArgumentsStringEv @ 12100 NONAME
_ZNK5QFont14lastResortFontEv @ 12101 NONAME
_ZN11QFontEngine33convertToPostscriptFontFamilyNameERK10QByteArray @ 12102 NONAME
+ _ZN15QStaticTextItem13setFontEngineEP11QFontEngine @ 12103 NONAME
+ _ZN15QStaticTextItemD1Ev @ 12104 NONAME
+ _ZN15QStaticTextItemD2Ev @ 12105 NONAME