aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2012-02-10 16:04:11 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-13 02:58:23 +0100
commitab55e0deeeffbf513b9fb6ce079c7b76b6c1ef4b (patch)
treeff9b5ce3d6aa06eeb40f3a315fe80cd69f01b513 /src/declarative
parenta60635a3cf5d054f0675d31aab4153f16d78324f (diff)
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>
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/qml/qdeclarativecomponent.cpp2
-rw-r--r--src/declarative/qml/v8/qv8engine_p.h2
2 files changed, 2 insertions, 2 deletions
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<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 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) { \