diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-05-25 18:32:11 (GMT) |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-05-25 18:32:11 (GMT) |
| commit | 5c8017e0880cc5f71854ebb71a38b944e58260b1 (patch) | |
| tree | 246e556496f19077d71aea6dad1af7883f4db385 /src/declarative/qml/qdeclarativecompiler.cpp | |
| parent | 99f6250a4ac031b70757442715b226bc339ab699 (diff) | |
| download | Qt-5c8017e0880cc5f71854ebb71a38b944e58260b1.zip Qt-5c8017e0880cc5f71854ebb71a38b944e58260b1.tar.gz Qt-5c8017e0880cc5f71854ebb71a38b944e58260b1.tar.bz2 | |
Fix QT_NO_TEXTDATE
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index b5bf972..b74d640 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -240,6 +240,7 @@ bool QDeclarativeCompiler::testLiteralAssignment(const QMetaProperty &prop, if (!ok) COMPILE_EXCEPTION(v, tr("Invalid property assignment: color expected")); } break; +#ifndef QT_NO_TEXTDATE case QVariant::Date: { bool ok; @@ -261,6 +262,7 @@ bool QDeclarativeCompiler::testLiteralAssignment(const QMetaProperty &prop, if (!ok) COMPILE_EXCEPTION(v, tr("Invalid property assignment: datetime expected")); } break; +#endif // QT_NO_TEXTDATE case QVariant::Point: case QVariant::PointF: { @@ -414,6 +416,7 @@ void QDeclarativeCompiler::genLiteralAssignment(const QMetaProperty &prop, instr.storeColor.value = c.rgba(); } break; +#ifndef QT_NO_TEXTDATE case QVariant::Date: { QDate d = QDeclarativeStringConverters::dateFromString(string); @@ -447,6 +450,7 @@ void QDeclarativeCompiler::genLiteralAssignment(const QMetaProperty &prop, instr.storeDateTime.valueIndex = index; } break; +#endif // QT_NO_TEXTDATE case QVariant::Point: case QVariant::PointF: { |