Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/xmlpatterns/data/qatomicvalue.cpp

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information ([email protected])
     4** All rights reserved.
     5** Contact: Nokia Corporation ([email protected])
    56**
    67** This file is part of the QtXmlPatterns module of the Qt Toolkit.
     
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
     
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
     
    135135               "QVariants sent to Patternist must be valid.");
    136136
    137     switch(value.type())
     137    switch(value.ype())
    138138    {
    139139        case QVariant::Char:
     
    167167        case QVariant::DateTime:
    168168            return DateTime::fromDateTime(value.toDateTime());
     169
     170
    169171        case QVariant::Double:
    170172            return Item(Double::fromValue(value.toDouble()));
    171173        default:
    172174        {
    173             Q_ASSERT_X(false,
    174                        Q_FUNC_INFO,
    175                        qPrintable(QString::fromLatin1(
    176                            "QVariants of type %1 are not supported in "
    177                            "Patternist, see the documentation")
     175            if (value.userType() == qMetaTypeId<float>())
     176            {
     177                return Item(Float::fromValue(value.value<float>()));
     178            }
     179            else {
     180                Q_ASSERT_X(false,
     181                           Q_FUNC_INFO,
     182                           qPrintable(QString::fromLatin1(
     183                               "QVariants of type %1 are not supported in "
     184                               "Patternist, see the documentation")
    178185                                  .arg(QLatin1String(value.typeName()))));
    179             return AtomicValue::Ptr();
     186                return AtomicValue::Ptr();
     187            }
    180188        }
    181189    }
Note: See TracChangeset for help on using the changeset viewer.