Merge remote branch 'origin/master' into berlin-master

Conflicts:
	configure.exe

1 files changed, 0 insertions, 26 deletions

diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index a7ab453..6a8899a 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -1186,32 +1186,6 @@ void Generator::appendSortedNames(Text& text,
     }
 }
 
-void Generator::appendSortedNames(Text& text,
-                                  const Node* base,
-                                  const NodeList& subs,
-                                  CodeMarker *marker)
-{
-    NodeList::ConstIterator r;
-    QMap<QString,Text> classMap;
-    int index = 0;
-
-    r = subs.begin();
-    while (r != subs.end()) {
-        Text className;
-        appendFullName(className, (*r), base, marker);
-        classMap[className.toString().toLower()] = className;
-        ++r;
-    }
-
-    QStringList classNames = classMap.keys();
-    classNames.sort();
-
-    foreach (const QString &className, classNames) {
-        text << classMap[className];
-        text << separator(index++, classNames.count());
-    }
-}
-
 int Generator::skipAtoms(const Atom *atom, Atom::Type type) const
 {
     int skipAhead = 0;