Install missing headers, fix includes from installed location

qgis · Jun 23, 2021 · 83f7302 · 83f7302
1 parent bae9214
commit 83f7302
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 3 deletions.
diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -184,6 +184,7 @@
 %Include auto_generated/qgstransactiongroup.sip
 %Include auto_generated/qgstranslationcontext.sip
 %Include auto_generated/qgsunittypes.sip
+%Include auto_generated/qgsuserprofile.sip
 %Include auto_generated/qgsuserprofilemanager.sip
 %Include auto_generated/qgsvector.sip
 %Include auto_generated/qgsvector3d.sip
@@ -659,4 +660,3 @@
 %Include auto_generated/gps/qgsqtlocationconnection.sip
 %Include auto_generated/gps/qgsgpsconnectionregistry.sip
 %Include auto_generated/symbology/qgsmasksymbollayer.sip
-%Include auto_generated/qgsuserprofile.sip
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1082,6 +1082,7 @@ set(QGIS_CORE_HDRS
   qgstransactiongroup.h
   qgstranslationcontext.h
   qgsunittypes.h
+  qgsuserprofile.h
   qgsuserprofilemanager.h
   qgsvector.h
   qgsvector3d.h
@@ -1374,6 +1375,22 @@ set(QGIS_CORE_HDRS
   mesh/qgsmeshcalcutils.h
   mesh/qgsmeshvirtualdatasetgroup.h
 
+  pal/costcalculator.h
+  pal/feature.h
+  pal/geomfunction.h
+  pal/internalexception.h
+  pal/labelposition.h
+  pal/layer.h
+  pal/palexception.h
+  pal/pal.h
+  pal/palrtree.h
+  pal/palstat.h
+  pal/pointset.h
+  pal/priorityqueue.h
+  pal/problem.h
+  pal/util.h
+  ${PROJECT_SOURCE_DIR}/external/rtree/include/RTree.h
+
   pointcloud/qgspointcloudattribute.h
   pointcloud/qgspointcloudattributebyramprenderer.h
   pointcloud/qgspointcloudattributemodel.h

diff --git a/src/core/pal/internalexception.h b/src/core/pal/internalexception.h
@@ -30,6 +30,8 @@
 #ifndef INTERNAL_EXCEPTION_H
 #define INTERNAL_EXCEPTION_H
 
+#define SIP_NO_FILE
+
 #include <exception>
 
 namespace pal

diff --git a/src/core/pal/palexception.h b/src/core/pal/palexception.h
@@ -30,6 +30,8 @@
 #ifndef PAL_EXCEPTION_H
 #define PAL_EXCEPTION_H
 
+#define SIP_NO_FILE
+
 #include <exception>
 
 

diff --git a/src/core/symbology/qgsstyle.h b/src/core/symbology/qgsstyle.h
@@ -28,7 +28,7 @@
 #include "qgssymbollayerutils.h" // QgsStringMap
 #include "qgstextformat.h"
 #include "qgspallabeling.h"
-#include "layertree/qgslegendpatchshape.h"
+#include "qgslegendpatchshape.h"
 
 class QgsSymbol;
 class QgsSymbolLayer;

diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui
@@ -2603,7 +2603,7 @@ border-radius: 2px;</string>
   <customwidget>
    <class>QgsVariableEditorWidget</class>
    <extends>QWidget</extends>
-   <header location="global">qgsvariableeditorwidget.h</header>
+   <header>qgsvariableeditorwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>