diff options
Diffstat (limited to 'src/declarative/graphicsitems')
10 files changed, 19 insertions, 19 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p.h index 0bd226cd..22d69852 100644 --- a/src/declarative/graphicsitems/qdeclarativeanchors_p.h +++ b/src/declarative/graphicsitems/qdeclarativeanchors_p.h @@ -48,7 +48,7 @@ #include <QtCore/QObject> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -58,7 +58,7 @@ QT_MODULE(Declarative) class QDeclarativeAnchorsPrivate; class QDeclarativeAnchorLine; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAnchors : public QObject +class Q_DECLARATIVE_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 f9aa9e81..46651314 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_QUICK1_EXPORT QDeclarativeKeyEvent : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeKeyEvent : public QObject { Q_OBJECT Q_PROPERTY(int key READ key) @@ -89,7 +89,7 @@ private: QKeyEvent event; }; -class Q_QUICK1_EXPORT QDeclarativeMouseEvent : public QObject +class Q_DECLARATIVE_EXPORT QDeclarativeMouseEvent : public QObject { Q_OBJECT Q_PROPERTY(int x READ x) diff --git a/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h b/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h index 6c169ec0..bbc0cd8b 100644 --- a/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h +++ b/src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVEGRAPHICSWIDGET_P_H #include <QObject> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarativecomponent.h> QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 9dc5cff2..825bae39 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -44,7 +44,7 @@ #include "private/qdeclarativeevents_p_p.h" #include <private/qdeclarativeengine_p.h> #include <private/qgraphicsitem_p.h> -#include <QtQuick1/private/qdeclarativeitem_p.h> +#include <QtDeclarative/private/qdeclarativeitem_p.h> #include <qdeclarativeengine.h> #include <qdeclarativeopenmetaobject_p.h> diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h index 95f9458f..503911c0 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.h +++ b/src/declarative/graphicsitems/qdeclarativeitem.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVEITEM_H #define QDECLARATIVEITEM_H -#include <QtQuick1/qdeclarative.h> -#include <QtQuick1/qdeclarativecomponent.h> +#include <QtDeclarative/qdeclarative.h> +#include <QtDeclarative/qdeclarativecomponent.h> #include <QtCore/QObject> #include <QtCore/QList> @@ -64,7 +64,7 @@ class QDeclarativeTransition; class QDeclarativeKeyEvent; class QDeclarativeAnchors; class QDeclarativeItemPrivate; -class Q_QUICK1_EXPORT QDeclarativeItem : public QGraphicsObject, public QDeclarativeParserStatus +class Q_DECLARATIVE_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_QUICK1_EXPORT operator<<(QDebug debug, QDeclarativeItem *item); +QDebug Q_DECLARATIVE_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 cab49b1a..34269a93 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_QUICK1_EXPORT QDeclarativeItemPrivate : public QGraphicsItemPrivate +class Q_DECLARATIVE_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 40bb6c36..70e47094 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_QUICK1_PRIVATE_EXPORT QDeclarativeBasePositioner : public QDeclarativeImplicitSizeItem +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBasePositioner : public QDeclarativeImplicitSizeItem { Q_OBJECT diff --git a/src/declarative/graphicsitems/qdeclarativerectangle_p.h b/src/declarative/graphicsitems/qdeclarativerectangle_p.h index c11a8ab7..eb29efe8 100644 --- a/src/declarative/graphicsitems/qdeclarativerectangle_p.h +++ b/src/declarative/graphicsitems/qdeclarativerectangle_p.h @@ -46,14 +46,14 @@ #include <QtGui/qbrush.h> -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Declarative) -class Q_QUICK1_PRIVATE_EXPORT QDeclarativePen : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePen : public QObject { Q_OBJECT @@ -133,7 +133,7 @@ private: }; class QDeclarativeRectanglePrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeRectangle : public QDeclarativeItem +class Q_DECLARATIVE_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 852cf6f3..5d5d4d7e 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_QUICK1_PRIVATE_EXPORT QDeclarativeScaleGrid : public QObject +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeScaleGrid : public QObject { Q_OBJECT Q_ENUMS(TileRule) @@ -95,7 +95,7 @@ private: int _bottom; }; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeGridScaledImage +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeGridScaledImage { public: QDeclarativeGridScaledImage(); diff --git a/src/declarative/graphicsitems/qdeclarativetext_p.h b/src/declarative/graphicsitems/qdeclarativetext_p.h index 9602727f..650f324d 100644 --- a/src/declarative/graphicsitems/qdeclarativetext_p.h +++ b/src/declarative/graphicsitems/qdeclarativetext_p.h @@ -45,7 +45,7 @@ #include <QtGui/qtextoption.h> #include "qdeclarativeimplicitsizeitem_p.h" -#include <private/qtquick1global_p.h> +#include <private/qtdeclarativeglobal_p.h> QT_BEGIN_HEADER @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeTextPrivate; -class Q_QUICK1_PRIVATE_EXPORT QDeclarativeText : public QDeclarativeImplicitSizeItem +class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeText : public QDeclarativeImplicitSizeItem { Q_OBJECT Q_ENUMS(HAlignment) |