summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-10 09:06:18 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-10 09:06:18 (GMT)
commit9f926d7fd11da71d8948a64c4b9134a4c2c73fcd (patch)
tree1f2d5118a1f7d5b7a04799a5b803d2d82b8d48c9
parentea65e98e89967044446e95f3e0943631fb10bf39 (diff)
parent0ec06f76484d64676bcd8b981b54593cdb8b539e (diff)
downloadQt-9f926d7fd11da71d8948a64c4b9134a4c2c73fcd.zip
Qt-9f926d7fd11da71d8948a64c4b9134a4c2c73fcd.tar.gz
Qt-9f926d7fd11da71d8948a64c4b9134a4c2c73fcd.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 Symbian/WinsCW build break
-rw-r--r--src/s60installs/bwins/QtGuiu.def1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index 45a8d7b..5dcd9f8 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -12982,4 +12982,5 @@ EXPORTS
?releaseCachedResources@QGraphicsSystem@@UAEXXZ @ 12981 NONAME ; void QGraphicsSystem::releaseCachedResources(void)
?qt_s60_setPartialScreenInputMode@@YAX_N@Z @ 12982 NONAME ; void qt_s60_setPartialScreenInputMode(bool)
?paintingActive@QVolatileImage@@QBE_NXZ @ 12983 NONAME ; bool QVolatileImage::paintingActive(void) const
+ ?qt_draw_decoration_for_glyphs@@YAXPAVQPainter@@PBIPBUQFixedPoint@@HPAVQFontEngine@@ABVQFont@@ABVQTextCharFormat@@@Z @ 12984 NONAME ; void qt_draw_decoration_for_glyphs(class QPainter *, unsigned int const *, struct QFixedPoint const *, int, class QFontEngine *, class QFont const &, class QTextCharFormat const &)