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>
qgis · May 14, 2021 · c40b464 · c40b464
1 parent 204fc2a
commit c40b464
Show file tree

Hide file tree

Showing 81 changed files with 13 additions and 9,536 deletions.
diff --git a/.docker/docker-qgis-build.sh b/.docker/docker-qgis-build.sh
@@ -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 \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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

diff --git a/cmake/FindQtQmlTools.cmake b/cmake/FindQtQmlTools.cmake
diff --git a/src/quickgui/CMakeLists.txt b/src/quickgui/CMakeLists.txt
@@ -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}

diff --git a/src/quickgui/attributes/qgsquickattributeformmodel.cpp b/src/quickgui/attributes/qgsquickattributeformmodel.cpp
diff --git a/src/quickgui/attributes/qgsquickattributeformmodel.h b/src/quickgui/attributes/qgsquickattributeformmodel.h