Skip to content

Commit

Permalink
Fix 3D build
Browse files Browse the repository at this point in the history
  • Loading branch information
elpaso committed May 2, 2019
1 parent 290909f commit 748a73a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions python/core/auto_generated/qgsjsonutils.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ Parse a simple array (depth=1).




};

/************************************************************************
Expand Down
1 change: 1 addition & 0 deletions src/3d/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/expression
${CMAKE_SOURCE_DIR}/src/core/layout
${CMAKE_SOURCE_DIR}/src/core/3d
${CMAKE_SOURCE_DIR}/external
${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/3d
)
Expand Down
7 changes: 7 additions & 0 deletions src/core/qgsjsonutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ class CORE_EXPORT QgsJsonUtils
* richer export utilising settings like the layer's fields widget configuration.
* \param attributeWidgetCaches optional widget configuration cache. Can be used
* to speed up exporting the attributes for multiple features from the same layer.
* \note Not available in Python bindings
* \since QGIS 3.8
*/
static json exportAttributesToJsonObject( const QgsFeature &feature, QgsVectorLayer *layer = nullptr,
Expand All @@ -332,6 +333,12 @@ class CORE_EXPORT QgsJsonUtils
*/
static QVariantList parseArray( const QString &json, QVariant::Type type );


/**
* Converts a QVariant \a v to a json object
* \note Not available in Python bindings
* \since QGIS 3.10
*/
static json jsonFromVariant( const QVariant &v ) SIP_SKIP;


Expand Down
1 change: 1 addition & 0 deletions tests/src/3d/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ SET (util_SRCS)
# Don't forget to include output directory, otherwise
# the UI file won't be wrapped!
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/external
${CMAKE_SOURCE_DIR}/tests/core #for render checker class
${CMAKE_SOURCE_DIR}/src/3d
${CMAKE_SOURCE_DIR}/src/3d/chunks
Expand Down

0 comments on commit 748a73a

Please sign in to comment.