fix travis and 5.14 builds

qgis · Oct 26, 2020 · 2017f74 · 2017f74
1 parent ac6116c
commit 2017f74
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/3d/qgspointcloudlayerchunkloader_p.cpp b/src/3d/qgspointcloudlayerchunkloader_p.cpp
@@ -42,7 +42,11 @@ QgsPointCloud3DGeometry::QgsPointCloud3DGeometry( Qt3DCore::QNode *parent, const
   : Qt3DRender::QGeometry( parent )
   , mPositionAttribute( new Qt3DRender::QAttribute( this ) )
   , mClassAttribute( new Qt3DRender::QAttribute( this ) )
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
   , mVertexBuffer( new Qt3DRender::QBuffer( Qt3DRender::QBuffer::VertexBuffer, this ) )
+#else
+  , mVertexBuffer( new Qt3DRender::QBuffer( this ) )
+#endif
 {
   mPositionAttribute->setAttributeType( Qt3DRender::QAttribute::VertexAttribute );
   mPositionAttribute->setBuffer( mVertexBuffer );

diff --git a/src/app/3d/qgs3dnavigationwidget.h b/src/app/3d/qgs3dnavigationwidget.h
@@ -20,7 +20,9 @@
 #include <QGridLayout>
 #include <QToolButton>
 
+Q_NOWARN_DEPRECATED_PUSH
 #include "qwt_compass.h"
+Q_NOWARN_DEPRECATED_POP
 
 #include "qgs3dmapcanvas.h"
 #include "qgscameracontroller.h"