diff options
Diffstat (limited to 'src/declarative/qml/qdeclarativeinfo.h')
-rw-r--r-- | src/declarative/qml/qdeclarativeinfo.h | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/declarative/qml/qdeclarativeinfo.h b/src/declarative/qml/qdeclarativeinfo.h index 7b23a341..2db5d960 100644 --- a/src/declarative/qml/qdeclarativeinfo.h +++ b/src/declarative/qml/qdeclarativeinfo.h @@ -50,6 +50,18 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) +class QDeclarativeInfo; + +namespace QtDeclarative { + // declared in namespace to avoid symbol conflicts with QtQml + 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); +} +using namespace QtDeclarative; + class QDeclarativeInfoPrivate; class Q_DECLARATIVE_EXPORT QDeclarativeInfo : public QDebug { @@ -83,18 +95,15 @@ 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_DECLARATIVE_EXPORT QDeclarativeInfo QtDeclarative::qmlInfo(const QObject *me); + friend Q_DECLARATIVE_EXPORT QDeclarativeInfo QtDeclarative::qmlInfo(const QObject *me, + const QDeclarativeError &error); + friend Q_DECLARATIVE_EXPORT QDeclarativeInfo QtDeclarative::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); - QT_END_NAMESPACE #endif // QDECLARATIVEINFO_H |