diff options
| author | Marcel Krems <m.krems@software-vision.eu> | 2015-08-07 01:50:38 +0200 |
|---|---|---|
| committer | Marcel Krems <m.krems@software-vision.eu> | 2015-09-25 15:47:39 +0000 |
| commit | ad125bd18ef5c98a264b9e4fac258dd07511035d (patch) | |
| tree | 98544b426756c8255e674713d089459669c130ae | |
| parent | 5f23d4eb103baa21225adb4c3dd666dbefef6515 (diff) | |
Disable Clang warning -Wheader-hygiene.
qqmlinfo.h:51:17: warning: using namespace directive in global context in header [-Wheader-hygiene]
In this case the use of the using directive is intended.
See also: 0181dc283f6a783783b7e622b4e2dc241edd8a54
Change-Id: I8f94cefdab7ce70e375ad8b01f59eb0f9d840708
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| -rw-r--r-- | src/qml/qml/qqmlinfo.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlinfo.h b/src/qml/qml/qqmlinfo.h index b56f74198c..90ac1dd777 100644 --- a/src/qml/qml/qqmlinfo.h +++ b/src/qml/qml/qqmlinfo.h @@ -48,7 +48,11 @@ namespace QtQml { Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QQmlError &error); Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QList<QQmlError> &errors); } +QT_WARNING_PUSH +QT_WARNING_DISABLE_CLANG("-Wheader-hygiene") +// This is necessary to allow for QtQuick1 and QtQuick2 scenes in a single application. using namespace QtQml; +QT_WARNING_POP class QQmlInfoPrivate; class Q_QML_EXPORT QQmlInfo : public QDebug |