summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@nokia.com>2009-12-02 14:50:22 (GMT)
committerAndy Shaw <andy.shaw@nokia.com>2009-12-02 14:57:00 (GMT)
commit747ee16fe763725451d05126d9a9a49a87627210 (patch)
tree53c9d79adf9ab1e5da7d641e029905489a24adfa
parentd4fa065b90173ccf718beeec2a6fd269cc3135ea (diff)
downloadQt-747ee16fe763725451d05126d9a9a49a87627210.zip
Qt-747ee16fe763725451d05126d9a9a49a87627210.tar.gz
Qt-747ee16fe763725451d05126d9a9a49a87627210.tar.bz2
Fixes a couple of minor doc points
Added the perl requirement for building from source on Windows and clarified that the support for OpenGL ES Common Lite 1.0 is being dropped and not for OpenGL ES Common Lite as a whole. Reviewed-by: Martin Smith
-rw-r--r--doc/src/getting-started/installation.qdoc4
-rw-r--r--doc/src/platforms/supported-platforms.qdoc2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 58059d1..beb4419 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -711,6 +711,10 @@ If you are using pre-built binaries, follow the instructions given in the
\l{http://www.microsoft.com/downloads/details.aspx?FamilyId=BB4A75AB-E2D4-4C96-B39D-37BAF6B5B1DC&amp;displaylang=en}{here}
to avoid runtime conflicts.
+ If you are using a source code package of Qt, you must first install Perl so
+ that the syncqt script invoked by configure can be executed. You can download
+ this \l{http://www.activestate/downloads/}{here}.
+
To build Qt with Phonon on Windows, you require:
\list
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index be098bc..d0334f5 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -170,6 +170,6 @@
\o Drop support for Visual Studio 2003
\o Drop support for HP-UX on PA-RISC
\o Drop support for Windows Mobile 5
- \o Drop support for OpenGL ES Common Lite
+ \o Drop support for OpenGL ES Common Lite 1.0
\endlist
*/