diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-29 17:46:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-29 17:46:45 (GMT) |
| commit | c4b8a1a818b285ab3b25744fbf35cb1eb43b5dbd (patch) | |
| tree | f12edd508724691c6dbd3445ad8e918af8a1e882 /src | |
| parent | 82c6507e63655a84d490d7b83e964d77c5d8a6df (diff) | |
| parent | 3d3af93505f7b90e399aab4c8fa2bceae18fedf6 (diff) | |
| download | Qt-c4b8a1a818b285ab3b25744fbf35cb1eb43b5dbd.zip Qt-c4b8a1a818b285ab3b25744fbf35cb1eb43b5dbd.tar.gz Qt-c4b8a1a818b285ab3b25744fbf35cb1eb43b5dbd.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Exporting QFontDatabase::removeAllApplicationFonts()
Adding QFontDatabase::removeAllApplicationFonts()
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qfontdatabase_s60.cpp | 5 | ||||
| -rw-r--r-- | src/s60installs/bwins/QtGuiu.def | 1 | ||||
| -rw-r--r-- | src/s60installs/eabi/QtGuiu.def | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp index 87a73df..fceb401 100644 --- a/src/gui/text/qfontdatabase_s60.cpp +++ b/src/gui/text/qfontdatabase_s60.cpp @@ -332,6 +332,11 @@ bool QFontDatabase::removeApplicationFont(int handle) return false; } +bool QFontDatabase::removeAllApplicationFonts() +{ + return false; +} + bool QFontDatabase::supportsThreadedFontRendering() { return false; diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def index 8e758d0..6a4f07b 100644 --- a/src/s60installs/bwins/QtGuiu.def +++ b/src/s60installs/bwins/QtGuiu.def @@ -12601,4 +12601,5 @@ EXPORTS ?setPixelFormat@QEglProperties@@QAEXW4Format@QImage@@@Z @ 12600 NONAME ABSENT ; void QEglProperties::setPixelFormat(enum QImage::Format) ?currentContext@QEglContext@@CAPAV1@W4API@QEgl@@@Z @ 12601 NONAME ABSENT ; class QEglContext * QEglContext::currentContext(enum QEgl::API) ?errorString@QEglContext@@SA?AVQString@@H@Z @ 12602 NONAME ABSENT ; class QString QEglContext::errorString(int) + ?removeAllApplicationFonts@QFontDatabase@@SA_NXZ @12603 ; NONAME ; bool QFontDatabase::removeAllApplicationFonts() diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def index 373f66d..a3fc452 100644 --- a/src/s60installs/eabi/QtGuiu.def +++ b/src/s60installs/eabi/QtGuiu.def @@ -11805,4 +11805,5 @@ EXPORTS _ZN24QImagePixmapCleanupHooks34executePixmapDataModificationHooksEP11QPixmapData @ 11804 NONAME _ZN9QS60Style10timerEventEP11QTimerEvent @ 11805 NONAME _ZN9QS60Style11eventFilterEP7QObjectP6QEvent @ 11806 NONAME + _ZN13QFontDatabase25removeAllApplicationFontsEv @ 11807 NONAME |