diff options
author | Christian Strømme <christian.stromme@digia.com> | 2014-04-23 16:10:33 +0200 |
---|---|---|
committer | Christian Stromme <christian.stromme@digia.com> | 2014-06-30 16:58:43 +0200 |
commit | 8f96ce37333b3034f2eef1366f9eea4a47a479ed (patch) | |
tree | 9b536c1f9639b6ad092eb99416205b7735cda6d7 /src/plugins/platforms/android/qandroidplatformfontdatabase.cpp | |
parent | 32514298131f7e8009a7641e20ff37be91cf4582 (diff) |
Android: Fix namespace usage
This change makes it possible to set a Qt namespace for Android builds.
Change-Id: I79f4ae8200223f36f97e2849aae49e45b8850d23
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformfontdatabase.cpp')
-rw-r--r-- | src/plugins/platforms/android/qandroidplatformfontdatabase.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformfontdatabase.cpp b/src/plugins/platforms/android/qandroidplatformfontdatabase.cpp index 935caed467..fd14f812a0 100644 --- a/src/plugins/platforms/android/qandroidplatformfontdatabase.cpp +++ b/src/plugins/platforms/android/qandroidplatformfontdatabase.cpp @@ -43,6 +43,8 @@ #include "qandroidplatformfontdatabase.h" +QT_BEGIN_NAMESPACE + QString QAndroidPlatformFontDatabase::fontDir() const { return QLatin1String("/system/fonts"); @@ -87,3 +89,5 @@ QStringList QAndroidPlatformFontDatabase::fallbacksForFamily(const QString &fami return QString(qgetenv("QT_ANDROID_FONTS")).split(";") + m_fallbacks[script]; } + +QT_END_NAMESPACE |