diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-30 03:30:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-30 03:30:46 (GMT) |
| commit | d6eb899ee2c937a871dd945a995e2fd4a3eb7821 (patch) | |
| tree | 15b0971d121e54427747630c54eb3f660455a90a /src/s60installs/eabi | |
| parent | 8b533a7564c634e6e7228c5e02832d55513777b5 (diff) | |
| parent | 6d980ae8985e3856ab87c4d0aaada3bcdc5fa1e5 (diff) | |
| download | Qt-d6eb899ee2c937a871dd945a995e2fd4a3eb7821.zip Qt-d6eb899ee2c937a871dd945a995e2fd4a3eb7821.tar.gz Qt-d6eb899ee2c937a871dd945a995e2fd4a3eb7821.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:
Skip tst_QFont::lastResortFont() for Q_WS_QWS
Fixed failure of benchlibcallgrind selftest on some platforms.
Fix QFontMetrics::lineWidth() for fonts with defined point size
Implemeting, exporting and autotesting QFont::lastResortFont()
Fixed compile error on non-Symbian platforms.
Fixed regression when typing in QTextControl based widgets on Symbian
Fixed incorrect snippet in BLD_INF_RULES documentation
Streamlined smart installer package creation
Diffstat (limited to 'src/s60installs/eabi')
| -rw-r--r-- | src/s60installs/eabi/QtGuiu.def | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index 4442d33..634b7af 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -12097,4 +12097,5 @@ EXPORTS _ZN19QApplicationPrivate19qmljsDebugArgumentsE @ 12096 NONAME DATA 4 _ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFP13QGraphicsItem @ 12097 NONAME _ZNK20QGraphicsItemPrivate21effectiveBoundingRectEP13QGraphicsItem @ 12098 NONAME + _ZNK5QFont14lastResortFontEv @ 12099 NONAME |