diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-28 04:26:48 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-28 04:26:48 (GMT) |
commit | cfc536842a205a951457e2630b04de2262ffaa46 (patch) | |
tree | be69c9314fa5ec7bc992d8d9fece9aee2559c374 /src/declarative/qml/qmlstringconverters_p.h | |
parent | 56130de61b2e9e65d09ca4feef2749deea0bb4bb (diff) | |
download | Qt-cfc536842a205a951457e2630b04de2262ffaa46.zip Qt-cfc536842a205a951457e2630b04de2262ffaa46.tar.gz Qt-cfc536842a205a951457e2630b04de2262ffaa46.tar.bz2 |
Support builtin string converters in every context
QTBUG-6919
Diffstat (limited to 'src/declarative/qml/qmlstringconverters_p.h')
-rw-r--r-- | src/declarative/qml/qmlstringconverters_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlstringconverters_p.h b/src/declarative/qml/qmlstringconverters_p.h index 380a904..dfc59ce 100644 --- a/src/declarative/qml/qmlstringconverters_p.h +++ b/src/declarative/qml/qmlstringconverters_p.h @@ -70,11 +70,15 @@ QT_BEGIN_NAMESPACE namespace QmlStringConverters { QVariant Q_DECLARATIVE_EXPORT variantFromString(const QString &); + QVariant Q_DECLARATIVE_EXPORT variantFromString(const QString &, int preferredType, bool *ok = 0); + QColor Q_DECLARATIVE_EXPORT colorFromString(const QString &, bool *ok = 0); + QDate Q_DECLARATIVE_EXPORT dateFromString(const QString &, bool *ok = 0); + QTime Q_DECLARATIVE_EXPORT timeFromString(const QString &, bool *ok = 0); + QDateTime Q_DECLARATIVE_EXPORT dateTimeFromString(const QString &, bool *ok = 0); QPointF Q_DECLARATIVE_EXPORT pointFFromString(const QString &, bool *ok = 0); QSizeF Q_DECLARATIVE_EXPORT sizeFFromString(const QString &, bool *ok = 0); QRectF Q_DECLARATIVE_EXPORT rectFFromString(const QString &, bool *ok = 0); - bool Q_DECLARATIVE_EXPORT boolFromString(const QString &, bool *ok = 0); QVector3D Q_DECLARATIVE_EXPORT vector3DFromString(const QString &, bool *ok = 0); }; |