diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-07-02 04:21:38 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-07-02 04:21:38 (GMT) |
| commit | e4e6b49f555eae41fac024c1b733736a28812e2e (patch) | |
| tree | 7a7774224081779ee222b0fce648701f0279547f /src/declarative/qml/qdeclarativecompiler.cpp | |
| parent | 00dedffa8ad1fdec14e9e0a9184f49343c42c846 (diff) | |
| download | Qt-e4e6b49f555eae41fac024c1b733736a28812e2e.zip Qt-e4e6b49f555eae41fac024c1b733736a28812e2e.tar.gz Qt-e4e6b49f555eae41fac024c1b733736a28812e2e.tar.bz2 | |
Make autotests work with qreal == float (in addition to double).
Task-number: QTBUG-11853
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 623e3df..e3ce70e 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -228,10 +228,10 @@ bool QDeclarativeCompiler::testLiteralAssignment(const QMetaProperty &prop, } break; case QMetaType::Float: - if (!v->value.isNumber()) COMPILE_EXCEPTION(v, tr("Invalid property assignment: float expected")); + if (!v->value.isNumber()) COMPILE_EXCEPTION(v, tr("Invalid property assignment: number expected")); break; case QVariant::Double: - if (!v->value.isNumber()) COMPILE_EXCEPTION(v, tr("Invalid property assignment: double expected")); + if (!v->value.isNumber()) COMPILE_EXCEPTION(v, tr("Invalid property assignment: number expected")); break; case QVariant::Color: { |