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

Change-Id: If7e51514ed6832750e3ad967e4d322ccf920d2bb

2 files changed, 15 insertions, 8 deletions

diff --git a/src/tools/qdoc/qdocdatabase.cpp b/src/tools/qdoc/qdocdatabase.cpp
index 4b4c88a176..51908bc9e3 100644
--- a/src/tools/qdoc/qdocdatabase.cpp
+++ b/src/tools/qdoc/qdocdatabase.cpp
@@ -1264,11 +1264,11 @@ void QDocDatabase::findAllSince(InnerNode* node)
                     nsmap.value().insert(name,(*child));
                 }
             }
-            // Recursively find child nodes with since commands.
-            if ((*child)->isInnerNode()) {
-                findAllSince(static_cast<InnerNode *>(*child));
-            }
         }
+        // Recursively find child nodes with since commands.
+        if ((*child)->isInnerNode())
+            findAllSince(static_cast<InnerNode *>(*child));
+
         ++child;
     }
 }
diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 6d4cc12d5c..11a99d136d 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -610,11 +610,18 @@ bool RCCResourceLibrary::addFile(const QString &alias, const RCCFileInfo &file)
     const QString filename = nodes.at(nodes.size()-1);
     RCCFileInfo *s = new RCCFileInfo(file);
     s->m_parent = parent;
-    if (parent->m_children.contains(filename)) {
-        foreach (const QString &fileName, m_fileNames)
-            qWarning("%s: Warning: potential duplicate alias detected: '%s'",
-                     qPrintable(fileName), qPrintable(filename));
+    typedef QHash<QString, RCCFileInfo*>::const_iterator ChildConstIterator;
+    const ChildConstIterator cbegin = parent->m_children.constFind(filename);
+    const ChildConstIterator cend = parent->m_children.constEnd();
+    for (ChildConstIterator it = cbegin; it != cend; ++it) {
+        if (it.key() == filename && it.value()->m_language == s->m_language &&
+            it.value()->m_country == s->m_country) {
+            foreach (const QString &name, m_fileNames)
+                qWarning("%s: Warning: potential duplicate alias detected: '%s'",
+                qPrintable(name), qPrintable(filename));
+            break;
         }
+    }
     parent->m_children.insertMulti(filename, s);
     return true;
 }