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/qdeclarative.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/qdeclarative.h')
-rw-r--r-- | src/declarative/qml/qdeclarative.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index c6be75f1..643c33a8 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -392,11 +392,11 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor, class QDeclarativeContext; class QDeclarativeEngine; -Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *); -Q_DECLARATIVE_EXPORT QDeclarativeContext *qmlContext(const QObject *); -Q_DECLARATIVE_EXPORT QDeclarativeEngine *qmlEngine(const QObject *); -Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true); -Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create); +Q_QUICK1_EXPORT void qmlExecuteDeferred(QObject *); +Q_QUICK1_EXPORT QDeclarativeContext *qmlContext(const QObject *); +Q_QUICK1_EXPORT QDeclarativeEngine *qmlEngine(const QObject *); +Q_QUICK1_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true); +Q_QUICK1_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create); template<typename T> QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true) |