From: Lars Knoll <lars.knoll@nokia.com>
Date: Mon, 8 Aug 2011 13:38:21 +0000 (+0200)
Subject: Use the correct export macros
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=313ebbea192dae510db59b506e98b88734f3885b;p=konrad%2Fqtdeclarative.git

Use the correct export macros

Otherwise we'll get problems when compiling
on Windows.

Change-Id: I2a366da3cd4cd08ba8bc8d9c8c81409737bee697
Reviewed-on: http://codereview.qt.nokia.com/2752
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
---

diff --git a/src/declarative/qml/v8/qjsengine.h b/src/declarative/qml/v8/qjsengine.h
index 5109cef..759363a 100644
--- a/src/declarative/qml/v8/qjsengine.h
+++ b/src/declarative/qml/v8/qjsengine.h
@@ -35,7 +35,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Script)
+QT_MODULE(Declarative)
 
 class QDateTime;
 class QV8Engine;
@@ -45,7 +45,7 @@ class QRegExp;
 template <typename T>
 inline T qjsvalue_cast(const QJSValue &);
 
-class Q_SCRIPT_EXPORT QJSEngine
+class Q_DECLARATIVE_EXPORT QJSEngine
     : public QObject
 {
     Q_OBJECT
diff --git a/src/declarative/qml/v8/qjsvalue.h b/src/declarative/qml/v8/qjsvalue.h
index 07276bc..8b78add 100644
--- a/src/declarative/qml/v8/qjsvalue.h
+++ b/src/declarative/qml/v8/qjsvalue.h
@@ -34,7 +34,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Script)
+QT_MODULE(Declarative)
 
 class QJSValue;
 class QJSEngine;
@@ -50,7 +50,7 @@ class QJSValuePrivate;
 struct QScriptValuePrivatePointerDeleter;
 template <class T> class QScriptPassPointer;
 
-class Q_SCRIPT_EXPORT QJSValue
+class Q_DECLARATIVE_EXPORT QJSValue
 {
 public:
     enum PropertyFlag {
diff --git a/src/declarative/qml/v8/qjsvalueiterator.h b/src/declarative/qml/v8/qjsvalueiterator.h
index 1ec4d4b..575421d 100644
--- a/src/declarative/qml/v8/qjsvalueiterator.h
+++ b/src/declarative/qml/v8/qjsvalueiterator.h
@@ -31,12 +31,12 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Script)
+QT_MODULE(Declarative)
 
 class QString;
 
 class QJSValueIteratorPrivate;
-class Q_SCRIPT_EXPORT QJSValueIterator
+class Q_DECLARATIVE_EXPORT QJSValueIterator
 {
 public:
     QJSValueIterator(const QJSValue &value);