diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 09:11:33 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 09:11:33 +0200 |
commit | 492bbdefd3655f55427761c324e90934157833fb (patch) | |
tree | 6dfaff4962a915d6486e91a025e7cdd9c01bb3f8 /src/gui/text/qfont_qpa.cpp | |
parent | 54c9b1a80c04a5ecc685dc29e27a27de81d8cc1b (diff) |
Remove more QApp dependencies
platformIntegration() lives in QGuiApplication
QFont and QFontDatabase can live with QGuiApp only
as well.
Diffstat (limited to 'src/gui/text/qfont_qpa.cpp')
-rw-r--r-- | src/gui/text/qfont_qpa.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qfont_qpa.cpp b/src/gui/text/qfont_qpa.cpp index ff12da8d97..981c313201 100644 --- a/src/gui/text/qfont_qpa.cpp +++ b/src/gui/text/qfont_qpa.cpp @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#include <QtGui/private/qapplication_p.h> +#include <QtGui/private/qguiapplication_p.h> #include <QtGui/QPlatformFontDatabase> QT_BEGIN_NAMESPACE void QFont::initialize() { - QApplicationPrivate::platformIntegration()->fontDatabase()->populateFontDatabase(); + QGuiApplicationPrivate::platformIntegration()->fontDatabase()->populateFontDatabase(); } void QFont::cleanup() @@ -90,7 +90,7 @@ QString QFont::defaultFamily() const familyName = QString::fromLatin1("helvetica"); } - QStringList list = QApplicationPrivate::platformIntegration()->fontDatabase()->fallbacksForFamily(familyName,QFont::StyleNormal,QFont::StyleHint(d->request.styleHint),QUnicodeTables::Common); + QStringList list = QGuiApplicationPrivate::platformIntegration()->fontDatabase()->fallbacksForFamily(familyName,QFont::StyleNormal,QFont::StyleHint(d->request.styleHint),QUnicodeTables::Common); if (list.size()) { familyName = list.at(0); } |