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

Conflicts:
	mkspecs/android-g++/qmake.conf
	qmake/generators/unix/unixmake2.cpp
	src/gui/image/qimage_conversions.cpp

Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformfontdatabase.cpp b/src/plugins/platforms/android/qandroidplatformfontdatabase.cpp
index c951e6f938..9b60ab291c 100644
--- a/src/plugins/platforms/android/qandroidplatformfontdatabase.cpp
+++ b/src/plugins/platforms/android/qandroidplatformfontdatabase.cpp
@@ -51,10 +51,10 @@ void QAndroidPlatformFontDatabase::populateFontDatabase()
                qPrintable(fontpath));
     }
 
-    QDir dir(fontpath, QLatin1String("*.ttf"));
-    for (int i = 0; i < int(dir.count()); ++i) {
-        const QByteArray file = QFile::encodeName(dir.absoluteFilePath(dir[i]));
-
+    QDir dir(fontpath);
+    QList<QFileInfo> entries = dir.entryInfoList(QStringList() << QStringLiteral("*.ttf") << QStringLiteral("*.otf"), QDir::Files);
+    for (int i = 0; i < int(entries.count()); ++i) {
+        const QByteArray file = QFile::encodeName(entries.at(i).absoluteFilePath());
         QSupportedWritingSystems supportedWritingSystems;
         QStringList families = addTTFile(QByteArray(), file, &supportedWritingSystems);