Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Id20053d261b4fbbcc0ac8ba49dd3ef2253fa4b95

4 files changed, 19 insertions, 16 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformmenu.cpp b/src/plugins/platforms/android/qandroidplatformmenu.cpp
index 8f992f6bea..f8e7df8784 100644
--- a/src/plugins/platforms/android/qandroidplatformmenu.cpp
+++ b/src/plugins/platforms/android/qandroidplatformmenu.cpp
@@ -53,18 +53,18 @@ QAndroidPlatformMenu::~QAndroidPlatformMenu()
 void QAndroidPlatformMenu::insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before)
 {
     QMutexLocker lock(&m_menuItemsMutex);
-    m_menuItems.insert(qFind(m_menuItems.begin(),
-                             m_menuItems.end(),
-                             static_cast<QAndroidPlatformMenuItem *>(before)),
+    m_menuItems.insert(std::find(m_menuItems.begin(),
+                                 m_menuItems.end(),
+                                 static_cast<QAndroidPlatformMenuItem *>(before)),
                        static_cast<QAndroidPlatformMenuItem *>(menuItem));
 }
 
 void QAndroidPlatformMenu::removeMenuItem(QPlatformMenuItem *menuItem)
 {
     QMutexLocker lock(&m_menuItemsMutex);
-    PlatformMenuItemsType::iterator it = qFind(m_menuItems.begin(),
-                                               m_menuItems.end(),
-                                               static_cast<QAndroidPlatformMenuItem *>(menuItem));
+    PlatformMenuItemsType::iterator it = std::find(m_menuItems.begin(),
+                                                   m_menuItems.end(),
+                                                   static_cast<QAndroidPlatformMenuItem *>(menuItem));
     if (it != m_menuItems.end())
         m_menuItems.erase(it);
 }
diff --git a/src/plugins/platforms/android/qandroidplatformmenubar.cpp b/src/plugins/platforms/android/qandroidplatformmenubar.cpp
index 87ebaa8554..2892c3ef3b 100644
--- a/src/plugins/platforms/android/qandroidplatformmenubar.cpp
+++ b/src/plugins/platforms/android/qandroidplatformmenubar.cpp
@@ -51,18 +51,18 @@ QAndroidPlatformMenuBar::~QAndroidPlatformMenuBar()
 void QAndroidPlatformMenuBar::insertMenu(QPlatformMenu *menu, QPlatformMenu *before)
 {
     QMutexLocker lock(&m_menusListMutex);
-    m_menus.insert(qFind(m_menus.begin(),
-                         m_menus.end(),
-                         static_cast<QAndroidPlatformMenu *>(before)),
-                         static_cast<QAndroidPlatformMenu *>(menu));
+    m_menus.insert(std::find(m_menus.begin(),
+                             m_menus.end(),
+                             static_cast<QAndroidPlatformMenu *>(before)),
+                   static_cast<QAndroidPlatformMenu *>(menu));
 }
 
 void QAndroidPlatformMenuBar::removeMenu(QPlatformMenu *menu)
 {
     QMutexLocker lock(&m_menusListMutex);
-    m_menus.erase(qFind(m_menus.begin(),
-                        m_menus.end(),
-                        static_cast<QAndroidPlatformMenu *>(menu)));
+    m_menus.erase(std::find(m_menus.begin(),
+                            m_menus.end(),
+                            static_cast<QAndroidPlatformMenu *>(menu)));
 }
 
 void QAndroidPlatformMenuBar::syncMenu(QPlatformMenu *menu)
diff --git a/src/plugins/platforms/android/qandroidplatformtheme.cpp b/src/plugins/platforms/android/qandroidplatformtheme.cpp
index b955cff44d..ef7093942c 100644
--- a/src/plugins/platforms/android/qandroidplatformtheme.cpp
+++ b/src/plugins/platforms/android/qandroidplatformtheme.cpp
@@ -347,6 +347,9 @@ QAndroidPlatformTheme::QAndroidPlatformTheme(QAndroidPlatformNativeInterface *an
     m_androidStyleData = loadAndroidStyle(&m_defaultPalette);
     QGuiApplication::setPalette(m_defaultPalette);
     androidPlatformNativeInterface->m_androidStyle = m_androidStyleData;
+
+    // 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
 }
 
 QPlatformMenuBar *QAndroidPlatformTheme::createPlatformMenuBar() const
@@ -429,10 +432,8 @@ const QFont *QAndroidPlatformTheme::font(Font type) const
             return &(it.value());
     }
 
-    // default in case the style has not set a font
-    static QFont systemFont("Roboto", 14.0 * 100 / 72); // keep default size the same after changing from 100 dpi to 72 dpi
     if (type == QPlatformTheme::SystemFont)
-        return &systemFont;
+        return &m_systemFont;
     return 0;
 }
 
diff --git a/src/plugins/platforms/android/qandroidplatformtheme.h b/src/plugins/platforms/android/qandroidplatformtheme.h
index 334e86ad7a..e842e672d6 100644
--- a/src/plugins/platforms/android/qandroidplatformtheme.h
+++ b/src/plugins/platforms/android/qandroidplatformtheme.h
@@ -35,6 +35,7 @@
 #define QANDROIDPLATFORMTHEME_H
 
 #include <qpa/qplatformtheme.h>
+#include <QtGui/qfont.h>
 #include <QtGui/qpalette.h>
 
 #include <QJsonObject>
@@ -73,6 +74,7 @@ public:
 private:
     std::shared_ptr<AndroidStyle> m_androidStyleData;
     QPalette m_defaultPalette;
+    QFont m_systemFont;
 };
 
 QT_END_NAMESPACE