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/qdeclarativeinfo.h | |
| parent | c9cf51b931961fdb0410a21e03b4cd8667560584 (diff) | |
| download | qtquick1-dbf1c74bf24eb399e1281be795cf56659adc3308.tar.gz | |
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/qdeclarativeinfo.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeinfo.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/declarative/qml/qdeclarativeinfo.h b/src/declarative/qml/qdeclarativeinfo.h index 5a614550..b9db88cc 100644 --- a/src/declarative/qml/qdeclarativeinfo.h +++ b/src/declarative/qml/qdeclarativeinfo.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QDeclarativeInfoPrivate; -class Q_DECLARATIVE_EXPORT QDeclarativeInfo : public QDebug +class Q_QUICK1_EXPORT QDeclarativeInfo : public QDebug { public: QDeclarativeInfo(const QDeclarativeInfo &); @@ -85,17 +85,17 @@ public: #endif private: - friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); - friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error); - friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors); + friend Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); + friend Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error); + friend Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors); QDeclarativeInfo(QDeclarativeInfoPrivate *); QDeclarativeInfoPrivate *d; }; -Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); -Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error); -Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors); +Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); +Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error); +Q_QUICK1_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors); QT_END_NAMESPACE |