qdoc: Remove defunct code for 'edition' qdocconf variable

There was some old code and documentation for this variable, but
using it had no effect on the output. Similarly, the \generatelist
command no longer recognized the edition-specific parameter.

Fixes: QTBUG-83367
Change-Id: I42a1e67855ffd781e326e9d89cec0dde51cb14d0
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

5 files changed, 2 insertions, 52 deletions

diff --git a/src/qdoc/config.cpp b/src/qdoc/config.cpp
index 1387fb411..9ff22c8b1 100644
--- a/src/qdoc/config.cpp
+++ b/src/qdoc/config.cpp
@@ -57,7 +57,6 @@ QString ConfigStrings::DEFINES = QStringLiteral("defines");
 QString ConfigStrings::DEPENDS = QStringLiteral("depends");
 QString ConfigStrings::DESCRIPTION = QStringLiteral("description");
 QString ConfigStrings::DOCBOOKEXTENSIONS = QStringLiteral("usedocbookextensions");
-QString ConfigStrings::EDITION = QStringLiteral("edition");
 QString ConfigStrings::ENDHEADER = QStringLiteral("endheader");
 QString ConfigStrings::EXAMPLEDIRS = QStringLiteral("exampledirs");
 QString ConfigStrings::EXAMPLES = QStringLiteral("examples");
diff --git a/src/qdoc/config.h b/src/qdoc/config.h
index f8823d521..933aad543 100644
--- a/src/qdoc/config.h
+++ b/src/qdoc/config.h
@@ -228,7 +228,6 @@ struct ConfigStrings
     static QString DEPENDS;
     static QString DESCRIPTION;
     static QString DOCBOOKEXTENSIONS;
-    static QString EDITION;
     static QString ENDHEADER;
     static QString EXAMPLEDIRS;
     static QString EXAMPLES;
@@ -315,7 +314,6 @@ struct ConfigStrings
 #define CONFIG_DEPENDS ConfigStrings::DEPENDS
 #define CONFIG_DESCRIPTION ConfigStrings::DESCRIPTION
 #define CONFIG_DOCBOOKEXTENSIONS ConfigStrings::DOCBOOKEXTENSIONS
-#define CONFIG_EDITION ConfigStrings::EDITION
 #define CONFIG_ENDHEADER ConfigStrings::ENDHEADER
 #define CONFIG_EXAMPLEDIRS ConfigStrings::EXAMPLEDIRS
 #define CONFIG_EXAMPLES ConfigStrings::EXAMPLES
diff --git a/src/qdoc/doc/qdoc-manual-qdocconf.qdoc b/src/qdoc/doc/qdoc-manual-qdocconf.qdoc
index 6d26de344..5f43a1d41 100644
--- a/src/qdoc/doc/qdoc-manual-qdocconf.qdoc
+++ b/src/qdoc/doc/qdoc-manual-qdocconf.qdoc
@@ -91,7 +91,6 @@
     \li \l {Cpp.ignoretokens-variable} {Cpp.ignoretokens}
     \li \l {defines-variable} {defines}
     \li \l {depends-variable} {depends}
-    \li \l {edition-variable} {edition}
     \li \l {exampledirs-variable} {exampledirs}
     \li \l {examples-variable} {examples}
     \li \l {examples.fileextensions-variable} {examples.fileextensions}
@@ -244,10 +243,10 @@
     line using the -D option. For example:
 
     \badcode
-        currentdirectory$ qdoc -Dconsoleedition qtgui.qdocconf
+        currentdirectory$ qdoc -Dqtforpython qtgui.qdocconf
     \endcode
 
-    In this case the -D option ensures that the \c consoleedition
+    In this case the -D option ensures that the \c qtforpython
     preprocessor symbol is defined when QDoc processes the source
     files defined in the qtgui.qdocconf file.
 
@@ -305,37 +304,6 @@
 
     See also \l indexes, \l project, and \l url.
 
-    \target edition-variable
-    \section1 edition
-
-    The \c edition variable specifies which modules are included in
-    each edition of a package, and provides QDoc with information to
-    provide class lists for each edition.
-
-    This feature is mostly used when providing documentation for Qt
-    packages.
-
-    The \c edition variable is always used with a particular edition
-    name to define the modules for that edition:
-
-    \badcode
-        edition.Console      = QtCore QtNetwork QtSql QtXml
-        edition.Desktop      = QtCore QtGui QtNetwork QtOpenGL QtSql QtXml \
-                               QtDesigner QtAssistant Qt3Support QAxContainer \
-                               QAxServer
-        edition.DesktopLight = QtCore QtGui Qt3SupportLight
-    \endcode
-
-    In the above examples, the \c Console edition only includes the
-    contents of four modules. Only the classes from these modules will
-    be used when the \l{Miscellaneous#generatelist-command}
-    {generatelist} command is used to generate a list of classes for
-    this edition:
-
-    \badcode
-        \generatelist{classesbyedition Console}
-    \endcode
-
     \target exampledirs-variable
     \section1 exampledirs
 
diff --git a/src/qdoc/generator.h b/src/qdoc/generator.h
index f12aff933..dca915ba7 100644
--- a/src/qdoc/generator.h
+++ b/src/qdoc/generator.h
@@ -159,8 +159,6 @@ protected:
     static bool hasExceptions(const Node *node, NodeList &reentrant, NodeList &threadsafe,
                               NodeList &nonreentrant);
 
-    QMap<QString, QStringList> editionGroupMap;
-    QMap<QString, QStringList> editionModuleMap;
     QString naturalLanguage;
 #ifndef QT_NO_TEXTCODEC
     QTextCodec *outputCodec;
diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp
index 104d97bc2..a1a1cd876 100644
--- a/src/qdoc/htmlgenerator.cpp
+++ b/src/qdoc/htmlgenerator.cpp
@@ -185,19 +185,6 @@ void HtmlGenerator::initializeGenerator()
     if (naturalLanguage.isEmpty())
         naturalLanguage = QLatin1String("en");
 
-    const QSet<QString> editionNames = config->subVars(CONFIG_EDITION);
-    for (const auto &editionName : editionNames) {
-        QStringList editionModules = config->getStringList(CONFIG_EDITION + Config::dot
-                                                           + editionName + Config::dot + "modules");
-        QStringList editionGroups = config->getStringList(CONFIG_EDITION + Config::dot + editionName
-                                                          + Config::dot + "groups");
-
-        if (!editionModules.isEmpty())
-            editionModuleMap[editionName] = editionModules;
-        if (!editionGroups.isEmpty())
-            editionGroupMap[editionName] = editionGroups;
-    }
-
     codeIndent = config->getInt(CONFIG_CODEINDENT); // QTBUG-27798
     codePrefix = config->getString(CONFIG_CODEPREFIX);
     codeSuffix = config->getString(CONFIG_CODESUFFIX);