Merge master into api_changes

Conflicts:
	src/corelib/global/qisenum.h
	src/dbus/qdbusconnection_p.h
	src/widgets/kernel/qwidget.cpp
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp

Change-Id: I85102515d5fec835832cc20ffdc5c1ba578bd01d

1 files changed, 9 insertions, 11 deletions

diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
index 279a1fbc22..bf05433b22 100644
--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
@@ -641,17 +641,15 @@ QStringList QFontconfigDatabase::fallbacksForFamily(const QString family, const
     FcPatternDestroy(pattern);
 
     if (fontSet) {
-        if (result == FcResultMatch) {
-            for (int i = 0; i < fontSet->nfont; i++) {
-                FcChar8 *value = 0;
-                if (FcPatternGetString(fontSet->fonts[i], FC_FAMILY, 0, &value) != FcResultMatch)
-                    continue;
-                //         capitalize(value);
-                QString familyName = QString::fromUtf8((const char *)value);
-                if (!fallbackFamilies.contains(familyName,Qt::CaseInsensitive) &&
-                    familyName.compare(family, Qt::CaseInsensitive)) {
-                    fallbackFamilies << familyName;
-                }
+        for (int i = 0; i < fontSet->nfont; i++) {
+            FcChar8 *value = 0;
+            if (FcPatternGetString(fontSet->fonts[i], FC_FAMILY, 0, &value) != FcResultMatch)
+                continue;
+            //         capitalize(value);
+            QString familyName = QString::fromUtf8((const char *)value);
+            if (!fallbackFamilies.contains(familyName,Qt::CaseInsensitive) &&
+                familyName.compare(family, Qt::CaseInsensitive)) {
+                fallbackFamilies << familyName;
             }
         }
         FcFontSetDestroy(fontSet);