diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-29 12:58:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-29 12:58:41 +0200 |
| commit | e66d181e659a08d19ab7d144c3ba0619d537de83 (patch) | |
| tree | 7367e93797cb9a2a331f0741baed5a1cad2c96b6 /src/plugins/platforms/android/qandroidplatformtheme.cpp | |
| parent | 4758555f3e44af3425f0b691dc38fb40f3c9413d (diff) | |
| parent | 75aea3ff5eec4a5c8f4184e14a90f4a5e3a577b0 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I3b51bb706e401edfda09a433c67aa58e44f33e83
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformtheme.cpp')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformtheme.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformtheme.cpp b/src/plugins/platforms/android/qandroidplatformtheme.cpp index b9009fe704..c4387c5d88 100644 --- a/src/plugins/platforms/android/qandroidplatformtheme.cpp +++ b/src/plugins/platforms/android/qandroidplatformtheme.cpp @@ -368,9 +368,6 @@ QAndroidPlatformTheme::QAndroidPlatformTheme(QAndroidPlatformNativeInterface *an // default in case the style has not set a font m_systemFont = QFont(QLatin1String("Roboto"), 14.0 * 100 / 72); // keep default size the same after changing from 100 dpi to 72 dpi - - // by default use native menu bar - QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, false); } QPlatformMenuBar *QAndroidPlatformTheme::createPlatformMenuBar() const |