diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-28 19:18:10 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-28 19:18:10 +0200 |
commit | cb6fec851507e9e2a53e8b4b7d70e7e4ac165348 (patch) | |
tree | e9c455888b4539a3d36028ed33d9dfba6ce5dd55 /src/plugins/platforms/android/src | |
parent | 37351bbecf806dfed36a5558a38f502c9cec7d84 (diff) | |
parent | cb79be2076e3ba02b603f4ab65ca12cd99fa2eba (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I53112e20a65b7d706755b4a22622979f3b91a2c2
Diffstat (limited to 'src/plugins/platforms/android/src')
-rw-r--r-- | src/plugins/platforms/android/src/qandroidplatformintegration.cpp | 10 | ||||
-rw-r--r-- | src/plugins/platforms/android/src/qandroidplatformintegration.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/src/qandroidplatformintegration.cpp b/src/plugins/platforms/android/src/qandroidplatformintegration.cpp index f0630b5224..91ad2b368f 100644 --- a/src/plugins/platforms/android/src/qandroidplatformintegration.cpp +++ b/src/plugins/platforms/android/src/qandroidplatformintegration.cpp @@ -216,6 +216,16 @@ QPlatformServices *QAndroidPlatformIntegration::services() const return m_androidPlatformServices; } +QVariant QAndroidPlatformIntegration::styleHint(StyleHint hint) const +{ + switch (hint) { + case ShowIsFullScreen: + return true; + default: + return QPlatformIntegration::styleHint(hint); + } +} + static const QLatin1String androidThemeName("android"); QStringList QAndroidPlatformIntegration::themeNames() const { diff --git a/src/plugins/platforms/android/src/qandroidplatformintegration.h b/src/plugins/platforms/android/src/qandroidplatformintegration.h index 8da9fb2ff4..6cc191701d 100644 --- a/src/plugins/platforms/android/src/qandroidplatformintegration.h +++ b/src/plugins/platforms/android/src/qandroidplatformintegration.h @@ -112,6 +112,8 @@ public: QPlatformNativeInterface *nativeInterface() const; QPlatformServices *services() const; + QVariant styleHint(StyleHint hint) const; + QStringList themeNames() const; QPlatformTheme *createPlatformTheme(const QString &name) const; |