summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-09-22 02:48:42 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-09-22 02:48:42 (GMT)
commit860430c4b263875426bb813103047836adc387ec (patch)
tree58781d224f17c34b2cef36d0a5d0925cb3f99fcd /doc
parent07a7b69cd5662674ec6ac0c7ba0f874baf854b4c (diff)
downloadQt-860430c4b263875426bb813103047836adc387ec.zip
Qt-860430c4b263875426bb813103047836adc387ec.tar.gz
Qt-860430c4b263875426bb813103047836adc387ec.tar.bz2
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
Diffstat (limited to 'doc')
-rw-r--r--doc/doc.pri2
-rw-r--r--doc/src/index.qdoc18
-rw-r--r--doc/src/modules.qdoc2
3 files changed, 2 insertions, 20 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}
*/