diff options
Diffstat (limited to 'src/qml/qml/qqmlinfo.h')
| -rw-r--r-- | src/qml/qml/qqmlinfo.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/qml/qml/qqmlinfo.h b/src/qml/qml/qqmlinfo.h index 16fca9428e..56ac788624 100644 --- a/src/qml/qml/qqmlinfo.h +++ b/src/qml/qml/qqmlinfo.h @@ -48,6 +48,15 @@ QT_BEGIN_NAMESPACE +class QQmlInfo; + +namespace QtQml { + // declared in namespace to avoid symbol conflicts with QtDeclarative + Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me); + Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QQmlError &error); + Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QList<QQmlError> &errors); +} +using namespace QtQml; class QQmlInfoPrivate; class Q_QML_EXPORT QQmlInfo : public QDebug @@ -82,18 +91,14 @@ public: #endif private: - friend Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me); - friend Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QQmlError &error); - friend Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QList<QQmlError> &errors); + friend Q_QML_EXPORT QQmlInfo QtQml::qmlInfo(const QObject *me); + friend Q_QML_EXPORT QQmlInfo QtQml::qmlInfo(const QObject *me, const QQmlError &error); + friend Q_QML_EXPORT QQmlInfo QtQml::qmlInfo(const QObject *me, const QList<QQmlError> &errors); QQmlInfo(QQmlInfoPrivate *); QQmlInfoPrivate *d; }; -Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me); -Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QQmlError &error); -Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QList<QQmlError> &errors); - QT_END_NAMESPACE #endif // QQMLINFO_H |