diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-07-27 09:05:12 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-07-27 09:05:12 (GMT) |
| commit | 4519cfcf6dc4915f015e9b5f2d72ac35d0cee0bf (patch) | |
| tree | 9c85cf4369603ae9cb308f1329d7cd182bdaef48 /src/declarative/qml/qdeclarativestringconverters.cpp | |
| parent | 475a3c275ba173cb130a838b6053cb45d405887e (diff) | |
| download | Qt-4519cfcf6dc4915f015e9b5f2d72ac35d0cee0bf.zip Qt-4519cfcf6dc4915f015e9b5f2d72ac35d0cee0bf.tar.gz Qt-4519cfcf6dc4915f015e9b5f2d72ac35d0cee0bf.tar.bz2 | |
Fix QT_NO_DATESTRING
Merge-request: 730
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativestringconverters.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativestringconverters.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativestringconverters.cpp b/src/declarative/qml/qdeclarativestringconverters.cpp index 8bd2cf1..7534a2c 100644 --- a/src/declarative/qml/qdeclarativestringconverters.cpp +++ b/src/declarative/qml/qdeclarativestringconverters.cpp @@ -106,14 +106,14 @@ QVariant QDeclarativeStringConverters::variantFromString(const QString &s, int p return QVariant(uint(qRound(s.toDouble(ok)))); case QMetaType::QColor: return QVariant::fromValue(colorFromString(s, ok)); -#ifndef QT_NO_TEXTDATE +#ifndef QT_NO_DATESTRING case QMetaType::QDate: return QVariant::fromValue(dateFromString(s, ok)); case QMetaType::QTime: return QVariant::fromValue(timeFromString(s, ok)); case QMetaType::QDateTime: return QVariant::fromValue(dateTimeFromString(s, ok)); -#endif // QT_NO_TEXTDATE +#endif // QT_NO_DATESTRING case QMetaType::QPointF: return QVariant::fromValue(pointFFromString(s, ok)); case QMetaType::QPoint: @@ -152,7 +152,7 @@ QColor QDeclarativeStringConverters::colorFromString(const QString &s, bool *ok) } } -#ifndef QT_NO_TEXTDATE +#ifndef QT_NO_DATESTRING QDate QDeclarativeStringConverters::dateFromString(const QString &s, bool *ok) { QDate d = QDate::fromString(s, Qt::ISODate); @@ -173,7 +173,7 @@ QDateTime QDeclarativeStringConverters::dateTimeFromString(const QString &s, boo if (ok) *ok = d.isValid(); return d; } -#endif // QT_NO_TEXTDATE +#endif // QT_NO_DATESTRING //expects input of "x,y" QPointF QDeclarativeStringConverters::pointFFromString(const QString &s, bool *ok) |