Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix merge conflict
Merge branch 'master' into skybox-feature
  • Loading branch information
NEDJIMAbelgacem committed Aug 4, 2020
2 parents 4ac66d0 + f2bbb3e commit 58d280b
Show file tree
Hide file tree
Showing 150 changed files with 4,760 additions and 890 deletions.
1 change: 1 addition & 0 deletions .flake8
Expand Up @@ -9,6 +9,7 @@ exclude =
# There is simply too much in here, somebody will need to check these manually
src/plugins/grass/scripts,
# Generated code, hacking allowed. Feel free to go over it
python/3d/auto_additions/,
python/core/auto_additions/,
python/analysis/auto_additions/,
python/gui/auto_additions/,
Expand Down
6 changes: 3 additions & 3 deletions debian/control
Expand Up @@ -114,9 +114,9 @@ Description: Geographic Information System (GIS)
Package: qgis-common
Architecture: all
Depends:
libjs-jquery,
libjs-leaflet,
${misc:Depends}
libjs-jquery,
libjs-leaflet,
${misc:Depends}
Description: QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
Expand Down
13 changes: 13 additions & 0 deletions debian/control.in
Expand Up @@ -465,6 +465,7 @@ Architecture: any
Depends:
qgis-server-dummy (= ${binary:Version}),
qgis-server-wms (= ${binary:Version}),
qgis-server-wmts (= ${binary:Version}),
qgis-server-wcs (= ${binary:Version}),
qgis-server-wfs (= ${binary:Version}),
qgis-server-wfs3 (= ${binary:Version}),
Expand Down Expand Up @@ -502,6 +503,18 @@ Description: QGIS server providing various OGC services
.
This package contains the wms service.

Package: qgis-server-wmts
Architecture: any
Depends:
qgis-server-common (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Description: QGIS server providing various OGC services
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the wmts service.

Package: qgis-server-wfs
Architecture: any
Depends:
Expand Down
4 changes: 2 additions & 2 deletions debian/rules
Expand Up @@ -120,11 +120,11 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid buster bionic eoan focal"))
-DWITH_3D=TRUE \
-DGEOS_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libgeos_c.so

$(shell test -f /usr/include/$(DEB_BUILD_MULTIARCH)/qt5/Qt3DExtras/qt3dextrasversion.h)
$(shell test -f /usr/include/$(DEB_BUILD_MULTIARCH)/qt5/Qt3DExtras/qt3dextrasversion.h -a -f /usr/lib/$(DEB_BUILD_MULTIARCH)/cmake/Qt53DExtras/Qt53DExtrasConfig.cmake)
ifneq (0,$(.SHELLSTATUS))
# Qt3DExtras intentionally removed from debian (#895386) and in turn ubuntu
CMAKE_OPTS += \
-DCMAKE_PREFIX_PATH=$(realpath external/qt3dextra-headers/cmake) \
-DQt53DExtras_DIR=$(realpath external/qt3dextra-headers/cmake/Qt53DExtras) \
-DQT5_3DEXTRA_INCLUDE_DIR=$(realpath external/qt3dextra-headers) \
-DQT5_3DEXTRA_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libQt53DExtras.so
endif
Expand Down
1 change: 1 addition & 0 deletions doc/CMakeLists.txt
Expand Up @@ -110,6 +110,7 @@ IF(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/analysis/vector/geometry_checker
${CMAKE_SOURCE_DIR}/src/3d
${CMAKE_SOURCE_DIR}/src/3d/chunks
${CMAKE_SOURCE_DIR}/src/3d/materials
${CMAKE_SOURCE_DIR}/src/3d/symbols
${CMAKE_SOURCE_DIR}/src/3d/terrain
${CMAKE_SOURCE_DIR}/src/plugins
Expand Down
5 changes: 5 additions & 0 deletions images/images.qrc
Expand Up @@ -284,6 +284,7 @@
<file>themes/default/mActionDeleteTable.svg</file>
<file>themes/default/mActionDeselectAll.svg</file>
<file>themes/default/mActionDeselectActiveLayer.svg</file>
<file>themes/default/mActionDigitizeWithCurve.svg</file>
<file>themes/default/mActionDuplicateLayer.svg</file>
<file>themes/default/mActionDuplicateComposer.svg</file>
<file>themes/default/mActionEditCopy.svg</file>
Expand Down Expand Up @@ -880,6 +881,10 @@
<file>themes/default/mIconAlignBottom.svg</file>
<file>themes/default/mIconAlignTop.svg</file>
<file>themes/default/mIconAlignVCenter.svg</file>
<file>themes/default/mIconPhongMaterial.svg</file>
<file>themes/default/mIconGoochMaterial.svg</file>
<file>themes/default/mIconSimpleLineMaterial.svg</file>
<file>themes/default/mIconPhongTexturedMaterial.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
Expand Down
72 changes: 72 additions & 0 deletions images/themes/default/mActionDigitizeWithCurve.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
85 changes: 85 additions & 0 deletions images/themes/default/mIconGoochMaterial.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
83 changes: 83 additions & 0 deletions images/themes/default/mIconPhongMaterial.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 58d280b

Please sign in to comment.