diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-09 16:58:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-09 16:58:37 (GMT) |
| commit | ecf66e5825d186f57468c6bf682dce32c0cd96d7 (patch) | |
| tree | e945d43208b1e166b27772662f5542384b99c567 /src/xmlpatterns | |
| parent | e1b4ac7eec876d80dc2984f192baa6295b027793 (diff) | |
| parent | f38f61df31b708e1f4e50c5fdcc30099f9a1fe8f (diff) | |
| download | Qt-ecf66e5825d186f57468c6bf682dce32c0cd96d7.zip Qt-ecf66e5825d186f57468c6bf682dce32c0cd96d7.tar.gz Qt-ecf66e5825d186f57468c6bf682dce32c0cd96d7.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed..
fix a few mistakes in German translation
Fix Float Conversion in xmlpatterns
generate code which does not break QT_USE_FAST_CONCATENATION with old gcc
drastically improve load time of TS files
Diffstat (limited to 'src/xmlpatterns')
| -rw-r--r-- | src/xmlpatterns/data/qatomicvalue.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/xmlpatterns/data/qatomicvalue.cpp b/src/xmlpatterns/data/qatomicvalue.cpp index 6858e27..c4f3578 100644 --- a/src/xmlpatterns/data/qatomicvalue.cpp +++ b/src/xmlpatterns/data/qatomicvalue.cpp @@ -226,6 +226,8 @@ ItemType::Ptr AtomicValue::qtToXDMType(const QXmlItem &item) /* Fallthrough. */ case QVariant::Time: return BuiltinTypes::xsDateTime; + case QMetaType::Float: + return BuiltinTypes::xsFloat; case QVariant::Double: return BuiltinTypes::xsDouble; default: |