Repair files not included in install

qgis · Feb 6, 2023 · 43f81c1 · 43f81c1
1 parent 9ac5459
commit 43f81c1
Show file tree

Hide file tree

Showing 48 changed files with 303 additions and 57 deletions.
diff --git a/src/3d/processing/qgs3dalgorithms.h b/src/3d/processing/qgs3dalgorithms.h
@@ -20,7 +20,7 @@
 
 #include "qgis_3d.h"
 #include "qgis.h"
-#include "processing/qgsprocessingprovider.h"
+#include "qgsprocessingprovider.h"
 
 /**
  * \ingroup analysis

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h b/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h
@@ -19,8 +19,8 @@
 
 #include "qgis_analysis.h"
 #include "qgsfeature.h"
-#include "geometry/qgsabstractgeometry.h"
-#include "geometry/qgspoint.h"
+#include "qgsabstractgeometry.h"
+#include "qgspoint.h"
 #include "qgsgeometrycheckcontext.h"
 #include <qmath.h>
 

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -519,6 +519,7 @@ target_include_directories(qgis_app PUBLIC
 
   ${CMAKE_SOURCE_DIR}/src/app
   ${CMAKE_SOURCE_DIR}/src/app/decorations
+  ${CMAKE_SOURCE_DIR}/src/app/devtools
   ${CMAKE_SOURCE_DIR}/src/app/devtools/networklogger
   ${CMAKE_SOURCE_DIR}/src/app/labeling
   ${CMAKE_SOURCE_DIR}/src/app/layout
@@ -528,6 +529,7 @@ target_include_directories(qgis_app PUBLIC
   ${CMAKE_SOURCE_DIR}/src/app/maptools
   ${CMAKE_SOURCE_DIR}/src/app/mesh
   ${CMAKE_SOURCE_DIR}/src/app/locator
+  ${CMAKE_SOURCE_DIR}/src/app/options
   ${CMAKE_SOURCE_DIR}/src/app/pointcloud
   ${CMAKE_SOURCE_DIR}/src/app/vectortile
   ${CMAKE_SOURCE_DIR}/src/plugins

diff --git a/src/app/decorations/qgsdecorationscalebar.h b/src/app/decorations/qgsdecorationscalebar.h
@@ -23,8 +23,8 @@ email                : [email protected]
 
 #include "qgis.h"
 #include "qgsdecorationitem.h"
-#include "scalebar/qgsscalebarsettings.h"
-#include "scalebar/qgsscalebarrenderer.h"
+#include "qgsscalebarsettings.h"
+#include "qgsscalebarrenderer.h"
 
 class QPainter;
 

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -180,12 +180,12 @@ class QgsAppGpsSettingsMenu;
 #include "qgsattributetablefiltermodel.h"
 #include "qgsmasterlayoutinterface.h"
 #include "qgsmaptoolselect.h"
-#include "ogr/qgsvectorlayersaveasdialog.h"
+#include "qgsvectorlayersaveasdialog.h"
 #include "qgis.h"
 #include "ui_qgisapp.h"
 #include "qgis_app.h"
-#include "devtools/qgsappdevtoolutils.h"
-#include "options/qgsoptionsutils.h"
+#include "qgsappdevtoolutils.h"
+#include "qgsoptionsutils.h"
 
 #include <QGestureEvent>
 #include <QTapAndHoldGesture>

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1193,6 +1193,7 @@ set(QGIS_CORE_HDRS
   qgssourcecache.h
   qgsspatialiteutils.h
   qgssqlexpressioncompiler.h
+  qgssqliteexpressioncompiler.h
   qgssqliteutils.h
   qgssqlstatement.h
   qgsstatisticalsummary.h
@@ -1313,6 +1314,8 @@ set(QGIS_CORE_HDRS
   diagram/qgstextdiagram.h
 
   dxf/qgsdxfexport.h
+  dxf/qgsdxfpaintdevice.h
+  dxf/qgsdxfpaintengine.h
 
   editform/qgseditformconfig.h
   editform/qgsattributeeditoraction.h
@@ -1819,6 +1822,7 @@ set(QGIS_CORE_HDRS
   symbology/qgsmapinfosymbolconverter.h
   symbology/qgsmarkersymbol.h
   symbology/qgsmarkersymbollayer.h
+  symbology/qgsmasksymbollayer.h
   symbology/qgsmergedfeaturerenderer.h
   symbology/qgsnullsymbolrenderer.h
   symbology/qgspointclusterrenderer.h

diff --git a/src/core/externalstorage/qgshttpexternalstorage_p.h b/src/core/externalstorage/qgshttpexternalstorage_p.h
@@ -20,7 +20,7 @@
 #include "qgis_sip.h"
 #include "qgstaskmanager.h"
 
-#include "externalstorage/qgsexternalstorage.h"
+#include "qgsexternalstorage.h"
 
 #include <QPointer>
 #include <QUrl>

diff --git a/src/core/externalstorage/qgssimplecopyexternalstorage_p.h b/src/core/externalstorage/qgssimplecopyexternalstorage_p.h
@@ -16,7 +16,7 @@
 #ifndef QGSSIMPLECOPYEXTERNALSTORAGE_H
 #define QGSSIMPLECOPYEXTERNALSTORAGE_H
 
-#include "externalstorage/qgsexternalstorage.h"
+#include "qgsexternalstorage.h"
 #include "qgis_core.h"
 #include "qgis_sip.h"
 

diff --git a/src/core/layout/qgslayoutitemscalebar.h b/src/core/layout/qgslayoutitemscalebar.h
@@ -19,8 +19,8 @@
 #include "qgis_core.h"
 #include "qgis_sip.h"
 #include "qgslayoutitem.h"
-#include "scalebar/qgsscalebarsettings.h"
-#include "scalebar/qgsscalebarrenderer.h"
+#include "qgsscalebarsettings.h"
+#include "qgsscalebarrenderer.h"
 #include <QFont>
 #include <QPen>
 #include <QColor>

diff --git a/src/core/qgsdiagramrenderer.h b/src/core/qgsdiagramrenderer.h
@@ -30,7 +30,7 @@
 #include "qgsproperty.h"
 #include "qgspropertycollection.h"
 
-#include "diagram/qgsdiagram.h"
+#include "qgsdiagram.h"
 #include "qgsreadwritecontext.h"
 #include "qgsmapunitscale.h"
 

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
diff --git a/src/gui/editorwidgets/qgssearchwidgettoolbutton.h b/src/gui/editorwidgets/qgssearchwidgettoolbutton.h
@@ -16,7 +16,7 @@
 #ifndef QGSSEARCHWIDGETTOOLBUTTON_H
 #define QGSSEARCHWIDGETTOOLBUTTON_H
 
-#include "editorwidgets/core/qgssearchwidgetwrapper.h"
+#include "qgssearchwidgetwrapper.h"
 #include "qgis_sip.h"
 #include <QToolButton>
 #include "qgis_gui.h"

diff --git a/src/gui/processing/models/qgsmodelgroupboxdefinitionwidget.h b/src/gui/processing/models/qgsmodelgroupboxdefinitionwidget.h
@@ -21,7 +21,7 @@
 
 #include <QWidget>
 #include <QDialog>
-#include "processing/models/qgsprocessingmodelgroupbox.h"
+#include "qgsprocessingmodelgroupbox.h"
 #include "qgis_gui.h"
 
 #define SIP_NO_FILE

diff --git a/src/gui/processing/models/qgsmodelinputreorderwidget.h b/src/gui/processing/models/qgsmodelinputreorderwidget.h
@@ -21,7 +21,7 @@
 #include "qgis.h"
 #include "qgis_gui.h"
 #include "ui_qgsmodelinputreorderwidgetbase.h"
-#include "processing/models/qgsprocessingmodelparameter.h"
+#include "qgsprocessingmodelparameter.h"
 #include <QDialog>
 
 class QStandardItemModel;

diff --git a/src/gui/processing/qgsprocessingalgorithmdialogbase.h b/src/gui/processing/qgsprocessingalgorithmdialogbase.h
@@ -20,8 +20,8 @@
 #include "qgis_gui.h"
 #include "ui_qgsprocessingalgorithmdialogbase.h"
 #include "ui_qgsprocessingalgorithmprogressdialogbase.h"
-#include "processing/qgsprocessingcontext.h"
-#include "processing/qgsprocessingfeedback.h"
+#include "qgsprocessingcontext.h"
+#include "qgsprocessingfeedback.h"
 #include "qgsprocessingwidgetwrapper.h"
 
 ///@cond NOT_STABLE

diff --git a/src/gui/processing/qgsprocessingmodelerparameterwidget.h b/src/gui/processing/qgsprocessingmodelerparameterwidget.h
@@ -24,7 +24,7 @@
 #include "qgis_sip.h"
 #include <QPointer>
 #include "qgsprocessingcontext.h"
-#include "processing/models/qgsprocessingmodelchildparametersource.h"
+#include "qgsprocessingmodelchildparametersource.h"
 
 class QgsProcessingParameterDefinition;
 class QgsAbstractProcessingParameterWidgetWrapper;

diff --git a/src/gui/processing/qgsprocessingwidgetwrapperimpl.h b/src/gui/processing/qgsprocessingwidgetwrapperimpl.h
@@ -24,7 +24,7 @@
 #include "qgsprocessingparameterdefinitionwidget.h"
 #include "qgsmaptool.h"
 #include "qgsprocessingcontext.h"
-#include "processing/models/qgsprocessingmodelchildparametersource.h"
+#include "qgsprocessingmodelchildparametersource.h"
 
 #include <QAbstractButton>
 

diff --git a/src/ui/3d/qgsmesh3dpropswidget.ui b/src/ui/3d/qgsmesh3dpropswidget.ui
@@ -427,7 +427,7 @@
   <customwidget>
    <class>QgsColorRampShaderWidget</class>
    <extends>QWidget</extends>
-   <header>raster/qgscolorrampshaderwidget.h</header>
+   <header>qgscolorrampshaderwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>

diff --git a/src/ui/3d/qgspointcloud3dsymbolwidget.ui b/src/ui/3d/qgspointcloud3dsymbolwidget.ui
@@ -629,7 +629,7 @@ enhancement</string>
   <customwidget>
    <class>QgsColorRampShaderWidget</class>
    <extends>QWidget</extends>
-   <header>raster/qgscolorrampshaderwidget.h</header>
+   <header>qgscolorrampshaderwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>

diff --git a/src/ui/editorwidgets/qgsexternalresourceconfigdlg.ui b/src/ui/editorwidgets/qgsexternalresourceconfigdlg.ui
@@ -456,7 +456,7 @@
   <customwidget>
    <class>QgsAuthSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>auth/qgsauthsettingswidget.h</header>
+   <header>qgsauthsettingswidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff --git a/src/ui/mesh/qgsmeshrendererscalarsettingswidgetbase.ui b/src/ui/mesh/qgsmeshrendererscalarsettingswidgetbase.ui
@@ -236,7 +236,7 @@
   <customwidget>
    <class>QgsColorRampShaderWidget</class>
    <extends>QWidget</extends>
-   <header>raster/qgscolorrampshaderwidget.h</header>
+   <header>qgscolorrampshaderwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>

diff --git a/src/ui/mesh/qgsmeshrenderervectorsettingswidgetbase.ui b/src/ui/mesh/qgsmeshrenderervectorsettingswidgetbase.ui
@@ -693,7 +693,7 @@
   <customwidget>
    <class>QgsColorRampShaderWidget</class>
    <extends>QWidget</extends>
-   <header>raster/qgscolorrampshaderwidget.h</header>
+   <header>qgscolorrampshaderwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>

diff --git a/src/ui/mesh/qgsrenderermeshpropswidgetbase.ui b/src/ui/mesh/qgsrenderermeshpropswidgetbase.ui
@@ -494,31 +494,31 @@
   <customwidget>
    <class>QgsMeshRendererScalarSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>mesh/qgsmeshrendererscalarsettingswidget.h</header>
+   <header>qgsmeshrendererscalarsettingswidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QgsMeshRendererActiveDatasetWidget</class>
    <extends>QWidget</extends>
-   <header>mesh/qgsmeshrendereractivedatasetwidget.h</header>
+   <header>qgsmeshrendereractivedatasetwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QgsMeshRendererMeshSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>mesh/qgsmeshrenderermeshsettingswidget.h</header>
+   <header>qgsmeshrenderermeshsettingswidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QgsMeshRendererVectorSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>mesh/qgsmeshrenderervectorsettingswidget.h</header>
+   <header>qgsmeshrenderervectorsettingswidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QgsMeshRenderer3dAveragingWidget</class>
    <extends>QWidget</extends>
-   <header>mesh/qgsmeshrenderer3daveragingwidget.h</header>
+   <header>qgsmeshrenderer3daveragingwidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff --git a/src/ui/pointcloud/qgspointcloudattributebyramprendererwidgetbase.ui b/src/ui/pointcloud/qgspointcloudattributebyramprendererwidgetbase.ui
@@ -116,7 +116,7 @@
   <customwidget>
    <class>QgsColorRampShaderWidget</class>
    <extends>QWidget</extends>
-   <header>raster/qgscolorrampshaderwidget.h</header>
+   <header>qgscolorrampshaderwidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff --git a/src/ui/pointcloud/qgspointcloudsourceselectbase.ui b/src/ui/pointcloud/qgspointcloudsourceselectbase.ui
@@ -241,7 +241,7 @@
   <customwidget>
    <class>QgsAuthSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>auth/qgsauthsettingswidget.h</header>
+   <header>qgsauthsettingswidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff --git a/src/ui/qgsarcgisrestsourcewidgetbase.ui b/src/ui/qgsarcgisrestsourcewidgetbase.ui
@@ -73,7 +73,7 @@
   <customwidget>
    <class>QgsAuthSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>auth/qgsauthsettingswidget.h</header>
+   <header>qgsauthsettingswidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>

diff --git a/src/ui/qgsarcgisvectortileconnectiondialog.ui b/src/ui/qgsarcgisvectortileconnectiondialog.ui
@@ -174,7 +174,7 @@
   <customwidget>
    <class>QgsAuthSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>auth/qgsauthsettingswidget.h</header>
+   <header>qgsauthsettingswidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>

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

diff --git a/src/ui/qgsdualviewbase.ui b/src/ui/qgsdualviewbase.ui
@@ -399,12 +399,12 @@
   <customwidget>
    <class>QgsAttributeTableView</class>
    <extends>QTableView</extends>
-   <header>attributetable/qgsattributetableview.h</header>
+   <header>qgsattributetableview.h</header>
   </customwidget>
   <customwidget>
    <class>QgsFeatureListView</class>
    <extends>QListView</extends>
-   <header>attributetable/qgsfeaturelistview.h</header>
+   <header>qgsfeaturelistview.h</header>
   </customwidget>
   <customwidget>
    <class>QgsPanelWidgetStack</class>

diff --git a/src/ui/qgsgdalsourceselectbase.ui b/src/ui/qgsgdalsourceselectbase.ui
@@ -264,7 +264,7 @@
   <customwidget>
    <class>QgsAuthSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>auth/qgsauthsettingswidget.h</header>
+   <header>qgsauthsettingswidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff --git a/src/ui/qgshananewconnectionbase.ui b/src/ui/qgshananewconnectionbase.ui
@@ -939,7 +939,7 @@
   <customwidget>
    <class>QgsAuthSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>auth/qgsauthsettingswidget.h</header>
+   <header>qgsauthsettingswidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff --git a/src/ui/qgsmultibandcolorrendererwidgetbase.ui b/src/ui/qgsmultibandcolorrendererwidgetbase.ui
@@ -236,7 +236,7 @@ enhancement</string>
   <customwidget>
    <class>QgsRasterBandComboBox</class>
    <extends>QComboBox</extends>
-   <header>raster/qgsrasterbandcombobox.h</header>
+   <header>qgsrasterbandcombobox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>

diff --git a/src/ui/qgsnewarcgisrestconnectionbase.ui b/src/ui/qgsnewarcgisrestconnectionbase.ui
@@ -188,7 +188,7 @@
   <customwidget>
    <class>QgsAuthSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>auth/qgsauthsettingswidget.h</header>
+   <header>qgsauthsettingswidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>

diff --git a/src/ui/qgsnewhttpconnectionbase.ui b/src/ui/qgsnewhttpconnectionbase.ui
@@ -339,7 +339,7 @@
   <customwidget>
    <class>QgsAuthSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>auth/qgsauthsettingswidget.h</header>
+   <header>qgsauthsettingswidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>

diff --git a/src/ui/qgsnewogrconnectionbase.ui b/src/ui/qgsnewogrconnectionbase.ui
@@ -175,7 +175,7 @@
   <customwidget>
    <class>QgsAuthSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>auth/qgsauthsettingswidget.h</header>
+   <header>qgsauthsettingswidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

diff --git a/src/ui/qgsogrsourceselectbase.ui b/src/ui/qgsogrsourceselectbase.ui
@@ -450,7 +450,7 @@
   <customwidget>
    <class>QgsAuthSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>auth/qgsauthsettingswidget.h</header>
+   <header>qgsauthsettingswidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>

diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
@@ -5166,7 +5166,7 @@ p, li { white-space: pre-wrap; }
   <customwidget>
    <class>QgsAuthSettingsWidget</class>
    <extends>QWidget</extends>
-   <header>auth/qgsauthsettingswidget.h</header>
+   <header>qgsauthsettingswidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>