Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (25 commits)
  qdoc3: Updates to qdoc to print error message in ALL CAPS
  Doc: Added a note to Code Editor example docs
  Doc: QItemDelegate->QStyledItemDelegate in Star Delegate docs
  Doc: Added a link in Symbian Intro to Required Capabilities
  Doc: Added info on ordered targets for VS to qmake manual
  Doc: Small addition to the QML anchor layout docs
  Doc: Internalized QDeclarativeTypeLoader
  Doc: Said that QIODevice::isSequential returns false by default
  Doc: Said that QList::clear deallocates memory
  Doc: Updated platform notes for MultiMedia and Phonon
  Doc: Added links to the plugin deployment guide.
  Doc: Fix doc bug in QMouseEvent
  Doc: Fixed doc bug in QMetaObject
  Doc: Fixed date format doc bug in QDateTime/Qt namespace
  Doc: Removed internal Phonon classes from doce
  qdoc3: Updates for QTBUG-20776; include fileToOpen path.
  qdoc3: Updates for QTBUG-20776; clear map between runs.
  qdoc3: Updates for QTBUG-20739 (no read-only for QML components)
  qdoc3: Updates for QTBUG-20776 and QTBUG-20777
  qdoc: Check pointer for null before dereferencing.
  ...

1 files changed, 23 insertions, 0 deletions

diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 2c7fda2..0f85469 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -3263,6 +3263,29 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.pro 150
 
+    \section2 Ordered Targets and Visual Studio Solution Files
+
+    The \c ordered option is not supported for Visual Studio. The following list describes how
+    you can get around without it--dependencies are generated automatically if:
+
+    \list
+        \o 1a) There is a Lib/DLL project of which TARGET (the .lib is used and not the .dll)
+        is used on the link line of another project in your solution (you can modify the link
+        line with LIBS).
+
+        \o 1b) There is an Exe project of which TARGET is used in a custom
+        build-step of another project in your solution.
+
+        \o 2) You don't use paths in the TARGET variable (use DESTDIR/DLLDESTDIR for that),
+        e.g, TARGET=$(SOME_VARIABLE)/myLib, won't work.
+
+        \o 3) If you have a special location for your libs, you specify the -Lmy/library/path and
+        LIBS += mylib, instead of just using LIBS += my/library/path/mylib
+
+        \o 4) The leaf projects are created before you generate the solution file. (You can use the
+        recursive flag for qmake to do this, like "qmake -tp vc -r [yourproject.pro]" 
+    \endlist
+
     \target SYMBIAN_VERSION
     \section1 SYMBIAN_VERSION