diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-08 03:18:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-08 03:18:52 (GMT) |
| commit | d1e3f6dffbd9b28027d1b776e4763dc46d058841 (patch) | |
| tree | 4fab58762ad5dfe20038eafb8f6a518936ba6d17 | |
| parent | b7e08e88b52f009cbbf3caed56cb8f507feeb3bb (diff) | |
| parent | 1a705e2c588f19ecf9a078d03a906da683378aec (diff) | |
| download | Qt-d1e3f6dffbd9b28027d1b776e4763dc46d058841.zip Qt-d1e3f6dffbd9b28027d1b776e4763dc46d058841.tar.gz Qt-d1e3f6dffbd9b28027d1b776e4763dc46d058841.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: added part of Andy's update.
Fix the tablet device recognition on Windows
Fix S60 input method not showing up in editable QGraphicsTextItems
| -rw-r--r-- | doc/src/getting-started/installation.qdoc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc index 057629d..a1917ff 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&displaylang=en}{here} to avoid runtime conflicts. + If you are using a source edition 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.com/downloads/}{here}. + To build Qt with Phonon on Windows, you require: \list |