diff options
| author | Frank Meerkoetter <frank.meerkoetter@basyskom.com> | 2015-12-07 21:37:11 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-12-08 09:50:31 +0000 |
| commit | 35449832a4d184aa2de893380c3c6c7dadf173a7 (patch) | |
| tree | a44a75383b96267760c99f4ef7077650c8735dc2 /src/qml | |
| parent | 52954268e9202e33eb8c2db93a51d55a2596051b (diff) | |
Remove dead code
Fixes CID 154260. type is already checked above the return.
Change-Id: I8a8702462d74a60163ae415553fe03fb7dc268f4
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/compiler/qqmltypecompiler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp index cde7a2acb4..3ce3e04969 100644 --- a/src/qml/compiler/qqmltypecompiler.cpp +++ b/src/qml/compiler/qqmltypecompiler.cpp @@ -1244,7 +1244,7 @@ int QQmlEnumTypeResolver::evaluateEnum(const QString &scope, const QByteArray &e imports->resolveType(scope, &type, 0, 0, 0); if (!type) return -1; - return type ? type->enumValue(compiler->enginePrivate(), QHashedCStringRef(enumValue.constData(), enumValue.length()), ok) : -1; + return type->enumValue(compiler->enginePrivate(), QHashedCStringRef(enumValue.constData(), enumValue.length()), ok); } const QMetaObject *mo = StaticQtMetaObject::get(); |