aboutsummaryrefslogtreecommitdiffstats
path: root/src/qtquick1
diff options
context:
space:
mode:
Diffstat (limited to 'src/qtquick1')
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeanchors_p.h2
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeitem.h4
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeitem_p.h2
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepositioners_p.h2
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativerectangle_p.h4
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativescalegrid_p_p.h4
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativetext_p.h2
-rw-r--r--src/qtquick1/qtquick1.pro4
-rw-r--r--src/qtquick1/qtquick1_p.h2
-rw-r--r--src/qtquick1/util/qdeclarativeanimation_p.h4
-rw-r--r--src/qtquick1/util/qdeclarativeapplication_p.h2
-rw-r--r--src/qtquick1/util/qdeclarativebehavior_p.h2
-rw-r--r--src/qtquick1/util/qdeclarativeopenmetaobject_p.h4
-rw-r--r--src/qtquick1/util/qdeclarativepixmapcache_p.h2
-rw-r--r--src/qtquick1/util/qdeclarativepropertychanges_p.h2
-rw-r--r--src/qtquick1/util/qdeclarativestate_p.h6
-rw-r--r--src/qtquick1/util/qdeclarativestategroup_p.h2
-rw-r--r--src/qtquick1/util/qdeclarativetimer_p.h2
-rw-r--r--src/qtquick1/util/qdeclarativetransition_p.h2
-rw-r--r--src/qtquick1/util/qdeclarativeview.h2
20 files changed, 28 insertions, 28 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)
diff --git a/src/qtquick1/qtquick1.pro b/src/qtquick1/qtquick1.pro
index 66f2c848f2..d70b532caf 100644
--- a/src/qtquick1/qtquick1.pro
+++ b/src/qtquick1/qtquick1.pro
@@ -8,7 +8,7 @@ CONFIG += dll warn_on
MODULE_PRI += ../../modules/qt_qtquick1.pri
QT += testlib-private declarative testlib declarative-private core-private gui-private network widgets-private v8-private
-DEFINES += QT_NO_URL_CAST_FROM_STRING
+DEFINES += QT_BUILD_QTQUICK1_LIB QT_NO_URL_CAST_FROM_STRING
load(qt_module_config)
@@ -38,5 +38,5 @@ HEADERS += qtquick1_p.h
SOURCES += qtquick1.cpp
DEFINES += QT_NO_OPENTYPE
-INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
+INCLUDEPATH += $$QT.corelib.sources/../src/3rdparty/harfbuzz/src
diff --git a/src/qtquick1/qtquick1_p.h b/src/qtquick1/qtquick1_p.h
index 36dfd1ad05..8fb0c1110a 100644
--- a/src/qtquick1/qtquick1_p.h
+++ b/src/qtquick1/qtquick1_p.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
QT_MODULE(Declarative)
-class Q_DECLARATIVE_EXPORT QDeclarativeQtQuick1Module
+class Q_QTQUICK1_EXPORT QDeclarativeQtQuick1Module
{
public:
enum Module { QtQuick1, Qt47 };
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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 10:42:32 +0000