diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2010-11-29 08:59:54 +0100 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2010-11-29 09:01:40 +0100 |
| commit | 055aa15fccc03c83f95d45a41e935bd7e08623c9 (patch) | |
| tree | d906cc3764b9a67403b9fe2070afd60c79b2eb67 /src/libs/qmljs | |
| parent | c173959f894d3d0709702f612218d7d3258bb788 (diff) | |
| download | qt-creator-055aa15fccc03c83f95d45a41e935bd7e08623c9.tar.gz | |
QmlJS: Remove overzealous 'undefined' check for enums.
The "value might be 'undefined'" warning triggered whenever the static
expression evaluator failed to produce a value. At the moment, it does
so for almost all non-trivial expressions.
The warning is now disabled.
Task-number: QTCREATORBUG-3208
Diffstat (limited to 'src/libs/qmljs')
| -rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index de741da537..52ccde81a7 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -109,10 +109,8 @@ public: if (!enumValue->keys().contains(valueName)) { _message.message = Check::tr("unknown value for enum"); } - } else if (_rhsValue->asUndefinedValue()) { - _message.kind = DiagnosticMessage::Warning; - _message.message = Check::tr("value might be 'undefined'"); - } else if (! _rhsValue->asStringValue() && ! _rhsValue->asNumberValue()) { + } else if (! _rhsValue->asStringValue() && ! _rhsValue->asNumberValue() + && ! _rhsValue->asUndefinedValue()) { _message.message = Check::tr("enum value is not a string or number"); } } else { |