From ab55e0deeeffbf513b9fb6ce079c7b76b6c1ef4b Mon Sep 17 00:00:00 2001 From: Justin McPherson Date: Fri, 10 Feb 2012 16:04:11 +1000 Subject: Change linkage of datafunction in V8_DEFINE_EXTENSION to static. Stops interaction with items of the same name elsewhere. Change-Id: I37ffdc8253d76247f03bd593785a35069636eba8 Reviewed-by: Aaron Kennedy --- src/declarative/qml/qdeclarativecomponent.cpp | 2 +- src/declarative/qml/v8/qv8engine_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/declarative') diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index 5bfa821462..c168c8f4eb 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -78,7 +78,7 @@ public: v8::Persistent initialProperties; v8::Persistent forceCompletion; }; -static V8_DEFINE_EXTENSION(QDeclarativeComponentExtension, componentExtension); +V8_DEFINE_EXTENSION(QDeclarativeComponentExtension, componentExtension); /* Try to do what's necessary for a reasonable display of the type diff --git a/src/declarative/qml/v8/qv8engine_p.h b/src/declarative/qml/v8/qv8engine_p.h index ca701090d8..a39f673adc 100644 --- a/src/declarative/qml/v8/qv8engine_p.h +++ b/src/declarative/qml/v8/qv8engine_p.h @@ -113,7 +113,7 @@ private: } #define V8_DEFINE_EXTENSION(dataclass, datafunction) \ - inline dataclass *datafunction(QV8Engine *engine) \ + static inline dataclass *datafunction(QV8Engine *engine) \ { \ static int extensionId = -1; \ if (extensionId == -1) { \ -- cgit v1.2.3