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/qml/qdeclarativeerror.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/declarative/qml/qdeclarativeerror.h') diff --git a/src/declarative/qml/qdeclarativeerror.h b/src/declarative/qml/qdeclarativeerror.h index b5581ec4..07618432 100644 --- a/src/declarative/qml/qdeclarativeerror.h +++ b/src/declarative/qml/qdeclarativeerror.h @@ -42,6 +42,7 @@ #ifndef QDECLARATIVEERROR_H #define QDECLARATIVEERROR_H +#include #include #include @@ -53,7 +54,7 @@ QT_MODULE(Declarative) class QDebug; class QDeclarativeErrorPrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeError +class Q_QUICK1_EXPORT QDeclarativeError { public: QDeclarativeError(); @@ -77,7 +78,7 @@ private: QDeclarativeErrorPrivate *d; }; -QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, const QDeclarativeError &error); +QDebug Q_QUICK1_EXPORT operator<<(QDebug debug, const QDeclarativeError &error); QT_END_NAMESPACE -- cgit v1.2.3