diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-08-22 17:17:57 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-08-22 17:17:57 +0200 |
| commit | f1aff1f2d495562460a87d351e62c06109045a3a (patch) | |
| tree | 93e4659421a3dc1fc664b539bf7e48ce28f64e84 /src/qml/jsruntime/qv4engine.cpp | |
| parent | 842ada7b04d68cd37df2556bf50b48d8a5f39ec4 (diff) | |
| parent | 46ed14da325c6c0382c0bc54cacc347d2d7f2b0a (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/new-backend
Change-Id: Iff06429f948ac6cdec77a9e5bb8c5375c56fe705
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 50c82e677a..f5effc8c3b 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -763,10 +763,10 @@ ReturnedValue ExecutionEngine::qmlSingletonWrapper(String *name) QQmlTypeNameCache::Result r = ctx->imports->query(name); Q_ASSERT(r.isValid()); - Q_ASSERT(r.type); - Q_ASSERT(r.type->isSingleton()); + Q_ASSERT(r.type.isValid()); + Q_ASSERT(r.type.isSingleton()); - QQmlType::SingletonInstanceInfo *siinfo = r.type->singletonInstanceInfo(); + QQmlType::SingletonInstanceInfo *siinfo = r.type.singletonInstanceInfo(); QQmlEngine *e = qmlEngine(); siinfo->init(e); |