1 files changed, 15 insertions, 7 deletions
diff --git a/src/tools/qdoc/generator.h b/src/tools/qdoc/generator.h
index 110a8d9e73..b1faf02ae9 100644
--- a/src/tools/qdoc/generator.h
+++ b/src/tools/qdoc/generator.h
@@ -61,7 +61,7 @@ class Generator
     Q_DECLARE_TR_FUNCTIONS(QDoc::Generator)
 
 public:
-    enum Passes { Both, Prepare, Generate };
+    enum QDocPass { Neither, Prepare, Generate };
     enum ListType { Generic, Obsolete };
 
     Generator();
@@ -91,10 +91,14 @@ public:
     static bool debugging() { return debugging_; }
     static bool noLinkErrors() { return noLinkErrors_; }
     static bool autolinkErrors() { return autolinkErrors_; }
-    static void setQDocPass(Passes pass) { qdocPass_ = pass; }
-    static bool runPrepareOnly() { return (qdocPass_ == Prepare); }
-    static bool runGenerateOnly() { return (qdocPass_ == Generate); }
-    static QString defaultModuleName() { return project; }
+    static void setQDocPass(QDocPass t) { qdocPass_ = t; }
+    static bool preparing() { return (qdocPass_ == Prepare); }
+    static bool generating() { return (qdocPass_ == Generate); }
+    static bool singleExec() { return qdocSingleExec_; }
+    static bool writeQaPages() { return qdocWriteQaPages_; }
+    static void setSingleExec() { qdocSingleExec_ = true; }
+    static void setWriteQaPages() { qdocWriteQaPages_ = true; }
+    static QString defaultModuleName() { return project_; }
     static void resetUseOutputSubdirs() { useOutputSubdirs_ = false; }
     static bool useOutputSubdirs() { return useOutputSubdirs_; }
 
@@ -103,6 +107,7 @@ protected:
     virtual void endSubPage();
     virtual QString fileBase(const Node* node) const;
     virtual QString fileExtension() const = 0;
+    virtual void generateQAPage() { }
     virtual void generateAlsoList(const Node *node, CodeMarker *marker);
     virtual int generateAtom(const Atom *atom, const Node *relative, CodeMarker *marker);
     virtual void generateBody(const Node *node, CodeMarker *marker);
@@ -198,7 +203,7 @@ private:
     static QStringList imageDirs;
     static QStringList imageFiles;
     static QMap<QString, QStringList> imgFileExts;
-    static QString project;
+    static QString project_;
     static QString outDir_;
     static QString outSubdir_;
     static QStringList outFileNames_;
@@ -212,7 +217,9 @@ private:
     static bool noLinkErrors_;
     static bool autolinkErrors_;
     static bool redirectDocumentationToDevNull_;
-    static Passes qdocPass_;
+    static QDocPass qdocPass_;
+    static bool qdocSingleExec_;
+    static bool qdocWriteQaPages_;
     static bool useOutputSubdirs_;
 
     void generateReimplementedFrom(const FunctionNode *func, CodeMarker *marker);
@@ -232,6 +239,7 @@ private:
     bool inTableHeader_;
     bool threeColumnEnumValueTable_;
     bool showInternal_;
+    bool singleExec_;
     int numTableRows_;
     QString link_;
     QString sectionNumber_;