Define Q_QUICK1_EXPORT independently

Define Q_QUICK1_EXPORT and Q_QUICK1_PRIVATE_EXPORT inside the
qtquick1 module rather than using the definition in qtbase.

This change undefines the definitions from qglobal.h; the undef
should be removed once the definitions have been expunged from
qtbase itself.

Change-Id: I1ee6fa1e513d110d9a298d897a8d3d465290e9ce
Reviewed-by: Martin Jones <martin.jones@nokia.com>

28 files changed, 81 insertions, 79 deletions

diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
index c6be75f1..643c33a8 100644
--- a/src/declarative/qml/qdeclarative.h
+++ b/src/declarative/qml/qdeclarative.h
@@ -392,11 +392,11 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor,
 
 class QDeclarativeContext;
 class QDeclarativeEngine;
-Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *);
-Q_DECLARATIVE_EXPORT QDeclarativeContext *qmlContext(const QObject *);
-Q_DECLARATIVE_EXPORT QDeclarativeEngine *qmlEngine(const QObject *);
-Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true);
-Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create);
+Q_QUICK1_EXPORT void qmlExecuteDeferred(QObject *);
+Q_QUICK1_EXPORT QDeclarativeContext *qmlContext(const QObject *);
+Q_QUICK1_EXPORT QDeclarativeEngine *qmlEngine(const QObject *);
+Q_QUICK1_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true);
+Q_QUICK1_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create);
 
 template<typename T>
 QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true)
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index b7c1757e..cdd0719f 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -64,7 +64,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAbstractBinding
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAbstractBinding
 {
 public:
     typedef QWeakPointer<QDeclarativeAbstractBinding> Pointer;
@@ -143,7 +143,7 @@ private:
 
 class QDeclarativeContext;
 class QDeclarativeBindingPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBinding : public QDeclarativeExpression, public QDeclarativeAbstractBinding
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeBinding : public QDeclarativeExpression, public QDeclarativeAbstractBinding
 {
 Q_OBJECT
 public:
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index 681bc6b5..454ae71d 100644
--- a/src/declarative/qml/qdeclarativecomponent.h
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -60,7 +60,7 @@ class QByteArray;
 class QDeclarativeComponentPrivate;
 class QDeclarativeEngine;
 class QDeclarativeComponentAttached;
-class Q_DECLARATIVE_EXPORT QDeclarativeComponent : public QObject
+class Q_QUICK1_EXPORT QDeclarativeComponent : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativeComponent)
diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h
index e71e3c05..233906ed 100644
--- a/src/declarative/qml/qdeclarativecontext.h
+++ b/src/declarative/qml/qdeclarativecontext.h
@@ -42,6 +42,7 @@
 #ifndef QDECLARATIVECONTEXT_H
 #define QDECLARATIVECONTEXT_H
 
+#include <QtQuick1/qtquick1global.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qobject.h>
 #include <QtScript/qscriptvalue.h>
@@ -61,7 +62,7 @@ class QDeclarativeContextPrivate;
 class QDeclarativeCompositeTypeData;
 class QDeclarativeContextData;
 
-class Q_DECLARATIVE_EXPORT QDeclarativeContext : public QObject
+class Q_QUICK1_EXPORT QDeclarativeContext : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QDeclarativeContext)
diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h
index c80bc7e2..39a1d48d 100644
--- a/src/declarative/qml/qdeclarativecustomparser_p.h
+++ b/src/declarative/qml/qdeclarativecustomparser_p.h
@@ -70,7 +70,7 @@ QT_MODULE(Declarative)
 class QDeclarativeCompiler;
 
 class QDeclarativeCustomParserPropertyPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeCustomParserProperty
+class Q_QUICK1_EXPORT QDeclarativeCustomParserProperty
 {
 public:
     QDeclarativeCustomParserProperty();
@@ -93,7 +93,7 @@ private:
 };
 
 class QDeclarativeCustomParserNodePrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeCustomParserNode
+class Q_QUICK1_EXPORT QDeclarativeCustomParserNode
 {
 public:
     QDeclarativeCustomParserNode();
@@ -111,7 +111,7 @@ private:
     QDeclarativeCustomParserNodePrivate *d;
 };
 
-class Q_DECLARATIVE_EXPORT QDeclarativeCustomParser
+class Q_QUICK1_EXPORT QDeclarativeCustomParser
 {
 public:
     enum Flag {
diff --git a/src/declarative/qml/qdeclarativedom_p.h b/src/declarative/qml/qdeclarativedom_p.h
index 66db37b0..e465a871 100644
--- a/src/declarative/qml/qdeclarativedom_p.h
+++ b/src/declarative/qml/qdeclarativedom_p.h
@@ -58,7 +58,7 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qshareddata.h>
 
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qtquick1global_p.h>
 
 QT_BEGIN_HEADER
 
@@ -78,7 +78,7 @@ class QIODevice;
 
 class QDeclarativeDomDocumentPrivate;
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomDocument
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomDocument
 {
 public:
     QDeclarativeDomDocument();
@@ -98,7 +98,7 @@ private:
 };
 
 class QDeclarativeDomPropertyPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomProperty
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomProperty
 {
 public:
     QDeclarativeDomProperty();
@@ -125,7 +125,7 @@ private:
 };
 
 class QDeclarativeDomDynamicPropertyPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomDynamicProperty
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomDynamicProperty
 {
 public:
     QDeclarativeDomDynamicProperty();
@@ -153,7 +153,7 @@ private:
 };
 
 class QDeclarativeDomObjectPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomObject
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomObject
 {
 public:
     QDeclarativeDomObject();
@@ -198,7 +198,7 @@ private:
 
 class QDeclarativeDomValuePrivate;
 class QDeclarativeDomBasicValuePrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValueLiteral
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValueLiteral
 {
 public:
     QDeclarativeDomValueLiteral();
@@ -213,7 +213,7 @@ private:
     QSharedDataPointer<QDeclarativeDomBasicValuePrivate> d;
 };
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValueBinding
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValueBinding
 {
 public:
     QDeclarativeDomValueBinding();
@@ -228,7 +228,7 @@ private:
     QSharedDataPointer<QDeclarativeDomBasicValuePrivate> d;
 };
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValueValueSource
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValueValueSource
 {
 public:
     QDeclarativeDomValueValueSource();
@@ -243,7 +243,7 @@ private:
     QSharedDataPointer<QDeclarativeDomBasicValuePrivate> d;
 };
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValueValueInterceptor
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValueValueInterceptor
 {
 public:
     QDeclarativeDomValueValueInterceptor();
@@ -259,7 +259,7 @@ private:
 };
 
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomComponent : public QDeclarativeDomObject
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomComponent : public QDeclarativeDomObject
 {
 public:
     QDeclarativeDomComponent();
@@ -270,7 +270,7 @@ public:
     QDeclarativeDomObject componentRoot() const;
 };
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomValue
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomValue
 {
 public:
     enum Type { 
@@ -314,7 +314,7 @@ private:
     QSharedDataPointer<QDeclarativeDomValuePrivate> d;
 };
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomList
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomList
 {
 public:
     QDeclarativeDomList();
@@ -335,7 +335,7 @@ private:
 };
 
 class QDeclarativeDomImportPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDomImport
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeDomImport
 {
 public:
     enum Type { Library, File };
diff --git a/src/declarative/qml/qdeclarativeengine.h b/src/declarative/qml/qdeclarativeengine.h
index b9a00e85..19a1f821 100644
--- a/src/declarative/qml/qdeclarativeengine.h
+++ b/src/declarative/qml/qdeclarativeengine.h
@@ -67,7 +67,7 @@ class QScriptContext;
 class QDeclarativeImageProvider;
 class QNetworkAccessManager;
 class QDeclarativeNetworkAccessManagerFactory;
-class Q_DECLARATIVE_EXPORT QDeclarativeEngine : public QObject
+class Q_QUICK1_EXPORT QDeclarativeEngine : public QObject
 {
     Q_PROPERTY(QString offlineStoragePath READ offlineStoragePath WRITE setOfflineStoragePath)
     Q_OBJECT
diff --git a/src/declarative/qml/qdeclarativeerror.h b/src/declarative/qml/qdeclarativeerror.h
index b5581ec4..07618432 100644
--- a/src/declarative/qml/qdeclarativeerror.h
+++ b/src/declarative/qml/qdeclarativeerror.h
@@ -42,6 +42,7 @@
 #ifndef QDECLARATIVEERROR_H
 #define QDECLARATIVEERROR_H
 
+#include <QtQuick1/qtquick1global.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qstring.h>
 
@@ -53,7 +54,7 @@ QT_MODULE(Declarative)
 
 class QDebug;
 class QDeclarativeErrorPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeError
+class Q_QUICK1_EXPORT QDeclarativeError
 {
 public:
     QDeclarativeError();
@@ -77,7 +78,7 @@ private:
     QDeclarativeErrorPrivate *d;
 };
 
-QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, const QDeclarativeError &error);
+QDebug Q_QUICK1_EXPORT operator<<(QDebug debug, const QDeclarativeError &error);
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h
index 2a6825d1..a99b0ebb 100644
--- a/src/declarative/qml/qdeclarativeexpression.h
+++ b/src/declarative/qml/qdeclarativeexpression.h
@@ -60,7 +60,7 @@ class QDeclarativeContext;
 class QDeclarativeExpressionPrivate;
 class QDeclarativeContextData;
 class QScriptValue;
-class Q_DECLARATIVE_EXPORT QDeclarativeExpression : public QObject
+class Q_QUICK1_EXPORT QDeclarativeExpression : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/declarative/qml/qdeclarativeextensioninterface.h b/src/declarative/qml/qdeclarativeextensioninterface.h
index d302d286..4bad3f0b 100644
--- a/src/declarative/qml/qdeclarativeextensioninterface.h
+++ b/src/declarative/qml/qdeclarativeextensioninterface.h
@@ -42,6 +42,7 @@
 #ifndef QDECLARATIVEEXTENSIONINTERFACE_H
 #define QDECLARATIVEEXTENSIONINTERFACE_H
 
+#include <QtQuick1/qtquick1global.h>
 #include <QtCore/qobject.h>
 
 QT_BEGIN_HEADER
@@ -52,7 +53,7 @@ QT_MODULE(Declarative)
 
 class QDeclarativeEngine;
 
-struct Q_DECLARATIVE_EXPORT QDeclarativeExtensionInterface
+struct Q_QUICK1_EXPORT QDeclarativeExtensionInterface
 {
     virtual ~QDeclarativeExtensionInterface() {}
     virtual void registerTypes(const char *uri) = 0;
diff --git a/src/declarative/qml/qdeclarativeextensionplugin.h b/src/declarative/qml/qdeclarativeextensionplugin.h
index 9c93656e..76243a38 100644
--- a/src/declarative/qml/qdeclarativeextensionplugin.h
+++ b/src/declarative/qml/qdeclarativeextensionplugin.h
@@ -54,7 +54,7 @@ QT_MODULE(Declarative)
 
 class QDeclarativeEngine;
 
-class Q_DECLARATIVE_EXPORT QDeclarativeExtensionPlugin : public QObject, public QDeclarativeExtensionInterface
+class Q_QUICK1_EXPORT QDeclarativeExtensionPlugin : public QObject, public QDeclarativeExtensionInterface
 {
     Q_OBJECT
     Q_INTERFACES(QDeclarativeExtensionInterface)
diff --git a/src/declarative/qml/qdeclarativeglobal_p.h b/src/declarative/qml/qdeclarativeglobal_p.h
index aac7c749..23271342 100644
--- a/src/declarative/qml/qdeclarativeglobal_p.h
+++ b/src/declarative/qml/qdeclarativeglobal_p.h
@@ -64,12 +64,6 @@ QT_MODULE(Declarative)
         return status == Yes; \
     }
 
-#ifdef Q_OS_SYMBIAN
-#define Q_DECLARATIVE_PRIVATE_EXPORT Q_AUTOTEST_EXPORT
-#else
-#define Q_DECLARATIVE_PRIVATE_EXPORT Q_DECLARATIVE_EXPORT
-#endif
-
 struct QDeclarativeGraphics_DerivedObject : public QObject
 {
     void setParent_noEvent(QObject *parent) {
diff --git a/src/declarative/qml/qdeclarativeimageprovider.h b/src/declarative/qml/qdeclarativeimageprovider.h
index 217f97b5..981b0663 100644
--- a/src/declarative/qml/qdeclarativeimageprovider.h
+++ b/src/declarative/qml/qdeclarativeimageprovider.h
@@ -42,6 +42,7 @@
 #ifndef QDECLARATIVEIMAGEPROVIDER_H
 #define QDECLARATIVEIMAGEPROVIDER_H
 
+#include <QtQuick1/qtquick1global.h>
 #include <QtGui/qimage.h>
 #include <QtGui/qpixmap.h>
 
@@ -53,7 +54,7 @@ QT_MODULE(Declarative)
 
 class QDeclarativeImageProviderPrivate;
 
-class Q_DECLARATIVE_EXPORT QDeclarativeImageProvider
+class Q_QUICK1_EXPORT QDeclarativeImageProvider
 {
 public:
     enum ImageType {
diff --git a/src/declarative/qml/qdeclarativeinfo.h b/src/declarative/qml/qdeclarativeinfo.h
index 5a614550..b9db88cc 100644
--- a/src/declarative/qml/qdeclarativeinfo.h
+++ b/src/declarative/qml/qdeclarativeinfo.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarativeInfoPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeInfo : public QDebug
+class Q_QUICK1_EXPORT QDeclarativeInfo : public QDebug
 {
 public:
     QDeclarativeInfo(const QDeclarativeInfo &);
@@ -85,17 +85,17 @@ public:
 #endif
 
 private:
-    friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me);
-    friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error);
-    friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors);
+    friend Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me);
+    friend Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error);
+    friend Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors);
 
     QDeclarativeInfo(QDeclarativeInfoPrivate *);
     QDeclarativeInfoPrivate *d;
 };
 
-Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me);
-Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error);
-Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors);
+Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me);
+Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error);
+Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors);
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h
index 7d1cf42f..7ea85e22 100644
--- a/src/declarative/qml/qdeclarativelist.h
+++ b/src/declarative/qml/qdeclarativelist.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVELIST_H
 #define QDECLARATIVELIST_H
 
-#include <QtCore/qglobal.h>
+#include <QtQuick1/qtquick1global.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qvariant.h>
 
@@ -114,7 +114,7 @@ private:
 
 class QDeclarativeEngine;
 class QDeclarativeListReferencePrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeListReference
+class Q_QUICK1_EXPORT QDeclarativeListReference
 {
 public:
     QDeclarativeListReference();
diff --git a/src/declarative/qml/qdeclarativemetatype_p.h b/src/declarative/qml/qdeclarativemetatype_p.h
index 17dcb7d8..9b303238 100644
--- a/src/declarative/qml/qdeclarativemetatype_p.h
+++ b/src/declarative/qml/qdeclarativemetatype_p.h
@@ -58,7 +58,7 @@
 #include <QtCore/qglobal.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qbitarray.h>
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qtquick1global_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -66,7 +66,7 @@ class QDeclarativeType;
 class QDeclarativeCustomParser;
 class QDeclarativeTypePrivate;
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeMetaType
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeMetaType
 {
 public:
     static bool canCopy(int type);
@@ -108,7 +108,7 @@ public:
     static QList<QDeclarativePrivate::AutoParentFunction> parentFunctions();
 };
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeType
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeType
 {
 public:
     QByteArray typeName() const;
diff --git a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h
index af2dbd23..d5bc870a 100644
--- a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h
+++ b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h
@@ -42,6 +42,7 @@
 #ifndef QDECLARATIVENETWORKACCESSMANAGERFACTORY_H
 #define QDECLARATIVENETWORKACCESSMANAGERFACTORY_H
 
+#include <QtQuick1/qtquick1global.h>
 #include <QtCore/qobject.h>
 
 QT_BEGIN_HEADER
@@ -51,7 +52,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QNetworkAccessManager;
-class Q_DECLARATIVE_EXPORT QDeclarativeNetworkAccessManagerFactory
+class Q_QUICK1_EXPORT QDeclarativeNetworkAccessManagerFactory
 {
 public:
     virtual ~QDeclarativeNetworkAccessManagerFactory();
diff --git a/src/declarative/qml/qdeclarativeparser_p.h b/src/declarative/qml/qdeclarativeparser_p.h
index f4ebf726..3723f901 100644
--- a/src/declarative/qml/qdeclarativeparser_p.h
+++ b/src/declarative/qml/qdeclarativeparser_p.h
@@ -237,7 +237,7 @@ namespace QDeclarativeParser
         QList<DynamicSlot> dynamicSlots;
     };
 
-    class Q_DECLARATIVE_EXPORT Variant 
+    class Q_QUICK1_EXPORT Variant
     {
     public:
         enum Type {
diff --git a/src/declarative/qml/qdeclarativeparserstatus.h b/src/declarative/qml/qdeclarativeparserstatus.h
index fb85431c..c7212b98 100644
--- a/src/declarative/qml/qdeclarativeparserstatus.h
+++ b/src/declarative/qml/qdeclarativeparserstatus.h
@@ -42,6 +42,7 @@
 #ifndef QDECLARATIVEPARSERSTATUS_H
 #define QDECLARATIVEPARSERSTATUS_H
 
+#include <QtQuick1/qtquick1global.h>
 #include <QtCore/qobject.h>
 
 QT_BEGIN_HEADER
@@ -50,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class Q_DECLARATIVE_EXPORT QDeclarativeParserStatus
+class Q_QUICK1_EXPORT QDeclarativeParserStatus
 {
 public:
     QDeclarativeParserStatus();
diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h
index 4b2f796c..a443a656 100644
--- a/src/declarative/qml/qdeclarativeprivate.h
+++ b/src/declarative/qml/qdeclarativeprivate.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtQuick1/qtquick1global.h>
 #include <QtCore/qvariant.h>
 
 QT_BEGIN_HEADER
@@ -77,7 +77,7 @@ public:
 class QDeclarativeCustomParser;
 namespace QDeclarativePrivate
 {
-    void Q_DECLARATIVE_EXPORT qdeclarativeelement_destructor(QObject *);
+    void Q_QUICK1_EXPORT qdeclarativeelement_destructor(QObject *);
     template<typename T>
     class QDeclarativeElement : public T
     {
@@ -239,7 +239,7 @@ namespace QDeclarativePrivate
         AutoParentRegistration = 2
     };
 
-    int Q_DECLARATIVE_EXPORT qmlregister(RegistrationType, void *);
+    int Q_QUICK1_EXPORT qmlregister(RegistrationType, void *);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativeproperty.h b/src/declarative/qml/qdeclarativeproperty.h
index 58e0521f..cce1c23b 100644
--- a/src/declarative/qml/qdeclarativeproperty.h
+++ b/src/declarative/qml/qdeclarativeproperty.h
@@ -42,6 +42,7 @@
 #ifndef QDECLARATIVEPROPERTY_H
 #define QDECLARATIVEPROPERTY_H
 
+#include <QtQuick1/qtquick1global.h>
 #include <QtCore/qmetaobject.h>
 
 QT_BEGIN_HEADER
@@ -56,7 +57,7 @@ class QDeclarativeContext;
 class QDeclarativeEngine;
 
 class QDeclarativePropertyPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeProperty
+class Q_QUICK1_EXPORT QDeclarativeProperty
 {
 public:
     enum PropertyTypeCategory {
diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h
index 6e61e6ca..e3376435 100644
--- a/src/declarative/qml/qdeclarativeproperty_p.h
+++ b/src/declarative/qml/qdeclarativeproperty_p.h
@@ -55,8 +55,8 @@
 
 #include "qdeclarativeproperty.h"
 
+#include <private/qtquick1global_p.h>
 #include <private/qobject_p.h>
-#include <private/qdeclarativeglobal_p.h>
 #include <private/qdeclarativepropertycache_p.h>
 #include <private/qdeclarativeguard_p.h>
 
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 class QDeclarativeContext;
 class QDeclarativeEnginePrivate;
 class QDeclarativeExpression;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePropertyPrivate : public QDeclarativeRefCount
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativePropertyPrivate : public QDeclarativeRefCount
 {
 public:
     enum WriteFlag { BypassInterceptor = 0x01, DontRemoveBinding = 0x02, RemoveBindingOnAliasWrite = 0x04 };
diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
index a6644b0b..d5a46215 100644
--- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
+++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h
@@ -42,6 +42,7 @@
 #ifndef QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H
 #define QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H
 
+#include <QtQuick1/qtquick1global.h>
 #include <QtCore/qobject.h>
 
 QT_BEGIN_HEADER
@@ -51,7 +52,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarativeProperty;
-class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueInterceptor
+class Q_QUICK1_EXPORT QDeclarativePropertyValueInterceptor
 {
 public:
     QDeclarativePropertyValueInterceptor();
diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.h b/src/declarative/qml/qdeclarativepropertyvaluesource.h
index 94d666d0..53e26dc7 100644
--- a/src/declarative/qml/qdeclarativepropertyvaluesource.h
+++ b/src/declarative/qml/qdeclarativepropertyvaluesource.h
@@ -42,6 +42,7 @@
 #ifndef QDECLARATIVEPROPERTYVALUESOURCE_H
 #define QDECLARATIVEPROPERTYVALUESOURCE_H
 
+#include <QtQuick1/qtquick1global.h>
 #include <QtCore/qobject.h>
 
 QT_BEGIN_HEADER
@@ -51,7 +52,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarativeProperty;
-class Q_DECLARATIVE_EXPORT QDeclarativePropertyValueSource
+class Q_QUICK1_EXPORT QDeclarativePropertyValueSource
 {
 public:
     QDeclarativePropertyValueSource();
diff --git a/src/declarative/qml/qdeclarativerefcount_p.h b/src/declarative/qml/qdeclarativerefcount_p.h
index 7c0f08af..d6130fe3 100644
--- a/src/declarative/qml/qdeclarativerefcount_p.h
+++ b/src/declarative/qml/qdeclarativerefcount_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <QtQuick1/qtquick1global.h>
 
 QT_BEGIN_HEADER
 
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class Q_DECLARATIVE_EXPORT QDeclarativeRefCount
+class Q_QUICK1_EXPORT QDeclarativeRefCount
 {
 public:
     QDeclarativeRefCount();
diff --git a/src/declarative/qml/qdeclarativescriptstring.h b/src/declarative/qml/qdeclarativescriptstring.h
index 7c8cf282..4823d36b 100644
--- a/src/declarative/qml/qdeclarativescriptstring.h
+++ b/src/declarative/qml/qdeclarativescriptstring.h
@@ -42,6 +42,7 @@
 #ifndef QDECLARATIVESCRIPTSTRING_H
 #define QDECLARATIVESCRIPTSTRING_H
 
+#include <QtQuick1/qtquick1global.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qshareddata.h>
 #include <QtCore/qmetatype.h>
@@ -55,7 +56,7 @@ QT_MODULE(Declarative)
 class QObject;
 class QDeclarativeContext;
 class QDeclarativeScriptStringPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeScriptString 
+class Q_QUICK1_EXPORT QDeclarativeScriptString
 {
 public:
     QDeclarativeScriptString();
diff --git a/src/declarative/qml/qdeclarativestringconverters_p.h b/src/declarative/qml/qdeclarativestringconverters_p.h
index 5fd06157..d5886893 100644
--- a/src/declarative/qml/qdeclarativestringconverters_p.h
+++ b/src/declarative/qml/qdeclarativestringconverters_p.h
@@ -53,11 +53,9 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
+#include <private/qtquick1global_p.h>
 #include <QtCore/qvariant.h>
 
-#include <private/qdeclarativeglobal_p.h>
-
 QT_BEGIN_NAMESPACE
 
 class QColor;
@@ -71,19 +69,19 @@ class QVector3D;
 // XXX - Bauhaus currently uses these methods which is why they're exported
 namespace QDeclarativeStringConverters
 {
-    QVariant Q_DECLARATIVE_PRIVATE_EXPORT variantFromString(const QString &);
-    QVariant Q_DECLARATIVE_PRIVATE_EXPORT variantFromString(const QString &, int preferredType, bool *ok = 0);
+    QVariant Q_QUICK1_PRIVATE_EXPORT variantFromString(const QString &);
+    QVariant Q_QUICK1_PRIVATE_EXPORT variantFromString(const QString &, int preferredType, bool *ok = 0);
 
-    QColor Q_DECLARATIVE_PRIVATE_EXPORT colorFromString(const QString &, bool *ok = 0);
+    QColor Q_QUICK1_PRIVATE_EXPORT colorFromString(const QString &, bool *ok = 0);
 #ifndef QT_NO_DATESTRING
-    QDate Q_DECLARATIVE_PRIVATE_EXPORT dateFromString(const QString &, bool *ok = 0); 
-    QTime Q_DECLARATIVE_PRIVATE_EXPORT timeFromString(const QString &, bool *ok = 0);
-    QDateTime Q_DECLARATIVE_PRIVATE_EXPORT dateTimeFromString(const QString &, bool *ok = 0);
+    QDate Q_QUICK1_PRIVATE_EXPORT dateFromString(const QString &, bool *ok = 0);
+    QTime Q_QUICK1_PRIVATE_EXPORT timeFromString(const QString &, bool *ok = 0);
+    QDateTime Q_QUICK1_PRIVATE_EXPORT dateTimeFromString(const QString &, bool *ok = 0);
 #endif
-    QPointF Q_DECLARATIVE_PRIVATE_EXPORT pointFFromString(const QString &, bool *ok = 0);
-    QSizeF Q_DECLARATIVE_PRIVATE_EXPORT sizeFFromString(const QString &, bool *ok = 0);
-    QRectF Q_DECLARATIVE_PRIVATE_EXPORT rectFFromString(const QString &, bool *ok = 0);
-    QVector3D Q_DECLARATIVE_PRIVATE_EXPORT vector3DFromString(const QString &, bool *ok = 0);
+    QPointF Q_QUICK1_PRIVATE_EXPORT pointFFromString(const QString &, bool *ok = 0);
+    QSizeF Q_QUICK1_PRIVATE_EXPORT sizeFFromString(const QString &, bool *ok = 0);
+    QRectF Q_QUICK1_PRIVATE_EXPORT rectFFromString(const QString &, bool *ok = 0);
+    QVector3D Q_QUICK1_PRIVATE_EXPORT vector3DFromString(const QString &, bool *ok = 0);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h
index 6710a1f7..66afdf95 100644
--- a/src/declarative/qml/qdeclarativevaluetype_p.h
+++ b/src/declarative/qml/qdeclarativevaluetype_p.h
@@ -70,7 +70,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeValueType : public QObject
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeValueType : public QObject
 {
     Q_OBJECT
 public:
@@ -81,7 +81,7 @@ public:
     virtual void setValue(QVariant) = 0;
 };
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeValueTypeFactory
+class Q_QUICK1_PRIVATE_EXPORT QDeclarativeValueTypeFactory
 {
 public:
     QDeclarativeValueTypeFactory();