diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-27 10:35:54 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-27 02:51:54 +0100 |
commit | dbf1c74bf24eb399e1281be795cf56659adc3308 (patch) | |
tree | 289035112cd85310e2f55615cd0f3078832f7e95 /src/declarative/util/qdeclarativestate_p.h | |
parent | c9cf51b931961fdb0410a21e03b4cd8667560584 (diff) |
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>
Diffstat (limited to 'src/declarative/util/qdeclarativestate_p.h')
-rw-r--r-- | src/declarative/util/qdeclarativestate_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h index 7fe8edc0..0d127ffe 100644 --- a/src/declarative/util/qdeclarativestate_p.h +++ b/src/declarative/util/qdeclarativestate_p.h @@ -46,7 +46,7 @@ #include <qdeclarativeproperty.h> #include <QtCore/qobject.h> #include <QtCore/qsharedpointer.h> -#include <private/qdeclarativeglobal_p.h> +#include <private/qtquick1global_p.h> QT_BEGIN_HEADER @@ -58,7 +58,7 @@ class QDeclarativeActionEvent; class QDeclarativeAbstractBinding; class QDeclarativeBinding; class QDeclarativeExpression; -class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAction +class Q_QUICK1_PRIVATE_EXPORT QDeclarativeAction { public: QDeclarativeAction(); @@ -115,7 +115,7 @@ public: class QDeclarativeStateGroup; class QDeclarativeState; class QDeclarativeStateOperationPrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeStateOperation : public QObject +class Q_QUICK1_EXPORT QDeclarativeStateOperation : public QObject { Q_OBJECT public: @@ -140,7 +140,7 @@ typedef QDeclarativeStateOperation::ActionList QDeclarativeStateActions; class QDeclarativeTransition; class QDeclarativeStatePrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeState : public QObject +class Q_QUICK1_EXPORT QDeclarativeState : public QObject { Q_OBJECT |