Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts:
	configure.exe
	src/declarative/util/qdeclarativelistmodel.cpp
	tools/qml/qml.pro

2 files changed, 9 insertions, 1 deletions

diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index b23629d..3a9d4ea 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -290,6 +290,10 @@ and follow the instructions to install Qt. You can later run the \c{uninstall-qt
 script to uninstall the binary package. The script is located in /Developer/Tools and
 must be run as root.
 
+\note Do not run the iPhone simulator while installing Qt. The
+\l{http://openradar.appspot.com/7214991} 
+{iPhone simulator conflicts with the package installer}.
+
 The following instructions describe how to install Qt from the source package.
 
 \list 1
diff --git a/doc/src/sql-programming/sql-driver.qdoc b/doc/src/sql-programming/sql-driver.qdoc
index 1083c84..e26472e 100644
--- a/doc/src/sql-programming/sql-driver.qdoc
+++ b/doc/src/sql-programming/sql-driver.qdoc
@@ -74,7 +74,7 @@
     \row \o \link #QPSQL QPSQL\endlink \o PostgreSQL (versions 7.3 and above)
     \row \o \link #QSQLITE2 QSQLITE2\endlink \o SQLite version 2
     \row \o \link #QSQLITE QSQLITE\endlink \o SQLite version 3
-    \row \o \link #QTDS QTDS\endlink \o Sybase Adaptive Server
+    \row \o \link #QTDS QTDS\endlink \o Sybase Adaptive Server \note obsolete from Qt 4.7
     \endtable
 
     SQLite is the in-process database system with the best test coverage
@@ -445,6 +445,10 @@
 
     \target QTDS
     \section2 QTDS for Sybase Adaptive Server
+
+    \note TDS is no longer used by MS Sql Server, and is superceded by
+    \l{QODBC}{ODBC}. QTDS is obsolete from Qt 4.7.
+
     \section3 General Information about QTDS
 
     It is not possible to set the port with QSqlDatabase::setPort() due to limitations in the