diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-02-07 18:08:29 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-02-07 18:10:43 +0000 |
| commit | b0eb152b82cdd9658154ff7d9ef9e764eccc1ebd (patch) | |
| tree | d754ad4412d5c1d26caedd54f2455f3e27cbbd46 /tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp | |
| parent | 137b0cbbc746eecc6dd6a93f9a268f8d42c96bcc (diff) | |
| parent | fa6799f63f3211300705b814b97716ca689d4bfa (diff) | |
Merge remote-tracking branch 5.15 into dev
Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7
Diffstat (limited to 'tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp')
| -rw-r--r-- | tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp index 28574d3c5..8cfbc0d23 100644 --- a/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp +++ b/tests/auto/render/qgeometryrenderer/tst_qgeometryrenderer.cpp @@ -26,6 +26,10 @@ ** ****************************************************************************/ +// TODO Remove in Qt6 +#include <QtCore/qcompilerdetection.h> +QT_WARNING_DISABLE_DEPRECATED + #include <QtTest/QTest> #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qscene_p.h> |