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/bwins/QtGuiu.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/bwins/QtGuiu.def')
| -rw-r--r-- | src/s60installs/bwins/QtGuiu.def | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index 8fc5333..f40790b 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -12902,7 +12902,7 @@ EXPORTS ??0QStaticTextItem@@QAE@ABV0@@Z @ 12901 NONAME ; QStaticTextItem::QStaticTextItem(class QStaticTextItem const &) ??4QStaticTextItem@@QAEXABV0@@Z @ 12902 NONAME ; void QStaticTextItem::operator=(class QStaticTextItem const &) ?fontEngine@QStaticTextItem@@QBEPAVQFontEngine@@XZ @ 12903 NONAME ; class QFontEngine * QStaticTextItem::fontEngine(void) const - ?reactivateDeferredActiveObjects@QEventDispatcherS60@@UAEXXZ @ 12904 NONAME ; void QEventDispatcherS60::reactivateDeferredActiveObjects(void) + ?reactivateDeferredActiveObjects@QEventDispatcherS60@@UAEXXZ @ 12904 NONAME ABSENT ; void QEventDispatcherS60::reactivateDeferredActiveObjects(void) ?userData@QStaticTextItem@@QBEPAVQStaticTextUserData@@XZ @ 12905 NONAME ; class QStaticTextUserData * QStaticTextItem::userData(void) const ?populate@QTextureGlyphCache@@QAE_NPAVQFontEngine@@HPBIPBUQFixedPoint@@@Z @ 12906 NONAME ; bool QTextureGlyphCache::populate(class QFontEngine *, int, unsigned int const *, struct QFixedPoint const *) ?resetCursorBlinkTimer@QLineControl@@QAEXXZ @ 12907 NONAME ; void QLineControl::resetCursorBlinkTimer(void) |