Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv

Conflicts:
	src/declarative/fx/qfxitem.h
	src/declarative/util/qfxview.h
	src/gui/graphicsview/qgraphicsitem_p.h

6 files changed, 79 insertions, 71 deletions

diff --git a/doc/src/deployment.qdoc b/doc/src/deployment.qdoc
index 0866930..1da2c06 100644
--- a/doc/src/deployment.qdoc
+++ b/doc/src/deployment.qdoc
@@ -715,17 +715,19 @@
 
     \table 100%
     \header
-        \o \o VC++ 6.0 \o VC++ 7.1 (2003) \o VC++ 8.0 (2005)
+        \o \o VC++ 6.0 \o VC++ 7.1 (2003) \o VC++ 8.0 (2005) \o VC++ 9.0 (2008)
     \row
         \o The C run-time
         \o \c msvcrt.dll
         \o \c msvcr71.dll
         \o \c msvcr80.dll
+        \o \c msvcr90.dll
     \row
         \o The C++ run-time
         \o \c msvcp60.dll
         \o \c msvcp71.dll
         \o \c msvcp80.dll
+        \o \c msvcp90.dll
     \endtable
 
     To verify that the application now can be successfully deployed,
@@ -893,7 +895,7 @@
 
     \o \l{qt-conf.html}{Using \c qt.conf}. This approach is the recommended 
     if you have executables in different places sharing the same plugins.
-    
+
     \o Using QApplication::addLibraryPath() or
     QApplication::setLibraryPaths(). This approach is recommended if you only 
     have one executable that will use the plugin. 
@@ -902,10 +904,10 @@
     hard-coded paths in the QtCore library.
 
     \endlist
-    
+
     If you add a custom path using QApplication::addLibraryPath it could 
     look like this:
-    
+
     \snippet doc/src/snippets/code/doc_src_deployment.qdoc 54
 
     Then qApp->libraryPaths() would return something like this:
diff --git a/doc/src/properties.qdoc b/doc/src/properties.qdoc
index 1aa41a9..b7f773a 100644
--- a/doc/src/properties.qdoc
+++ b/doc/src/properties.qdoc
@@ -128,6 +128,11 @@
     constant value may be different for different instances of the object.  A
     constant property cannot have a \c WRITE method or a \c NOTIFY signal.
 
+    \o The presence of the \c FINAL attribute indicates that the property
+    will not be overridden by a derived class.  This can be used for performance
+    optimizations in some cases, but is not enforced by moc.  Care must be taken
+    never to override a \c FINAL property.
+
     \endlist
 
     The \c READ, \c WRITE, and \c RESET functions can be inherited.
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc
index b691ac7..ded1577 100644
--- a/doc/src/qnamespace.qdoc
+++ b/doc/src/qnamespace.qdoc
@@ -41,6 +41,7 @@
 
 /*!
     \namespace Qt
+    \inmodule QtCore
 
     \brief The Qt namespace contains miscellaneous identifiers
     used throughout the Qt library.
@@ -1246,8 +1247,9 @@
 /*! \typedef Qt::HANDLE
 
     Platform-specific handle type for system objects. This is
-    equivalent to \c{void *} on Windows and Mac OS X, and embedded
-    Linux, and to \c{unsigned long} on X11.
+    equivalent to \c{void *} on Mac OS X and embedded Linux, 
+    and to \c{unsigned long} on X11. On Windows it is the
+    DWORD returned by the Win32 function getCurrentThreadId().
 
     \warning Using this type is not portable.
 */
diff --git a/doc/src/qsql.qdoc b/doc/src/qsql.qdoc
index 5315413..bb8f090 100644
--- a/doc/src/qsql.qdoc
+++ b/doc/src/qsql.qdoc
@@ -41,12 +41,13 @@
 
 /*!
     \namespace QSql
+    \inmodule QtSql
     \brief The QSql namespace contains miscellaneous identifiers used throughout
     the Qt SQL library.
 
+    \inheaderfile QtSql
     \ingroup database
     \mainclass
-    \omit ### \module sql \endomit
 
     \sa {QtSql Module}
 */
diff --git a/doc/src/qsqldatatype-table.qdoc b/doc/src/qsqldatatype-table.qdoc
index 5ab6413..567bb65 100644
--- a/doc/src/qsqldatatype-table.qdoc
+++ b/doc/src/qsqldatatype-table.qdoc
@@ -40,30 +40,28 @@
 ****************************************************************************/
 
 /*!
-  \module QtSql
-  
-  \page qsqldatatype-table.html
-  
-  \title QtSql Module - Recommended use of data types
+  \page sql-types.html
+  \title QtSql Module - Recommended Use of Data Types
 
-  \section1 Recommended use of types and widgets in Qt supported Databases
+  \section1 Recommended Use of Types in Qt Supported Databases
 
   This table shows the recommended data types used when extracting data 
   from the databases supported in Qt. It is important to note that the
-  types used in Qt not necessary are valid as input to the specific
-  database. One example could be that a double would work perfect as
-  input for floating point records in a database, but not necessary
-  as output to the database since it would be stored with 64-bit in C++.
+  types used in Qt are not necessarily valid as input to the specific
+  database. One example could be that a double would work perfectly as
+  input for floating point records in a database, but not necessarily
+  as a storage format for output from the database since it would be stored
+  with 64-bit precision in C++.
 
   \tableofcontents
 
-  \section2 IBM DB2 data type
+  \section2 IBM DB2 Data Types
 
-  \table
-    \row
-        \header IBM DB2 data type
-        \header SQL Type Description
-        \header Recommended input (C++ data type and Qt )
+  \table 90%
+    \header
+        \o IBM DB2 data type
+        \o SQL type description
+        \o Recommended input (C++ or Qt data type)
     \row
         \o SMALLINT
         \o 16-bit signed integer
@@ -124,13 +122,13 @@
         \o Mapped to QDateTime
   \endtable
 
-  \section2 Borland InterBase data type
+  \section2 Borland InterBase Data Types
 
-  \table
-    \row
-        \header Borland InterBase data type
-        \header SQL Type Description
-        \header Recommended input (C++ data type/Qt Widget)
+  \table 90%
+    \header
+        \o Borland InterBase data type
+        \o SQL type description
+        \o Recommended input (C++ or Qt data type)
     \row
         \o BOOLEAN
         \o Boolean
@@ -189,13 +187,13 @@
         \o Mapped to QDateTime
   \endtable
 
-  \section2 MySQL data type
+  \section2 MySQL Data Types
 
-  \table
-    \row
-        \header MySQL data type
-        \header SQL Type Description
-        \header Recommended input (C++ data type/Qt Widget)
+  \table 90%
+    \header
+        \o MySQL data type
+        \o SQL type description
+        \o Recommended input (C++ or Qt data type)
     \row
         \o TINYINT
         \o 8 bit signed integer
@@ -290,13 +288,13 @@
         \o Mapped to QString
   \endtable
 
-  \section2 Oracle Call Interface data type
+  \section2 Oracle Call Interface Data Types
 
-  \table
-    \row
-        \header Oracle Call Interface data type
-        \header SQL Type Description
-        \header Recommended input (C++ data type/Qt Widget)
+  \table 90%
+    \header
+        \o Oracle Call Interface data type
+        \o SQL type description
+        \o Recommended input (C++ or Qt data type)
     \row
         \o NUMBER
         \o FLOAT, DOUBLE, PRECISIONc REAL
@@ -338,13 +336,13 @@
         \o Mapped to QDateTime
   \endtable
 
-  \section2 ODBC data type
+  \section2 ODBC Data Types
 
-  \table
-    \row
-        \header ODBC data type
-        \header SQL Type Description
-        \header Recommended input (C++ data type/Qt Widget)
+  \table 90%
+    \header
+        \o ODBC data type
+        \o SQL type description
+        \o Recommended input (C++ or Qt data type)
     \row
         \o BIT
         \o Boolean
@@ -407,13 +405,13 @@
         \o Mapped to QDateTime
   \endtable
 
-  \section2 PostgreSQL data type
+  \section2 PostgreSQL Data Types
 
-  \table
-    \row
-        \header PostgreSQL data type
-        \header SQL Type Description
-        \header Recommended input (C++ data type/Qt Widget)
+  \table 90%
+    \header
+        \o PostgreSQL data type
+        \o SQL type description
+        \o Recommended input (C++ or Qt data type)
     \row
         \o BOOLEAN
         \o Boolean
@@ -484,13 +482,13 @@
         \o Mapped to QDateTime
   \endtable
 
-  \section2 QSQLITE SQLite version 3 data type
+  \section2 QSQLITE SQLite version 3 Data Types
 
-  \table
-    \row
-        \header QSQLITE SQLite version 3 data type
-        \header SQL Type Description
-        \header Recommended input (C++ data type/Qt Widget)
+  \table 90%
+    \header
+        \o QSQLITE SQLite version 3 data type
+        \o SQL type description
+        \o Recommended input (C++ or Qt data type)
     \row
         \o NULL
         \o NULL value.
@@ -518,13 +516,13 @@
         \o Mapped to QByteArray
   \endtable
 
-  \section2 Sybase Adaptive Server data type
+  \section2 Sybase Adaptive Server Data Types
 
-  \table
-    \row
-        \header Sybase Adaptive Server data type
-        \header SQL Type Description
-        \header Recommended input (C++ data type/Qt Widget)
+  \table 90%
+    \header
+        \o Sybase Adaptive Server data type
+        \o SQL type description
+        \o Recommended input (C++ or Qt data type)
     \row
         \o BINARY
         \o Describes a fixed-length binary value up to 255 bytes in size.
@@ -535,8 +533,7 @@
         \o Mapped to QString
     \row
         \o DATETIME
-        \o Date and time. Range: 1753-01-01 00:00:00 through 
-        9999-12-31 23:59:59.
+        \o Date and time. Range: 1753-01-01 00:00:00 through 9999-12-31 23:59:59.
         \o Mapped to QDateTime
     \row
         \o NCHAR
@@ -577,8 +574,8 @@
   \endtable
 
   \section2 SQLite Version 2
-    SQLite V.2 is "typeless". This means that you can store any kind of
-    data you want in any column of any table, regardless of the declared
-    data type of that column. We recommend that you map the data to QString.
 
+  SQLite version 2 is "typeless". This means that you can store any kind of
+  data you want in any column of any table, regardless of the declared
+  data type of that column. We recommend that you map the data to QString.
 */
diff --git a/doc/src/snippets/code/doc_src_properties.qdoc b/doc/src/snippets/code/doc_src_properties.qdoc
index 64e5377..3c9109f 100644
--- a/doc/src/snippets/code/doc_src_properties.qdoc
+++ b/doc/src/snippets/code/doc_src_properties.qdoc
@@ -8,7 +8,8 @@ Q_PROPERTY(type name
            [SCRIPTABLE bool]
            [STORED bool]
 	   [USER bool]
-           [CONSTANT])
+           [CONSTANT]
+           [FINAL])
 //! [0]