Skip to content
Permalink
Browse files

fix travis and 5.14 builds

  • Loading branch information
PeterPetrik authored and nyalldawson committed Oct 26, 2020
1 parent ac6116c commit 2017f742f3f8f3b3df59d0255a1b250453f46c32
Showing with 6 additions and 0 deletions.
  1. +4 −0 src/3d/qgspointcloudlayerchunkloader_p.cpp
  2. +2 −0 src/app/3d/qgs3dnavigationwidget.h
@@ -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 );
@@ -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"

0 comments on commit 2017f74

Please sign in to comment.
You can’t perform that action at this time.