From 860430c4b263875426bb813103047836adc387ec Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 22 Sep 2009 12:48:42 +1000
Subject: Remove distinction between different editions in docs.
We now generate only one set of docs, for the qt-everywhere package.
Thus we no longer need to differentiate the different editions.
Reviewed-by: Trust Me
---
doc/doc.pri | 2 +-
doc/src/index.qdoc | 18 +-----------------
doc/src/modules.qdoc | 2 --
tools/qdoc3/generator.cpp | 9 +++------
4 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/doc/doc.pri b/doc/doc.pri
index 66953e6..9105fbb 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -2,7 +2,7 @@
# Qt documentation build
#####################################################################
-DOCS_GENERATION_DEFINES = -Dopensourceedition
+DOCS_GENERATION_DEFINES =
GENERATOR = $$QT_BUILD_TREE/bin/qhelpgenerator
win32:!win32-g++ {
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 4e91d79..ed4bbbe 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -43,24 +43,8 @@
\page index.html
\keyword Qt Reference Documentation
- \if defined(opensourceedition)
- \title Qt Reference Documentation (Open Source Edition)
- \endif
-
- \if defined(desktoplightedition)
- \title Qt Reference Documentation (GUI Framework Edition)
- \endif
-
- \if defined(desktopedition)
- \title Qt Reference Documentation (Full Framework Edition)
- \endif
-
- \if !defined(opensourceedition) \
- && !defined(desktoplightedition) \
- && !defined(desktopedition)
\title Qt Reference Documentation
- \endif
-
+
\raw HTML
<table cellpadding="2" cellspacing="1" border="0" width="95%" class="indextable" align="center">
<tr>
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index bbdae9d..9c92a31 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -636,10 +636,8 @@
This module is part of the \l{Qt Full Framework Edition} and the
\l{Open Source Versions of Qt}. Most classes offered by this module are
also part of the \l{Qt GUI Framework Edition}.
-\if defined(opensourceedition) || defined(desktoplightedition)
Classes that are not available for \l{Qt GUI Framework Edition}
users are marked as such in the class documentation.
-\endif
\sa {Porting to Qt 4}
*/
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index 2d03860..47fe4b5 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -562,24 +562,21 @@ void Generator::generateModuleWarning(const ClassNode *classe,
QString module = classe->moduleName();
if (!module.isEmpty()) {
Text text;
- if (Tokenizer::isTrue("defined(consoleedition)")
- && !editionModuleMap["Console"].contains(module)) {
+ if (!editionModuleMap["Console"].contains(module)) {
text << Atom::ParaLeft
<< Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD)
<< "This class is not part of the Qt Console Edition."
<< Atom(Atom::FormattingRight, ATOM_FORMATTING_BOLD)
<< Atom::ParaRight;
}
- else if (Tokenizer::isTrue("defined(desktoplightedition)")
- && !editionModuleMap["DesktopLight"].contains(module)) {
+ else if (!editionModuleMap["DesktopLight"].contains(module)) {
text << Atom::ParaLeft
<< Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD)
<< "This class is not part of the Qt Desktop Light Edition."
<< Atom(Atom::FormattingRight, ATOM_FORMATTING_BOLD)
<< Atom::ParaRight;
}
- else if (module == "Qt3Support" &&
- Tokenizer::isTrue("defined(opensourceedition)")) {
+ else if (module == "Qt3Support") {
text << Atom::ParaLeft
<< Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD)
<< "Note to Qt Desktop Light Edition users:"
--
cgit v0.12