summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorAriya Hidayat <ariya.hidayat@nokia.com>2009-06-03 18:18:11 (GMT)
committerAriya Hidayat <ariya.hidayat@nokia.com>2009-06-03 18:18:11 (GMT)
commit1d893448dbd9cdd7c89dee3f40430a140aa65653 (patch)
tree83469621c8ff1435e16d46acbaf8c468f10d0089 /doc/src
parent29fc0074cf30a466be732246500d5312d2920784 (diff)
parent55148bf3c47546a93222c3e48a3e1bad062b5640 (diff)
downloadQt-1d893448dbd9cdd7c89dee3f40430a140aa65653.zip
Qt-1d893448dbd9cdd7c89dee3f40430a140aa65653.tar.gz
Qt-1d893448dbd9cdd7c89dee3f40430a140aa65653.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-graphicseffect
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/installation.qdoc10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index 6a689f9..bc310c9 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -612,6 +612,14 @@ in the \l{Qt for Windows CE Requirements} document.
</tr><tr id="OptionalColor">
<td> Xinerama </td><td> libXinerama </td><td> Multi-head support</td>
<td><tt>-xinerama</tt> or auto-detected</td><td>1.1.0</td>
+
+ </tr><tr id="OptionalColor">
+ <td> Fontconfig </td><td> libfontconfig </td><td> Font customization and configuration</td>
+ <td><tt>-fontconfig</tt> or auto-detected</td><td>2.1</td>
+ </tr><tr id="OptionalColor">
+ <td> FreeType </td><td> libfreetype </td><td> Font engine</td>
+ <td></td><td>2.1.3</td>
+
</tr><tr id="DefaultColor">
<td> Xi </td><td> libXi </td><td> X11 Input Extensions</td>
<td><tt>-xinput</tt> or auto-detected</td><td>1.3.0</td>
@@ -621,12 +629,14 @@ in the \l{Qt for Windows CE Requirements} document.
<td> Xext </td><td> libXext </td><td> X Extensions</td><td></td><td>6.4.3</td>
</tr><tr id="DefaultColor">
<td> X11 </td><td> libX11 </td><td> X11 Client-Side Library</td><td></td><td>6.2.1</td>
+
</tr><tr id="SMColor">
<td> SM </td><td> libSM </td><td> X Session Management</td>
<td><tt>-sm</tt> or auto-detected</td><td>6.0.4</td>
</tr><tr id="SMColor">
<td> ICE </td><td> libICE </td><td> Inter-Client Exchange</td>
<td><tt>-sm</tt> or auto-detected</td><td>6.3.5</td>
+
</tr><tr id="GlibColor">
<td> glib </td><td> libglib-2.0 </td><td> Common event loop handling</td>
<td><tt>-glib</tt> or auto-detected</td><td>2.8.3</td>