Install various missing headers and fix some includes to work with in…

…stalled headers
qgis · Jan 15, 2020 · be42816 · be42816
1 parent 34d3aaa
commit be42816
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -522,6 +522,7 @@ INCLUDE_DIRECTORIES(
   ../gui/symbology
   ../gui/attributetable
   ../gui/auth
+  ../gui/effects
   ../gui/ogr
   ../gui/raster
   ../gui/editorwidgets

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1218,6 +1218,7 @@ SET(QGIS_CORE_HDRS
   raster/qgsrasterpyramid.h
   raster/qgsrasterrange.h
   raster/qgsrasterrenderer.h
+  raster/qgsrasterrendererregistry.h
   raster/qgsrasterresamplefilter.h
   raster/qgsrasterresampler.h
   raster/qgsrastershader.h

diff --git a/src/core/geometry/qgsabstractgeometry.h b/src/core/geometry/qgsabstractgeometry.h
@@ -25,7 +25,7 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgswkbptr.h"
 
 #ifndef SIP_RUN
-#include <json_fwd.hpp>
+#include "json_fwd.hpp"
 using namespace nlohmann;
 #endif
 

diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -37,7 +37,7 @@ email                : morb at ozemail dot com dot au
 #include "qgsfeatureid.h"
 
 #ifndef SIP_RUN
-#include <json_fwd.hpp>
+#include "json_fwd.hpp"
 using namespace nlohmann;
 #endif
 

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -914,6 +914,8 @@ SET_PROPERTY(GLOBAL PROPERTY QGIS_GUI_HDRS ${QGIS_GUI_HDRS})
 
 
 SET(QGIS_GUI_UI_HDRS
+  ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsadvanceddigitizingdockwidgetbase.h
+  ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsadvanceddigitizingfloaterbase.h
   ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsauthauthoritieseditor.h
   ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsauthcertificateinfo.h
   ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsauthcertificatemanager.h
@@ -952,6 +954,8 @@ SET(QGIS_GUI_UI_HDRS
   ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgssqlcomposerdialogbase.h
   ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgssublayersdialogbase.h
   ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgstablewidgetuibase.h
+  ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsrendererpropsdialogbase.h
+  ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgseffectstackpropertieswidgetbase.h
 )
 
 IF(ENABLE_MODELTEST)

diff --git a/src/ui/qgsrendererpropsdialogbase.ui b/src/ui/qgsrendererpropsdialogbase.ui
@@ -247,7 +247,7 @@
   <customwidget>
    <class>QgsEffectStackCompactWidget</class>
    <extends>QWidget</extends>
-   <header>effects/qgseffectstackpropertieswidget.h</header>
+   <header>qgseffectstackpropertieswidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>