11 files changed, 15 insertions, 15 deletions
diff --git a/src/qtquick1/util/qdeclarativeanimation_p.h b/src/qtquick1/util/qdeclarativeanimation_p.h
index decb9a339a..57ba38e1d4 100644
--- a/src/qtquick1/util/qdeclarativeanimation_p.h
+++ b/src/qtquick1/util/qdeclarativeanimation_p.h
@@ -64,7 +64,7 @@ QT_MODULE(Declarative)
 class QDeclarativeItem;
 class QDeclarative1AbstractAnimationPrivate;
 class QDeclarative1AnimationGroup;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1AbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus
+class Q_QTQUICK1_EXPORT QDeclarative1AbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarative1AbstractAnimation)
@@ -166,7 +166,7 @@ protected:
 };
 
 class QDeclarative1ScriptActionPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1ScriptAction : public QDeclarative1AbstractAnimation
+class Q_QTQUICK1_EXPORT QDeclarative1ScriptAction : public QDeclarative1AbstractAnimation
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarative1ScriptAction)
diff --git a/src/qtquick1/util/qdeclarativeapplication_p.h b/src/qtquick1/util/qdeclarativeapplication_p.h
index 4a588c2940..d82578e490 100644
--- a/src/qtquick1/util/qdeclarativeapplication_p.h
+++ b/src/qtquick1/util/qdeclarativeapplication_p.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarative1ApplicationPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1Application : public QObject
+class Q_QTQUICK1_EXPORT QDeclarative1Application : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool active READ active NOTIFY activeChanged)
diff --git a/src/qtquick1/util/qdeclarativebehavior_p.h b/src/qtquick1/util/qdeclarativebehavior_p.h
index 76792bc438..cc026ef82d 100644
--- a/src/qtquick1/util/qdeclarativebehavior_p.h
+++ b/src/qtquick1/util/qdeclarativebehavior_p.h
@@ -57,7 +57,7 @@ QT_MODULE(Declarative)
 
 class QDeclarative1AbstractAnimation;
 class QDeclarative1BehaviorPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1Behavior : public QObject, public QDeclarativePropertyValueInterceptor
+class Q_QTQUICK1_EXPORT QDeclarative1Behavior : public QObject, public QDeclarativePropertyValueInterceptor
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarative1Behavior)
diff --git a/src/qtquick1/util/qdeclarativeopenmetaobject_p.h b/src/qtquick1/util/qdeclarativeopenmetaobject_p.h
index 3ee6230e71..5d63387de3 100644
--- a/src/qtquick1/util/qdeclarativeopenmetaobject_p.h
+++ b/src/qtquick1/util/qdeclarativeopenmetaobject_p.h
@@ -59,7 +59,7 @@ class QMetaPropertyBuilder;
 QT_MODULE(Declarative)
 
 class QDeclarative1OpenMetaObjectTypePrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1OpenMetaObjectType : public QDeclarativeRefCount
+class Q_QTQUICK1_EXPORT QDeclarative1OpenMetaObjectType : public QDeclarativeRefCount
 {
 public:
     QDeclarative1OpenMetaObjectType(const QMetaObject *base, QDeclarativeEngine *engine);
@@ -80,7 +80,7 @@ private:
 };
 
 class QDeclarative1OpenMetaObjectPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1OpenMetaObject : public QAbstractDynamicMetaObject
+class Q_QTQUICK1_EXPORT QDeclarative1OpenMetaObject : public QAbstractDynamicMetaObject
 {
 public:
     QDeclarative1OpenMetaObject(QObject *, bool = true);
diff --git a/src/qtquick1/util/qdeclarativepixmapcache_p.h b/src/qtquick1/util/qdeclarativepixmapcache_p.h
index f0a7770be0..9af156a05c 100644
--- a/src/qtquick1/util/qdeclarativepixmapcache_p.h
+++ b/src/qtquick1/util/qdeclarativepixmapcache_p.h
@@ -56,7 +56,7 @@ class QDeclarativeEngine;
 QT_MODULE(Declarative)
 
 class QDeclarative1PixmapData;
-class Q_DECLARATIVE_EXPORT QDeclarative1Pixmap
+class Q_QTQUICK1_EXPORT QDeclarative1Pixmap
 {
     Q_DECLARE_TR_FUNCTIONS(QDeclarative1Pixmap)
 public:
diff --git a/src/qtquick1/util/qdeclarativepropertychanges_p.h b/src/qtquick1/util/qdeclarativepropertychanges_p.h
index 30609d3c2d..b3aed087e3 100644
--- a/src/qtquick1/util/qdeclarativepropertychanges_p.h
+++ b/src/qtquick1/util/qdeclarativepropertychanges_p.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
     
 class QDeclarative1PropertyChangesPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1PropertyChanges : public QDeclarative1StateOperation
+class Q_QTQUICK1_EXPORT QDeclarative1PropertyChanges : public QDeclarative1StateOperation
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarative1PropertyChanges)
diff --git a/src/qtquick1/util/qdeclarativestate_p.h b/src/qtquick1/util/qdeclarativestate_p.h
index fcfa2efead..90a67e9f26 100644
--- a/src/qtquick1/util/qdeclarativestate_p.h
+++ b/src/qtquick1/util/qdeclarativestate_p.h
@@ -59,7 +59,7 @@ class QDeclarativeExpression;
 QT_MODULE(Declarative)
 
 class QDeclarative1ActionEvent;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1Action
+class Q_QTQUICK1_EXPORT QDeclarative1Action
 {
 public:
     QDeclarative1Action();
@@ -116,7 +116,7 @@ public:
 class QDeclarative1StateGroup;
 class QDeclarative1State;
 class QDeclarative1StateOperationPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarative1StateOperation : public QObject
+class Q_QTQUICK1_EXPORT QDeclarative1StateOperation : public QObject
 {
     Q_OBJECT
 public:
@@ -141,7 +141,7 @@ typedef QDeclarative1StateOperation::ActionList QDeclarative1StateActions;
 
 class QDeclarative1Transition;
 class QDeclarative1StatePrivate;
-class Q_DECLARATIVE_EXPORT QDeclarative1State : public QObject
+class Q_QTQUICK1_EXPORT QDeclarative1State : public QObject
 {
     Q_OBJECT
 
diff --git a/src/qtquick1/util/qdeclarativestategroup_p.h b/src/qtquick1/util/qdeclarativestategroup_p.h
index e7831d4cca..bef48f4993 100644
--- a/src/qtquick1/util/qdeclarativestategroup_p.h
+++ b/src/qtquick1/util/qdeclarativestategroup_p.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarative1StateGroupPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarative1StateGroup : public QObject, public QDeclarativeParserStatus
+class Q_QTQUICK1_EXPORT QDeclarative1StateGroup : public QObject, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QDeclarativeParserStatus)
diff --git a/src/qtquick1/util/qdeclarativetimer_p.h b/src/qtquick1/util/qdeclarativetimer_p.h
index 5465773280..c62de320b4 100644
--- a/src/qtquick1/util/qdeclarativetimer_p.h
+++ b/src/qtquick1/util/qdeclarativetimer_p.h
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarative1TimerPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1Timer : public QObject, public QDeclarativeParserStatus
+class Q_QTQUICK1_EXPORT QDeclarative1Timer : public QObject, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarative1Timer)
diff --git a/src/qtquick1/util/qdeclarativetransition_p.h b/src/qtquick1/util/qdeclarativetransition_p.h
index f3f7afae6d..90fc909cf5 100644
--- a/src/qtquick1/util/qdeclarativetransition_p.h
+++ b/src/qtquick1/util/qdeclarativetransition_p.h
@@ -57,7 +57,7 @@ QT_MODULE(Declarative)
 class QDeclarative1AbstractAnimation;
 class QDeclarative1TransitionPrivate;
 class QDeclarative1TransitionManager;
-class Q_DECLARATIVE_EXPORT QDeclarative1Transition : public QObject
+class Q_QTQUICK1_EXPORT QDeclarative1Transition : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarative1Transition)
diff --git a/src/qtquick1/util/qdeclarativeview.h b/src/qtquick1/util/qdeclarativeview.h
index b655d2830f..96cb4ed2f6 100644
--- a/src/qtquick1/util/qdeclarativeview.h
+++ b/src/qtquick1/util/qdeclarativeview.h
@@ -60,7 +60,7 @@ class QDeclarativeError;
 QT_MODULE(Declarative)
 
 class QDeclarativeViewPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeView : public QGraphicsView
+class Q_QTQUICK1_EXPORT QDeclarativeView : public QGraphicsView
 {
     Q_OBJECT
     Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)