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 <aaron.kennedy@nokia.com>
sailfishos · Feb 13, 2012 · ab55e0d · ab55e0d
1 parent a60635a
commit ab55e0d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -78,7 +78,7 @@ class QDeclarativeComponentExtension : public QV8Engine::Deletable
     v8::Persistent<v8::Script> initialProperties;
     v8::Persistent<v8::Function> 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
@@ -113,7 +113,7 @@ public: \
 }
 
 #define V8_DEFINE_EXTENSION(dataclass, datafunction) \
-    inline dataclass *datafunction(QV8Engine *engine) \
+    static inline dataclass *datafunction(QV8Engine *engine) \
     { \
         static int extensionId = -1; \
         if (extensionId == -1) { \