Fix export symbols for QtDeclarative and QtQuick1.

Fix build on Windows and compiler warnings.

Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase.

Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019
Reviewed-on: http://codereview.qt.nokia.com/3988
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

7 files changed, 10 insertions, 10 deletions

diff --git a/src/qtquick1/graphicsitems/qdeclarativeanchors_p.h b/src/qtquick1/graphicsitems/qdeclarativeanchors_p.h
index 96a5f27f1e..5fd90b0a5f 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeanchors_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeanchors_p.h
@@ -58,7 +58,7 @@ QT_MODULE(Declarative)
 
 class QDeclarative1AnchorsPrivate;
 class QDeclarative1AnchorLine;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1Anchors : public QObject
+class Q_QTQUICK1_EXPORT QDeclarative1Anchors : public QObject
 {
     Q_OBJECT
 
diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.h b/src/qtquick1/graphicsitems/qdeclarativeitem.h
index 609af803f6..c56b59125b 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeitem.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeitem.h
@@ -65,7 +65,7 @@ class QDeclarative1KeyEvent;
 class QDeclarative1Anchors;
 class QDeclarativeItemPrivate;
 class QDeclarativeV8Function;
-class Q_DECLARATIVE_EXPORT QDeclarativeItem : public QGraphicsObject, public QDeclarativeParserStatus
+class Q_QTQUICK1_EXPORT QDeclarativeItem : public QGraphicsObject, public QDeclarativeParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QDeclarativeParserStatus)
@@ -217,7 +217,7 @@ T qobject_cast(QGraphicsItem *item)
 }
 
 #ifndef QT_NO_DEBUG_STREAM
-QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, QDeclarativeItem *item);
+QDebug Q_QTQUICK1_EXPORT operator<<(QDebug debug, QDeclarativeItem *item);
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem_p.h b/src/qtquick1/graphicsitems/qdeclarativeitem_p.h
index 0604194004..8dccd1ac37 100644
--- a/src/qtquick1/graphicsitems/qdeclarativeitem_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativeitem_p.h
@@ -116,7 +116,7 @@ private:
     qreal m_height;
 };
 
-class Q_DECLARATIVE_EXPORT QDeclarativeItemPrivate : public QGraphicsItemPrivate
+class Q_QTQUICK1_EXPORT QDeclarativeItemPrivate : public QGraphicsItemPrivate
 {
     Q_DECLARE_PUBLIC(QDeclarativeItem)
 
diff --git a/src/qtquick1/graphicsitems/qdeclarativepositioners_p.h b/src/qtquick1/graphicsitems/qdeclarativepositioners_p.h
index c5f25228bd..17c6b7bc10 100644
--- a/src/qtquick1/graphicsitems/qdeclarativepositioners_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativepositioners_p.h
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 class QDeclarative1BasePositionerPrivate;
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1BasePositioner : public QDeclarative1ImplicitSizeItem
+class Q_QTQUICK1_EXPORT QDeclarative1BasePositioner : public QDeclarative1ImplicitSizeItem
 {
     Q_OBJECT
 
diff --git a/src/qtquick1/graphicsitems/qdeclarativerectangle_p.h b/src/qtquick1/graphicsitems/qdeclarativerectangle_p.h
index 862799faa2..d4a98ba284 100644
--- a/src/qtquick1/graphicsitems/qdeclarativerectangle_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativerectangle_p.h
@@ -53,7 +53,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1Pen : public QObject
+class Q_QTQUICK1_EXPORT QDeclarative1Pen : public QObject
 {
     Q_OBJECT
 
@@ -133,7 +133,7 @@ private:
 };
 
 class QDeclarative1RectanglePrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1Rectangle : public QDeclarativeItem
+class Q_QTQUICK1_EXPORT QDeclarative1Rectangle : public QDeclarativeItem
 {
     Q_OBJECT
 
diff --git a/src/qtquick1/graphicsitems/qdeclarativescalegrid_p_p.h b/src/qtquick1/graphicsitems/qdeclarativescalegrid_p_p.h
index 5a1c298a74..27e6b5e5a4 100644
--- a/src/qtquick1/graphicsitems/qdeclarativescalegrid_p_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativescalegrid_p_p.h
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1ScaleGrid : public QObject
+class Q_QTQUICK1_EXPORT QDeclarative1ScaleGrid : public QObject
 {
     Q_OBJECT
     Q_ENUMS(TileRule)
@@ -95,7 +95,7 @@ private:
     int _bottom;
 };
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1GridScaledImage
+class Q_QTQUICK1_EXPORT QDeclarative1GridScaledImage
 {
 public:
     QDeclarative1GridScaledImage();
diff --git a/src/qtquick1/graphicsitems/qdeclarativetext_p.h b/src/qtquick1/graphicsitems/qdeclarativetext_p.h
index 93261fbb24..efc90bb7a5 100644
--- a/src/qtquick1/graphicsitems/qdeclarativetext_p.h
+++ b/src/qtquick1/graphicsitems/qdeclarativetext_p.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 class QDeclarative1TextPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarative1Text : public QDeclarative1ImplicitSizeItem
+class Q_QTQUICK1_EXPORT QDeclarative1Text : public QDeclarative1ImplicitSizeItem
 {
     Q_OBJECT
     Q_ENUMS(HAlignment)