Merge remote branch 'qt-doc-review/master'

Conflicts:
	doc/src/declarative/righttoleft.qdoc
	tools/qdoc3/generator.h

1 files changed, 0 insertions, 6 deletions

diff --git a/tools/qdoc3/generator.h b/tools/qdoc3/generator.h
index e66915b..bac7c61 100644
--- a/tools/qdoc3/generator.h
+++ b/tools/qdoc3/generator.h
@@ -158,7 +158,6 @@ class Generator
 
     QString getMetadataElement(const InnerNode* inner, const QString& t);
     QStringList getMetadataElements(const InnerNode* inner, const QString& t);
-    void findAllSince(const InnerNode *node);
 
  private:
     void generateReimplementedFrom(const FunctionNode *func,
@@ -187,11 +186,6 @@ class Generator
                               const NodeList& subs,
                               CodeMarker *marker);
 
-    static QString sinceTitles[];
-    NewSinceMaps newSinceMaps;
-    NewClassMaps newClassMaps;
-    NewClassMaps newQmlClassMaps;
-
  private:
     QString amp;
     QString lt;