diff options
| author | Alessandro Portale <alessandro.portale@nokia.com> | 2010-09-28 13:05:03 (GMT) |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@nokia.com> | 2010-09-28 13:05:03 (GMT) |
| commit | 1341477e03dae2f9bc5ddb25beeb2ba3cd23358f (patch) | |
| tree | 874527d55bb27fea9ed979dff7426d77e9a860e5 /src/s60installs/bwins | |
| parent | 3e3ce984b54a0b199bf5d4f5e3dcb0a9d5b5bd79 (diff) | |
| download | Qt-1341477e03dae2f9bc5ddb25beeb2ba3cd23358f.zip Qt-1341477e03dae2f9bc5ddb25beeb2ba3cd23358f.tar.gz Qt-1341477e03dae2f9bc5ddb25beeb2ba3cd23358f.tar.bz2 | |
Implemeting, exporting and autotesting QFont::lastResortFont()
An implementation of QFont::lastResortFont() is still(!) missing
in Qt 4.7.0. I only became aware of QTBUG-6921, lately.
This patch...
1) implements QFont::lastResortFont() in qfont_s60.cpp by first
trying to get the lastResortFamily() and then falling back to a
hardcoded font.
2) updates the .def files with one additional entry
3) adds an autotest which verifies that lastResortFamily() does
return a non-empty string. In the firt place, that autotest makes
sure that lastResortFamily() is implemented and exported, so that
something like this issue will not go unnoticed in the next
Qt port.
Task-number: QTBUG-6921
Reviewed-by: Eskil
Diffstat (limited to 'src/s60installs/bwins')
| -rw-r--r-- | src/s60installs/bwins/QtGuiu.def | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index 7805dae..9a61523 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -12892,4 +12892,5 @@ EXPORTS ?setTimeout@QTapAndHoldGesture@@SAXH@Z @ 12891 NONAME ; void QTapAndHoldGesture::setTimeout(int) ?qmljsDebugArguments@QApplicationPrivate@@2VQString@@A @ 12892 NONAME ; class QString QApplicationPrivate::qmljsDebugArguments ?effectiveBoundingRect@QGraphicsItemPrivate@@QBE?AVQRectF@@PAVQGraphicsItem@@@Z @ 12893 NONAME ; class QRectF QGraphicsItemPrivate::effectiveBoundingRect(class QGraphicsItem *) const + ?lastResortFont@QFont@@QBE?AVQString@@XZ @ 12894 NONAME ; class QString QFont::lastResortFont(void) const |