From 02d904d5983ff0597f52d8d6ec76439f81da6504 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 13 Jan 2011 13:17:48 +0100 Subject: qdoc: Added a parameter to \row And removed some \raw cases. Only 11 raw-html uses remaining. --- doc/src/getting-started/installation.qdoc | 169 ++++++++++++++++++------------ doc/src/template/style/style.css | 50 +++++++++ tools/qdoc3/doc.cpp | 3 +- tools/qdoc3/htmlgenerator.cpp | 25 +++-- 4 files changed, 172 insertions(+), 75 deletions(-) diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index f622192..f6498c1 100644 --- a/doc/src/getting-started/installation.qdoc +++ b/doc/src/getting-started/installation.qdoc @@ -1007,78 +1007,113 @@ We hope you will enjoy using Qt. \image x11_dependencies.png Qt for X11 Dependencies - \raw HTML - - \endraw - The QtGui module and the QtCore module, which provides the non-GUI features required by QtGui, depend on the libraries described in the following table. To build Qt from its source code, you will also need to install the development packages for these libraries for your system. - \raw HTML - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameLibraryNotesConfiguration optionsMinimum working version -
XRender libXrender X Rendering Extension; used for anti-aliasing-xrender or auto-detected0.9.0
Xrandr libXrandr X Resize and Rotate Extension-xrandr or auto-detected1.0.2
Xcursor libXcursor X Cursor Extension-xcursor or auto-detected1.1.4
Xfixes libXfixes X Fixes Extension-xfixes or auto-detected3.0.0
Xinerama libXinerama Multi-head support-xinerama or auto-detected1.1.0
Fontconfig libfontconfig Font customization and configuration-fontconfig or auto-detected2.1
FreeType libfreetype Font engine2.1.3
Xi libXi X11 Input Extensions-xinput or auto-detected1.3.0
Xt libXt Xt Intrinsics0.99
Xext libXext X Extensions6.4.3
X11 libX11 X11 Client-Side Library6.2.1
SM libSM X Session Management-sm or auto-detected6.0.4
ICE libICE Inter-Client Exchange-sm or auto-detected6.3.5
glib libglib-2.0 Common event loop handling-glib or auto-detected2.8.3
pthread libpthread Multithreading2.3.5
- \endraw + \table 100% + \header + \o Name + \o Library + \o Notes + \o Configuration options + \o Minimum working version + \row {id="OptionalColor"} + \o XRender + \o libXrender + \o X Rendering Extension; used for anti-aliasing + \o \tt{-xrender} or auto-detected + \o 0.9.0 + \row {id="OptionalColor"} + \o Xrandr + \o libXrandr + \o X Resize and Rotate Extension + \o \tt{-xrandr} or auto-detected + \o 1.0.2 + \row {id="OptionalColor"} + \o Xcursor + \o libXcursor + \o X Cursor Extension + \o \tt{-xcursor} or auto-detected + \o 1.1.4 + \row {id="OptionalColor"} + \o Xfixes + \o libXfixes + \o X Fixes Extension + \o \tt{-xfixes} or auto-detected + \o 3.0.0 + \row {id="OptionalColor"} + \o Xinerama + \o libXinerama + \o Multi-head support + \o \tt{-xinerama} or auto-detected + \o 1.1.0 + + \row {id="OptionalColor"} + \o Fontconfig + \o libfontconfig + \o Font customization and configuration + \o \tt{-fontconfig} or auto-detected + \o 2.1 + \row {id="OptionalColor"} + \o FreeType + \o libfreetype + \o Font engine + \o + \o 2.1.3 + + \row {id="DefaultColor"} + \o Xi + \o libXi + \o X11 Input Extensions + \o \tt{-xinput} or auto-detected + \o 1.3.0 + \row {id="DefaultColor"} + \o Xt + \o libXt + \o Xt Intrinsics + \o + \o 0.99 + \row {id="DefaultColor"} + \o Xext + \o libXext + \o X Extensions + \o + \o 6.4.3 + \row {id="DefaultColor"} + \o X11 + \o libX11 + \o X11 Client-Side Library + \o + \o 6.2.1 + + \row {id="SMColor"} + \o SM + \o libSM + \o X Session Management + \o \tt{-sm} or auto-detected + \o 6.0.4 + \row {id="SMColor"} + \o ICE + \o libICE + \o Inter-Client Exchange + \o \tt{-sm} or auto-detected + \o 6.3.5 + + \row {id="GlibColor"} + \o glib + \o libglib-2.0 + \o Common event loop handling + \o \tt{-glib} or auto-detected + \o 2.8.3 + \row {id="PthreadColor"} + \o pthread + \o libpthread + \o Multithreading + \o + \o 2.3.5 + \endtable \note You must compile with XRender support to get alpha transparency support for pixmaps and images. diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index de9e76c..7af5141 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -284,6 +284,56 @@ background: #c0c0c0; color: #000000; } + #QtGuiColor + { + background-color: #98fd00; + color: black; + } + #QtCoreColor + { + background-color: #9c9cff; + color: black; + } + #DefaultColor + { + background-color: #f6f6dc; + color: black; + } + #FreetypeColor + { + background-color: #e6e6fa; + color: black; + } + #GLColor + { + background-color: #ffc0cb; + color: black; + } + #PthreadColor + { + background-color: #bdb76b; + color: black; + } + #OptionalColor + { + background-color: #cae1ff; + color: black; + } + #SMColor + { + background-color: #c2fafa; + color: black; + } + #MiscColor + { + background-color: #f0f9ff; + color: black; + } + #GlibColor + { + background-color: #b3b3b3; + color: black; + } .figCaption { color:#363534; diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp index b7dba8a..7c3d141 100644 --- a/tools/qdoc3/doc.cpp +++ b/tools/qdoc3/doc.cpp @@ -1028,8 +1028,9 @@ void DocParser::parse(const QString& source, break; case CMD_ROW: if (openedCommands.top() == CMD_TABLE) { + x = getArgument(true); leaveTableRow(); - append(Atom::TableRowLeft); + append(Atom::TableRowLeft,x); inTableRow = true; } else { diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 7b6ec16..81bd7a8 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1106,7 +1106,14 @@ int HtmlGenerator::generateAtom(const Atom *atom, } break; case Atom::TableRowLeft: - if (++numTableRows % 2 == 1) + if (!atom->string().isEmpty()) { + out() << "string().contains('=')) + out() << " " << atom->string() << ">"; + else + out() << " class=\"" << atom->string() << "\">"; + } + else if (++numTableRows % 2 == 1) out() << ""; else out() << ""; @@ -1127,10 +1134,12 @@ int HtmlGenerator::generateAtom(const Atom *atom, out() << " colspan=\"" << spans.at(0) << "\""; if (spans.at(1) != "1") out() << " rowspan=\"" << spans.at(1) << "\""; - if (inTableHeader) - out() << ">"; - else - out() << ">

"; + if (inTableHeader) + out() << ">"; + else { + out() << ">"; + //out() << ">

"; + } } if (matchAhead(atom, Atom::ParaLeft)) skipAhead = 1; @@ -1139,8 +1148,10 @@ int HtmlGenerator::generateAtom(const Atom *atom, case Atom::TableItemRight: if (inTableHeader) out() << ""; - else - out() << "

"; + else { + out() << ""; + //out() << "

"; + } if (matchAhead(atom, Atom::ParaLeft)) skipAhead = 1; break; -- cgit v0.12