diff options
Diffstat (limited to 'src/qml/qml/qqml.h')
-rw-r--r-- | src/qml/qml/qqml.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index b48a776b4f..ee69985edb 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -428,8 +428,19 @@ namespace QtQml { Q_QML_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create); } + +#ifdef Q_CC_CLANG +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wheader-hygiene" +#endif + +// This is necessary to allow for QtQuick1 and QtQuick2 scenes in a single application. using namespace QtQml; +#ifdef Q_CC_CLANG +#pragma clang diagnostic pop +#endif + template<typename T> QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true) { |