From 32b7e01558e0d3c50dd10f846182fe5dc09686e9 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 6 Dec 2013 11:29:43 +0100 Subject: Clean up handling of illegal names and enable in new compiler Access to the identifier hash may not be thread-safe from the loader thread, so use a QSet copy instead (which is cheap because we don't detach). This also enables the checking for illegal types again. Change-Id: I8c3ec1fd0fc01cce3269e206f479a90bdbbc89dd Reviewed-by: Lars Knoll --- src/qml/qml/qqmlpropertycache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/qml/qqmlpropertycache.cpp') diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 6c40557886..d026b95201 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -1140,7 +1140,7 @@ QString QQmlPropertyCache::signalParameterStringForJS(QQmlEngine *engine, const { QQmlEnginePrivate *ep = QQmlEnginePrivate::get(engine); bool unnamedParameter = false; - const QV4::IdentifierHash &illegalNames = ep->v8engine()->illegalNames(); + const QSet &illegalNames = ep->v8engine()->illegalNames(); QString error; QString parameters; -- cgit v1.2.3