Merge commit 'qt/master'

Conflicts:
	doc/src/examples.qdoc
	doc/src/plugins-howto.qdoc
	doc/src/topics.qdoc
	examples/phonon/musicplayer/mainwindow.cpp
	src/3rdparty/freetype/src/base/ftobjs.c
	src/corelib/global/qglobal.h
	src/corelib/tools/qalgorithms.h
	src/corelib/tools/qshareddata.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/corelib/tools/tools.pri
	src/corelib/xml/qxmlstream.h
	src/gui/painting/painting.pri
	src/gui/widgets/qdatetimeedit.cpp
	tests/auto/qdesktopservices/qdesktopservices.pro
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
	tests/auto/qtextcodec/test/test.pro

4 files changed, 6 insertions, 7 deletions

diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp
index 51245c9..fda7cb4 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel.cpp
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel.cpp
@@ -190,8 +190,7 @@ bool QAbstractXmlNodeModel::isIgnorableInDeepEqual(const QXmlNodeModelIndex &n)
 
   Because the node model can be accessed concurrently by threads in
   the QtXmlPatterns module, subclasses of QAbstractXmlNodeModel must
-  be written to be \l{Thread Support in Qt#Reentrancy and Thread-Safety}
-  {thread-safe}.
+  be written to be \l{Reentrancy and Thread-Safety}{thread-safe}.
   Classes that simplify implementing thread-safety include QReadLocker
   and QWriteLocker.
 
diff --git a/src/xmlpatterns/api/qxmlquery.cpp b/src/xmlpatterns/api/qxmlquery.cpp
index b5b5244..9f9b136 100644
--- a/src/xmlpatterns/api/qxmlquery.cpp
+++ b/src/xmlpatterns/api/qxmlquery.cpp
@@ -151,7 +151,7 @@ QT_BEGIN_NAMESPACE
   \endcode
 
   \note For the current release, XSLT support should be considered
-        experimental. See section \l{QtXmlPatterns Module#XSLT
+        experimental. See section \l{Using XML technologies#XSLT
         2.0}{XSLT conformance} for details.
 
   Stylesheet parameters are bound using bindVariable().
@@ -291,7 +291,7 @@ QXmlQuery::QXmlQuery(const QXmlNamePool &np) : d(new QXmlQueryPrivate(np))
   create instances of QXmlQuery for running XQueries.
 
   \note The XSL-T support in this release is considered experimental.
-  See the \l{QtXmlPatterns Module#XSLT 2.0}{XSLT conformance} for
+  See the \l{Using XML technologies#XSLT 2.0}{XSLT conformance} for
   details.
 
  \since 4.5
diff --git a/src/xmlpatterns/data/qatomicvalue.cpp b/src/xmlpatterns/data/qatomicvalue.cpp
index 24f1a01..8559c80 100644
--- a/src/xmlpatterns/data/qatomicvalue.cpp
+++ b/src/xmlpatterns/data/qatomicvalue.cpp
@@ -134,7 +134,7 @@ Item AtomicValue::toXDM(const QVariant &value)
     Q_ASSERT_X(value.isValid(), Q_FUNC_INFO,
                "QVariants sent to Patternist must be valid.");
 
-    switch(value.type())
+    switch(value.userType())
     {
         case QVariant::Char:
         /* Fallthrough. A single codepoint is a string in XQuery. */
@@ -166,6 +166,8 @@ Item AtomicValue::toXDM(const QVariant &value)
             return Date::fromDateTime(QDateTime(value.toDate(), QTime(), Qt::UTC));
         case QVariant::DateTime:
             return DateTime::fromDateTime(value.toDateTime());
+        case QMetaType::Float:
+            return Item(Double::fromValue(value.toFloat()));
         case QVariant::Double:
             return Item(Double::fromValue(value.toDouble()));
         default:
diff --git a/src/xmlpatterns/utils/qautoptr.cpp b/src/xmlpatterns/utils/qautoptr.cpp
index 619423b..5ab691d 100644
--- a/src/xmlpatterns/utils/qautoptr.cpp
+++ b/src/xmlpatterns/utils/qautoptr.cpp
@@ -44,7 +44,5 @@
   \brief A smart pointer very similar to std::auto_ptr.
   \internal
   \since 4.4
-  \ingroup misc
-
  */