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/qml/qdeclarativeprivate.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/qml/qdeclarativeprivate.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeprivate.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h index 4b2f796c..a443a656 100644 --- a/src/declarative/qml/qdeclarativeprivate.h +++ b/src/declarative/qml/qdeclarativeprivate.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtQuick1/qtquick1global.h> #include <QtCore/qvariant.h> QT_BEGIN_HEADER @@ -77,7 +77,7 @@ public: class QDeclarativeCustomParser; namespace QDeclarativePrivate { - void Q_DECLARATIVE_EXPORT qdeclarativeelement_destructor(QObject *); + void Q_QUICK1_EXPORT qdeclarativeelement_destructor(QObject *); template<typename T> class QDeclarativeElement : public T { @@ -239,7 +239,7 @@ namespace QDeclarativePrivate AutoParentRegistration = 2 }; - int Q_DECLARATIVE_EXPORT qmlregister(RegistrationType, void *); + int Q_QUICK1_EXPORT qmlregister(RegistrationType, void *); } QT_END_NAMESPACE |