diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 13:05:02 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-12 13:05:02 +0200 |
| commit | ca524e5b70ccfeb6386cf0c5df83ffb86a8771fe (patch) | |
| tree | 245c471373516ccda2b0c91943a42cd74674f2da /src/gui/text/qplatformfontdatabase.cpp | |
| parent | b08cc0ec6f096d0e6764486c81264c24a406bee1 (diff) | |
| parent | c2badc7423b63824902d1f44a4b804de3335c20b (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Manually included changes from
3a347a4e70e5a10ee92dd2578316c926a399e894
in src/opengl/qgl.cpp.
Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/android/androidjnimain.cpp
Change-Id: Ic26b58ee587d4884c9d0fba45c5a94b5a45ee929
Diffstat (limited to 'src/gui/text/qplatformfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qplatformfontdatabase.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp index e9ffa68591..5dc81d241d 100644 --- a/src/gui/text/qplatformfontdatabase.cpp +++ b/src/gui/text/qplatformfontdatabase.cpp @@ -402,6 +402,16 @@ QString QPlatformFontDatabase::fontDir() const } /*! + Returns true if the font family is private. For any given family name, + the result is platform dependent. +*/ +bool QPlatformFontDatabase::isPrivateFontFamily(const QString &family) const +{ + Q_UNUSED(family); + return false; +} + +/*! Returns the default system font. \sa QGuiApplication::font() |