diff options
Diffstat (limited to 'src/declarative/qml/qdeclarative.h')
| -rw-r--r-- | src/declarative/qml/qdeclarative.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index 5b3cc5b3..64bec11d 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -42,11 +42,11 @@ #ifndef QDECLARATIVE_H #define QDECLARATIVE_H -#include <QtQuick1/qdeclarativeprivate.h> -#include <QtQuick1/qdeclarativeparserstatus.h> -#include <QtQuick1/qdeclarativepropertyvaluesource.h> -#include <QtQuick1/qdeclarativepropertyvalueinterceptor.h> -#include <QtQuick1/qdeclarativelist.h> +#include <QtDeclarative/qdeclarativeprivate.h> +#include <QtDeclarative/qdeclarativeparserstatus.h> +#include <QtDeclarative/qdeclarativepropertyvaluesource.h> +#include <QtDeclarative/qdeclarativepropertyvalueinterceptor.h> +#include <QtDeclarative/qdeclarativelist.h> #include <QtCore/qbytearray.h> #include <QtCore/qmetaobject.h> @@ -392,11 +392,11 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor, class QDeclarativeContext; class QDeclarativeEngine; -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); +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); template<typename T> QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true) |