diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2010-05-31 13:21:59 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2010-05-31 13:24:53 (GMT) |
| commit | b4710dd7ddb2a78754cbe58e55070f71456fb09c (patch) | |
| tree | 9e937cd7c27c9780a4cd5edadef2655cf3d77f4d /src/declarative/qml/qdeclarativecompiler.cpp | |
| parent | 77474ad850b91e1de080d2f8fb9a60af2f89668f (diff) | |
| parent | 5c8017e0880cc5f71854ebb71a38b944e58260b1 (diff) | |
| download | Qt-b4710dd7ddb2a78754cbe58e55070f71456fb09c.zip Qt-b4710dd7ddb2a78754cbe58e55070f71456fb09c.tar.gz Qt-b4710dd7ddb2a78754cbe58e55070f71456fb09c.tar.bz2 | |
Fix QT_NO_TEXTDATE compilation errors.
Merge-request: 649
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
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 d27aced..80a1093 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: { |