From dbf1c74bf24eb399e1281be795cf56659adc3308 Mon Sep 17 00:00:00 2001 From: Matthew Vogt Date: Mon, 27 Feb 2012 10:35:54 +1000 Subject: 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 --- src/declarative/graphicsitems/qdeclarativeanchors_p.h | 4 ++-- src/declarative/graphicsitems/qdeclarativeevents_p_p.h | 4 ++-- src/declarative/graphicsitems/qdeclarativeitem.h | 4 ++-- src/declarative/graphicsitems/qdeclarativeitem_p.h | 2 +- src/declarative/graphicsitems/qdeclarativepositioners_p.h | 2 +- src/declarative/graphicsitems/qdeclarativerectangle_p.h | 6 +++--- src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h | 4 ++-- src/declarative/graphicsitems/qdeclarativetext_p.h | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/declarative/graphicsitems') diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p.h index 77ff185f..96d79ee2 100644 --- a/src/declarative/graphicsitems/qdeclarativeanchors_p.h +++ b/src/declarative/graphicsitems/qdeclarativeanchors_p.h @@ -48,7 +48,7 @@ #include -#include +#include QT_BEGIN_HEADER @@ -58,7 +58,7 @@ QT_MODULE(Declarative) class QDeclarativeAnchorsPrivate; class QDeclarativeAnchorLine; -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAnchors : public QObject +class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAnchors : public QObject { Q_OBJECT diff --git a/src/declarative/graphicsitems/qdeclarativeevents_p_p.h b/src/declarative/graphicsitems/qdeclarativeevents_p_p.h index c92faff4..7f6e9d1a 100644 --- a/src/declarative/graphicsitems/qdeclarativeevents_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeevents_p_p.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE -class Q_DECLARATIVE_EXPORT QDeclarativeKeyEvent : public QObject +class Q_QUICK1_EXPORT QDeclarativeKeyEvent : public QObject { Q_OBJECT Q_PROPERTY(int key READ key) @@ -89,7 +89,7 @@ private: QKeyEvent event; }; -class Q_DECLARATIVE_EXPORT QDeclarativeMouseEvent : public QObject +class Q_QUICK1_EXPORT QDeclarativeMouseEvent : public QObject { Q_OBJECT Q_PROPERTY(int x READ x) diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h index f55a14b8..b2ac42a6 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.h +++ b/src/declarative/graphicsitems/qdeclarativeitem.h @@ -64,7 +64,7 @@ class QDeclarativeTransition; class QDeclarativeKeyEvent; class QDeclarativeAnchors; class QDeclarativeItemPrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeItem : public QGraphicsObject, public QDeclarativeParserStatus +class Q_QUICK1_EXPORT QDeclarativeItem : public QGraphicsObject, public QDeclarativeParserStatus { Q_OBJECT Q_INTERFACES(QDeclarativeParserStatus) @@ -216,7 +216,7 @@ T qobject_cast(QGraphicsItem *item) } #ifndef QT_NO_DEBUG_STREAM -QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, QDeclarativeItem *item); +QDebug Q_QUICK1_EXPORT operator<<(QDebug debug, QDeclarativeItem *item); #endif QT_END_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativeitem_p.h b/src/declarative/graphicsitems/qdeclarativeitem_p.h index 5a98c598..076c5bd7 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem_p.h +++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h @@ -114,7 +114,7 @@ private: qreal m_height; }; -class Q_DECLARATIVE_EXPORT QDeclarativeItemPrivate : public QGraphicsItemPrivate +class Q_QUICK1_EXPORT QDeclarativeItemPrivate : public QGraphicsItemPrivate { Q_DECLARE_PUBLIC(QDeclarativeItem) diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p.h index ec685fc5..8a3c9174 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners_p.h +++ b/src/declarative/graphicsitems/qdeclarativepositioners_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeBasePositionerPrivate; -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBasePositioner : public QDeclarativeImplicitSizeItem +class Q_QUICK1_PRIVATE_EXPORT QDeclarativeBasePositioner : public QDeclarativeImplicitSizeItem { Q_OBJECT diff --git a/src/declarative/graphicsitems/qdeclarativerectangle_p.h b/src/declarative/graphicsitems/qdeclarativerectangle_p.h index f9863fbe..441cf63b 100644 --- a/src/declarative/graphicsitems/qdeclarativerectangle_p.h +++ b/src/declarative/graphicsitems/qdeclarativerectangle_p.h @@ -46,14 +46,14 @@ #include -#include +#include QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePen : public QObject +class Q_QUICK1_PRIVATE_EXPORT QDeclarativePen : public QObject { Q_OBJECT @@ -133,7 +133,7 @@ private: }; class QDeclarativeRectanglePrivate; -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeRectangle : public QDeclarativeItem +class Q_QUICK1_PRIVATE_EXPORT QDeclarativeRectangle : public QDeclarativeItem { Q_OBJECT diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h index cf71617f..aee34daa 100644 --- a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeScaleGrid : public QObject +class Q_QUICK1_PRIVATE_EXPORT QDeclarativeScaleGrid : public QObject { Q_OBJECT Q_ENUMS(TileRule) @@ -95,7 +95,7 @@ private: int _bottom; }; -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeGridScaledImage +class Q_QUICK1_PRIVATE_EXPORT QDeclarativeGridScaledImage { public: QDeclarativeGridScaledImage(); diff --git a/src/declarative/graphicsitems/qdeclarativetext_p.h b/src/declarative/graphicsitems/qdeclarativetext_p.h index df38beb3..8b63e44b 100644 --- a/src/declarative/graphicsitems/qdeclarativetext_p.h +++ b/src/declarative/graphicsitems/qdeclarativetext_p.h @@ -45,7 +45,7 @@ #include #include "qdeclarativeimplicitsizeitem_p.h" -#include +#include QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeTextPrivate; -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeText : public QDeclarativeImplicitSizeItem +class Q_QUICK1_PRIVATE_EXPORT QDeclarativeText : public QDeclarativeImplicitSizeItem { Q_OBJECT Q_ENUMS(HAlignment) -- cgit v1.2.3