Skip to content
Permalink
Browse files
slim qgsquick to micro-core (#43204)
Keep only files that are used in both Input and QField in QgsQuick as basis of the QML library that can grow further.


Co-authored-by: Denis Rouzaud <denis.rouzaud@gmail.com>
  • Loading branch information
PeterPetrik and 3nids committed May 14, 2021
1 parent 204fc2a commit c40b4643b98ee22977e13fb60a87c38cadd3bec3
Showing with 13 additions and 9,536 deletions.
  1. +1 −1 .docker/docker-qgis-build.sh
  2. +0 −2 CMakeLists.txt
  3. +0 −48 cmake/FindQtQmlTools.cmake
  4. +0 −37 src/quickgui/CMakeLists.txt
  5. +0 −93 src/quickgui/attributes/qgsquickattributeformmodel.cpp
  6. +0 −145 src/quickgui/attributes/qgsquickattributeformmodel.h
  7. +0 −471 src/quickgui/attributes/qgsquickattributeformmodelbase.cpp
  8. +0 −157 src/quickgui/attributes/qgsquickattributeformmodelbase.h
  9. +0 −480 src/quickgui/attributes/qgsquickattributemodel.cpp
  10. +0 −201 src/quickgui/attributes/qgsquickattributemodel.h
  11. +0 −198 src/quickgui/attributes/qgsquicksubmodel.cpp
  12. +0 −93 src/quickgui/attributes/qgsquicksubmodel.h
  13. +0 −1 src/quickgui/images/ic_angle_down.svg
  14. +0 −1 src/quickgui/images/ic_angle_right.svg
  15. +0 −1 src/quickgui/images/ic_back.svg
  16. +0 −1 src/quickgui/images/ic_broken_image_black.svg
  17. +0 −1 src/quickgui/images/ic_camera.svg
  18. +0 −1 src/quickgui/images/ic_camera_alt_border.svg
  19. +0 −1 src/quickgui/images/ic_check_black.svg
  20. +0 −1 src/quickgui/images/ic_clear_black.svg
  21. +0 −4 src/quickgui/images/ic_clear_white.svg
  22. +0 −1 src/quickgui/images/ic_delete_forever_white.svg
  23. +0 −1 src/quickgui/images/ic_gallery.svg
  24. +0 −1 src/quickgui/images/ic_navigation_black.svg
  25. +0 −1 src/quickgui/images/ic_photo_notavailable_white.svg
  26. +0 −1 src/quickgui/images/ic_save_white.svg
  27. +0 −1 src/quickgui/images/ic_today.svg
  28. +0 −19 src/quickgui/images/images.qrc
  29. +0 −43 src/quickgui/plugin/CMakeLists.txt
  30. +0 −89 src/quickgui/plugin/components/qgsquickcheckboxcomponent.qml
  31. +0 −82 src/quickgui/plugin/components/qgsquickicontextitem.qml
  32. +0 −46 src/quickgui/plugin/components/qgsquickswitch.qml
  33. +0 −98 src/quickgui/plugin/editor/qgsquickcheckbox.qml
  34. +0 −327 src/quickgui/plugin/editor/qgsquickdatetime.qml
  35. +0 −108 src/quickgui/plugin/editor/qgsquickeditorwidgetcombobox.qml
  36. +0 −335 src/quickgui/plugin/editor/qgsquickexternalresource.qml
  37. +0 −226 src/quickgui/plugin/editor/qgsquickrange.qml
  38. +0 −151 src/quickgui/plugin/editor/qgsquicktextedit.qml
  39. +0 −95 src/quickgui/plugin/editor/qgsquickvaluemap.qml
  40. +0 −237 src/quickgui/plugin/editor/qgsquickvaluerelation.qml
  41. +0 −17 src/quickgui/plugin/ios/qgsquick.qrc
  42. +1 −12 src/quickgui/plugin/ios/qmldir
  43. +0 −771 src/quickgui/plugin/qgsquickfeatureform.qml
  44. +0 −99 src/quickgui/plugin/qgsquickfeatureformstyling.qml
  45. +0 −98 src/quickgui/plugin/qgsquickmessagelog.qml
  46. +0 −265 src/quickgui/plugin/qgsquickphotopanel.qml
  47. +0 −23 src/quickgui/plugin/qgsquickplugin.cpp
  48. +0 −115 src/quickgui/plugin/qgsquickpositionmarker.qml
  49. +0 −145 src/quickgui/plugin/qgsquickscalebar.qml
  50. +0 −12 src/quickgui/plugin/qmldir
  51. +0 −84 src/quickgui/qgsquickfeaturehighlight.cpp
  52. +0 −99 src/quickgui/qgsquickfeaturehighlight.h
  53. +0 −70 src/quickgui/qgsquickfeaturelayerpair.cpp
  54. +0 −114 src/quickgui/qgsquickfeaturelayerpair.h
  55. +0 −372 src/quickgui/qgsquickfeatureslistmodel.cpp
  56. +0 −233 src/quickgui/qgsquickfeatureslistmodel.h
  57. +0 −174 src/quickgui/qgsquickhighlightsgnode.cpp
  58. +0 −65 src/quickgui/qgsquickhighlightsgnode.h
  59. +0 −283 src/quickgui/qgsquickidentifykit.cpp
  60. +0 −174 src/quickgui/qgsquickidentifykit.h
  61. +1 −0 src/quickgui/qgsquickmapcanvasmap.cpp
  62. +0 −76 src/quickgui/qgsquickmessagelogmodel.cpp
  63. +0 −80 src/quickgui/qgsquickmessagelogmodel.h
  64. +0 −341 src/quickgui/qgsquickpositionkit.cpp
  65. +0 −267 src/quickgui/qgsquickpositionkit.h
  66. +0 −112 src/quickgui/qgsquickscalebarkit.cpp
  67. +0 −137 src/quickgui/qgsquickscalebarkit.h
  68. +0 −104 src/quickgui/qgsquicksimulatedpositionsource.cpp
  69. +0 −86 src/quickgui/qgsquicksimulatedpositionsource.h
  70. +10 −404 src/quickgui/qgsquickutils.cpp
  71. +0 −226 src/quickgui/qgsquickutils.h
  72. +0 −4 tests/src/quickgui/CMakeLists.txt
  73. +0 −1 tests/src/quickgui/app/CMakeLists.txt
  74. +0 −73 tests/src/quickgui/app/FeaturePanel.qml
  75. +0 −6 tests/src/quickgui/app/main.cpp
  76. +0 −140 tests/src/quickgui/app/main.qml
  77. +0 −1 tests/src/quickgui/app/qml.qrc
  78. +0 −185 tests/src/quickgui/testqgsquickidentifykit.cpp
  79. +0 −59 tests/src/quickgui/testqgsquickpositionkit.cpp
  80. +0 −63 tests/src/quickgui/testqgsquickscalebarkit.cpp
  81. +0 −146 tests/src/quickgui/testqgsquickutils.cpp
@@ -46,7 +46,7 @@ fi
cmake \
-GNinja \
-DUSE_CCACHE=OFF \
-DWITH_QUICK=OFF \
-DWITH_QUICK=ON \
-DWITH_3D=${WITH_3D} \
-DWITH_STAGED_PLUGINS=ON \
-DWITH_GRASS=OFF \
@@ -499,8 +499,6 @@ if(WITH_CORE)
find_package(${QT_VERSION_BASE} COMPONENTS Qml Quick REQUIRED)
if(${CMAKE_SYSTEM_NAME} MATCHES "Android")
find_package(${QT_VERSION_BASE} COMPONENTS AndroidExtras)
else()
find_package(QtQmlTools)
endif()

# following variable is used in qgsconfig.h

This file was deleted.

@@ -1,58 +1,24 @@
############################################################
# sources
set(QGIS_QUICK_GUI_MOC_HDRS
attributes/qgsquickattributeformmodel.h
attributes/qgsquickattributeformmodelbase.h
attributes/qgsquickattributemodel.h
attributes/qgsquicksubmodel.h

qgsquickfeaturelayerpair.h
qgsquickcoordinatetransformer.h
qgsquickfeaturehighlight.h
qgsquickidentifykit.h
qgsquickmapcanvasmap.h
qgsquickmapsettings.h
qgsquickmaptransform.h
qgsquickmessagelogmodel.h
qgsquickpositionkit.h
qgsquickscalebarkit.h
qgsquicksimulatedpositionsource.h
qgsquickutils.h
qgsquickfeatureslistmodel.h
)

set(QGIS_QUICK_GUI_HDRS
qgsquickhighlightsgnode.h
)

set(QGIS_QUICK_GUI_SRC
attributes/qgsquickattributeformmodel.cpp
attributes/qgsquickattributeformmodelbase.cpp
attributes/qgsquickattributemodel.cpp
attributes/qgsquicksubmodel.cpp

qgsquickfeaturelayerpair.cpp
qgsquickcoordinatetransformer.cpp
qgsquickfeaturehighlight.cpp
qgsquickhighlightsgnode.cpp
qgsquickidentifykit.cpp
qgsquickmapcanvasmap.cpp
qgsquickmapsettings.cpp
qgsquickmaptransform.cpp
qgsquickmessagelogmodel.cpp
qgsquickpositionkit.cpp
qgsquickscalebarkit.cpp
qgsquicksimulatedpositionsource.cpp
qgsquickutils.cpp
qgsquickfeatureslistmodel.cpp
)

include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/attributes
${CMAKE_CURRENT_BINARY_DIR}


)

include_directories(SYSTEM
@@ -68,8 +34,6 @@ include_directories(SYSTEM
${QTKEYCHAIN_INCLUDE_DIR}
)

set(QGIS_QUICK_GUI_IMAGE_RCCS ./images/images.qrc)

############################################################
# qgis_quick shared library
QT5_WRAP_CPP(QGIS_QUICK_GUI_MOC_SRCS ${QGIS_QUICK_GUI_MOC_HDRS})
@@ -80,7 +44,6 @@ else()
endif()

add_library(qgis_quick ${LIBRARY_TYPE}
${QGIS_QUICK_GUI_IMAGE_RCCS}
${QGIS_QUICK_GUI_SRC}
${QGIS_QUICK_GUI_MOC_HDRS}
${QGIS_QUICK_GUI_MOC_SRCS}

This file was deleted.

This file was deleted.

0 comments on commit c40b464

Please sign in to comment.