From 1b5b4cb6f4dcf09c3b75afed69259e6ed3a71abf Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 26 Apr 2022 11:42:43 +0200
Subject: [PATCH] Mimetypes v3: Fix that octet-stream was wrongly considered
 parent

The fallback mimetype of application/octet-stream is supposed to only be
a fallback if the mimetype doesn't specify another parent.

Amends 98b1e82d2b7000c61b7a58f36318ae8c06c248c7

Fixes: QTCREATORBUG-27398
Change-Id: I4ac92dd4817fae37de4499fe9e08aa2e5dd50a51
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/libs/utils/mimetypes2/mimedatabase.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libs/utils/mimetypes2/mimedatabase.cpp b/src/libs/utils/mimetypes2/mimedatabase.cpp
index fea32ddc67a..41d55fbc3d4 100644
--- a/src/libs/utils/mimetypes2/mimedatabase.cpp
+++ b/src/libs/utils/mimetypes2/mimedatabase.cpp
@@ -356,9 +356,11 @@ QStringList MimeDatabasePrivate::parents(const QString &mimeName)
             break;
         }
     }
-    const QString parent = fallbackParent(mimeName);
-    if (!parent.isEmpty())
-        result.append(parent);
+    if (result.isEmpty()) {
+        const QString parent = fallbackParent(mimeName);
+        if (!parent.isEmpty())
+            result.append(parent);
+    }
     return result;
 }