From: Justin McPherson <justin.mcpherson@nokia.com>
Date: Fri, 10 Feb 2012 06:04:11 +0000 (+1000)
Subject: Change linkage of datafunction in V8_DEFINE_EXTENSION to static.
X-Git-Tag: qt-v5.0.0-alpha1~428
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ab55e0deeeffbf513b9fb6ce079c7b76b6c1ef4b;p=profile%2Fivi%2Fqtdeclarative.git

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>
---

diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 5bfa821..c168c8f 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -78,7 +78,7 @@ public:
     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
index ca70109..a39f673 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) { \