Skip to content
Permalink
Browse files

Drop Globe plugin

Dropping Globe plugin from the QGIS sources. It depends on osgearth no
newer than version 2.8, released on 2016-09-05, and which is impossible
to build against modern (Qt 5.13+) versions of Qt. With this, the
optional QGIS dependency on OpenSceneGraph and osgearth is also removed.
  • Loading branch information
espinafre authored and nyalldawson committed May 24, 2020
1 parent 817f194 commit c91e0e845042419c5da89719a18051fed326466f
Showing with 0 additions and 6,359 deletions.
  1. +0 −13 CMakeLists.txt
  2. +0 −132 cmake/FindOSGEARTH.cmake
  3. +0 −3 cmake_templates/qgsconfig.h.in
  4. +0 −1 debian/rules
  5. +0 −2 mac/CMakeLists.txt
  6. +0 −1 mac/cmake/0vars.cmake.in
  7. +0 −116 mac/cmake/1osg.cmake.in
  8. +0 −18 mac/cmake/1qt.cmake.in
  9. +0 −2 ms-windows/cygwin/package.sh
  10. +0 −1 ms-windows/osgeo4w/package-nightly.cmd
  11. +0 −1 ms-windows/osgeo4w/package.cmd
  12. +0 −4 src/plugins/CMakeLists.txt
  13. +0 −108 src/plugins/globe/CMakeLists.txt
  14. +0 −125 src/plugins/globe/CMakeModules/FindOSG.cmake
  15. +0 −185 src/plugins/globe/CMakeModules/FindOpenThreads.cmake
  16. +0 −11 src/plugins/globe/CMakeModules/ModuleInstallOsgEarthDriverIncludes.cmake
  17. +0 −361 src/plugins/globe/CMakeModules/OsgEarthMacroUtils.cmake
  18. +0 −50 src/plugins/globe/featuresource/CMakeLists.txt
  19. +0 −65 src/plugins/globe/featuresource/qgsglobefeaturecursor.h
  20. +0 −81 src/plugins/globe/featuresource/qgsglobefeatureoptions.h
  21. +0 −176 src/plugins/globe/featuresource/qgsglobefeaturesource.cpp
  22. +0 −73 src/plugins/globe/featuresource/qgsglobefeaturesource.h
  23. +0 −254 src/plugins/globe/featuresource/qgsglobefeatureutils.h
  24. +0 −1,303 src/plugins/globe/globe_plugin.cpp
  25. +0 −180 src/plugins/globe/globe_plugin.h
  26. +0 −6 src/plugins/globe/globe_plugin.qrc
  27. BIN src/plugins/globe/images/globe.png
  28. BIN src/plugins/globe/images/gui/MoveWheel.png
  29. BIN src/plugins/globe/images/gui/YawPitchWheel.png
  30. BIN src/plugins/globe/images/gui/button-background-single.png
  31. BIN src/plugins/globe/images/gui/button-background.png
  32. BIN src/plugins/globe/images/gui/refresh-view.png
  33. BIN src/plugins/globe/images/gui/settings.png
  34. BIN src/plugins/globe/images/gui/sync-extent.png
  35. BIN src/plugins/globe/images/gui/zoom-home.png
  36. BIN src/plugins/globe/images/gui/zoom-in.png
  37. BIN src/plugins/globe/images/gui/zoom-out.png
  38. +0 −143 src/plugins/globe/images/icon.svg
  39. BIN src/plugins/globe/images/originals/gui/move-down.png
  40. BIN src/plugins/globe/images/originals/gui/move-left.png
  41. BIN src/plugins/globe/images/originals/gui/move-right.png
  42. BIN src/plugins/globe/images/originals/gui/move-up.png
  43. BIN src/plugins/globe/images/originals/gui/refresh-view.png
  44. BIN src/plugins/globe/images/originals/gui/rotate-ccw.png
  45. BIN src/plugins/globe/images/originals/gui/rotate-cw.png
  46. BIN src/plugins/globe/images/originals/gui/rotate-reset.png
  47. BIN src/plugins/globe/images/originals/gui/sync-extent.png
  48. BIN src/plugins/globe/images/originals/gui/tilt-down.png
  49. BIN src/plugins/globe/images/originals/gui/tilt-up.png
  50. BIN src/plugins/globe/images/originals/gui/zoom-home.png
  51. BIN src/plugins/globe/images/originals/gui/zoom-in.png
  52. BIN src/plugins/globe/images/originals/gui/zoom-out.png
  53. BIN src/plugins/globe/images/world.tif
  54. +0 −87 src/plugins/globe/qgsglobefeatureidentify.cpp
  55. +0 −48 src/plugins/globe/qgsglobefeatureidentify.h
  56. +0 −68 src/plugins/globe/qgsglobefrustumhighlight.cpp
  57. +0 −44 src/plugins/globe/qgsglobefrustumhighlight.h
  58. +0 −551 src/plugins/globe/qgsglobeplugindialog.cpp
  59. +0 −83 src/plugins/globe/qgsglobeplugindialog.h
  60. +0 −677 src/plugins/globe/qgsglobeplugindialog.ui
  61. +0 −294 src/plugins/globe/qgsglobetilesource.cpp
  62. +0 −149 src/plugins/globe/qgsglobetilesource.h
  63. +0 −298 src/plugins/globe/qgsglobevectorlayerproperties.cpp
  64. +0 −133 src/plugins/globe/qgsglobevectorlayerproperties.h
  65. +0 −272 src/plugins/globe/qgsglobevectorlayerpropertiespage.ui
  66. +0 −152 src/plugins/globe/qgsglobewidget.cpp
  67. +0 −43 src/plugins/globe/qgsglobewidget.h
  68. +0 −20 src/plugins/globe/qgsosgfeature.cpp
  69. +0 −25 src/plugins/globe/qgsosgfeature.h
@@ -247,16 +247,6 @@ IF(WITH_CORE)

SET (WITH_GEOREFERENCER TRUE CACHE BOOL "Determines whether GeoReferencer plugin should be built")

SET (WITH_GLOBE FALSE CACHE BOOL "Determines whether Globe plugin should be built")
IF (WITH_GLOBE)
SET(QT_USE_QTOPENGL 1)
FIND_PACKAGE(OSGEARTH REQUIRED)
IF (OSGEARTHQT_LIBRARY)
# following variable is used in qgsconfig.h
SET(HAVE_OSGEARTHQT TRUE)
ENDIF (OSGEARTHQT_LIBRARY)
ENDIF (WITH_GLOBE)

SET (WITH_THREAD_LOCAL TRUE CACHE BOOL "Determines whether std::thread_local should be used")
MARK_AS_ADVANCED(WITH_THREAD_LOCAL)

@@ -746,9 +736,6 @@ IF (WITH_CORE)
# path for framework references when running from build directory
# changed later to reference in-app resources upon install
SET (CMAKE_INSTALL_NAME_DIR ${CMAKE_BINARY_DIR}/output/lib)
IF (WITH_GLOBE)
SET (OSG_PLUGINS_PATH "" CACHE PATH "Path to OSG plugins for bundling")
ENDIF (WITH_GLOBE)
# recent cmakes force SDKs, recent SDKs don't have user symlinks
# need to find non-system frameworks
# cmake bug #0007250 - CMAKE_SHARED_LINKER_FLAGS ignored when creating

This file was deleted.

@@ -43,7 +43,6 @@
#endif

#define QT_PLUGINS_DIR "${QT_PLUGINS_DIR}"
#define OSG_PLUGINS_PATH "${OSG_PLUGINS_PATH}"

#cmakedefine USING_NMAKE

@@ -55,8 +54,6 @@

#cmakedefine HAVE_ORACLE

#cmakedefine HAVE_OSGEARTHQT

#cmakedefine SERVER_SKIP_ECW

#cmakedefine HAVE_SERVER_PYTHON_PLUGINS
@@ -92,7 +92,6 @@ CMAKE_OPTS := \
-DWITH_APIDOC=TRUE \
-DGENERATE_QHP=TRUE \
-DWITH_CUSTOM_WIDGETS=TRUE \
-DWITH_GLOBE=FALSE \
-DWITH_SERVER=TRUE \
-DWITH_SERVER_PLUGINS=TRUE \
-DWITH_QWTPOLAR=FALSE \
@@ -8,8 +8,6 @@ IF (APPLE AND QGIS_MACAPP_BUNDLE GREATER -1)
INSTALL (SCRIPT ${CMAKE_BINARY_DIR}/mac/0qgis.cmake)
IF (QGIS_MACAPP_BUNDLE GREATER 0)
# start with Qt
CONFIGURE_FILE (cmake/1osg.cmake.in 1osg.cmake @ONLY)
INSTALL (SCRIPT ${CMAKE_BINARY_DIR}/mac/1osg.cmake)
CONFIGURE_FILE (cmake/1qt.cmake.in 1qt.cmake @ONLY)
INSTALL (SCRIPT ${CMAKE_BINARY_DIR}/mac/1qt.cmake)
IF (QGIS_MACAPP_BUNDLE GREATER 1)
@@ -41,7 +41,6 @@ SET (QGIS_DATA_SUBDIR_REV "@QGIS_DATA_SUBDIR_REV@")
SET (QGIS_SERVER_MODULE_SUBDIR "@QGIS_SERVER_MODULE_SUBDIR@")

# optional components
SET (WITH_GLOBE "@WITH_GLOBE@")
SET (WITH_GRASS "@WITH_GRASS@")
SET (WITH_SERVER "@WITH_SERVER@")
SET (WITH_POSTGRESQL "@WITH_POSTGRESQL@")

This file was deleted.

@@ -34,11 +34,6 @@ IF(@WITH_3D@)
SET (PYQTLIST ${PYQTLIST} Qt3DCore Qt3DRender Qt3DInput Qt3DLogic Qt3DExtras QtGamepad)
ENDIF ()

IF(@WITH_GLOBE@)
SET (QTLISTQG ${QTLISTQG} QtOpenGL)
SET (PYQTLIST ${PYQTLIST} QtOpenGL)
ENDIF ()

# add Qsci.so, if available
IF (@QSCI_FOUND@)
SET (PYQTLIST ${PYQTLIST} Qsci)
@@ -482,15 +477,6 @@ FOREACH (QFW ${QTLISTQG})
ENDIF ()
INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QFWDIR}/${_qca_libname}.framework/${_qca_libname}")
ENDIF (ISLIB)
# osgEarthQt
IF (@HAVE_OSGEARTHQT@)
IF (@OSX_HAVE_LOADERPATH@)
SET (QFW_CHG_TO "${ATLOADER}/../../../${LIBPOST}")
ENDIF ()
FOREACH (OSGFW osgQt osgEarthQt)
INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QFWDIR}/${OSGFW}.framework/${OSGFW}")
ENDFOREACH (OSGFW)
ENDIF (@HAVE_OSGEARTHQT@)
# QScintilla2
IF (@OSX_HAVE_LOADERPATH@)
SET (QFW_CHG_TO "${ATLOADER}/${QGIS_LIB_SUBDIR_REV}/${QGIS_FW_SUBDIR}/${LIBPOST}")
@@ -504,10 +490,6 @@ FOREACH (QFW ${QTLISTQG})
FOREACH (qca_plugin ${QCA_PLUGINS})
INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../crypto/libqca-${qca_plugin}.dylib")
ENDFOREACH ()
# osg qfont plugin
IF (@HAVE_OSGEARTHQT@)
INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../osgPlugins/osgdb_qfont.so")
ENDIF (@HAVE_OSGEARTHQT@)
FOREACH (QI qgif;qico;qjpeg;qsvg;qtiff)
INSTALLNAMETOOL_CHANGE ("${QFW_CHG}" "${QFW_CHG_TO}" "${QPLUGDIR}/../imageformats/lib${QI}.dylib")
ENDFOREACH (QI)
@@ -27,12 +27,10 @@ cmake -D BUILDNAME="cygwin" \
-D WITH_SPATIALITE=TRUE \
-D WITH_QSPATIALITE=TRUE \
-D WITH_SERVER=TRUE \
-D WITH_GLOBE=TRUE \
-D WITH_ORACLE=FALSE \
-D CMAKE_LEGACY_CYGWIN_WIN32=0 \
-D PYUIC4_PROGRAM=/usr/lib/python2.7/site-packages/PyQt4/pyuic4 \
-D PYRCC4_PROGRAM=/usr/lib/python2.7/site-packages/PyQt4/pyrcc4.exe \
-D WITH_GLOBE=NO \
-D ENABLE_TESTS=YES \
-D CMAKE_INSTALL_PREFIX=/usr \
-D WITH_CUSTOM_WIDGETS=TRUE \
@@ -127,7 +127,6 @@ cmake -G "%CMAKEGEN%" ^
-D WITH_3D=TRUE ^
-D WITH_GRASS7=TRUE ^
-D GRASS_PREFIX7=%GRASS_PREFIX:\=/% ^
-D WITH_GLOBE=FALSE ^
-D WITH_ORACLE=TRUE ^
-D WITH_CUSTOM_WIDGETS=TRUE ^
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
@@ -130,7 +130,6 @@ cmake -G "%CMAKEGEN%" ^
-D WITH_3D=TRUE ^
-D WITH_GRASS7=TRUE ^
-D GRASS_PREFIX7=%GRASS_PREFIX:\=/% ^
-D WITH_GLOBE=FALSE ^
-D WITH_ORACLE=TRUE ^
-D WITH_CUSTOM_WIDGETS=TRUE ^
-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
@@ -21,10 +21,6 @@ IF (WITH_GEOREFERENCER)
ADD_SUBDIRECTORY(georeferencer)
ENDIF (WITH_GEOREFERENCER)

IF (WITH_GLOBE)
ADD_SUBDIRECTORY(globe)
ENDIF (WITH_GLOBE)

IF (CUSTOM_PLUGINS)
ADD_SUBDIRECTORY(${CUSTOM_PLUGINS})
ENDIF (CUSTOM_PLUGINS)

0 comments on commit c91e0e8

Please sign in to comment.
You can’t perform that action at this time.