completely removed xmlpatterns

cnr-isti-vclab · Nov 17, 2020 · 73744fe · 73744fe
1 parent 4432a87
commit 73744fe
Show file tree

Hide file tree

Showing 18 changed files with 6 additions and 35 deletions.
diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml
@@ -45,8 +45,6 @@ jobs:
         submodules: true
     - name: Install Qt
       uses: jurplel/install-qt-action@v2
-      with:
-        modules: xmlpatterns
     - name: Install dependencies
       run: |
        sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libgmp-dev
@@ -122,8 +120,6 @@ jobs:
         npm install -g appdmg
     - name: Install Qt
       uses: jurplel/install-qt-action@v2
-      with:
-        modules: xmlpatterns
     - name: Setup env variables
       id: envs
       shell: bash
@@ -165,8 +161,6 @@ jobs:
       uses: ilammy/msvc-dev-cmd@v1
     - name: Install Qt
       uses: jurplel/install-qt-action@v2
-      with:
-        modules: xmlpatterns
     - name: Setup env variables
       id: envs
       run: |

diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml
@@ -14,8 +14,6 @@ jobs:
         submodules: true
     - name: Install Qt
       uses: jurplel/install-qt-action@v2
-      with:
-        modules: xmlpatterns
     - name: Install dependencies
       run: |
        sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libgmp-dev

diff --git a/.github/workflows/MacOS.yml b/.github/workflows/MacOS.yml
@@ -18,8 +18,6 @@ jobs:
         npm install -g appdmg
     - name: Install Qt
       uses: jurplel/install-qt-action@v2
-      with:
-        modules: xmlpatterns
     - name: Setup env variables
       id: envs
       shell: bash

diff --git a/.github/workflows/QmakeBuilds.yml b/.github/workflows/QmakeBuilds.yml
@@ -13,8 +13,6 @@ jobs:
         submodules: true
     - name: Install Qt
       uses: jurplel/install-qt-action@v2
-      with:
-        modules: xmlpatterns
     - name: Install dependencies
       run: |
        sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev
@@ -65,8 +63,6 @@ jobs:
         npm install -g appdmg
     - name: Install Qt
       uses: jurplel/install-qt-action@v2
-      with:
-        modules: xmlpatterns
     - name: Setup env variables
       id: envs
       shell: bash
@@ -113,8 +109,6 @@ jobs:
       uses: ilammy/msvc-dev-cmd@v1
     - name: Install Qt
       uses: jurplel/install-qt-action@v2
-      with:
-        modules: xmlpatterns
     - name: Build MeshLab
       run: |
         .\scripts\${{ runner.os }}\qmake\windows_build.ps1

diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
@@ -21,8 +21,6 @@ jobs:
       uses: ilammy/msvc-dev-cmd@v1
     - name: Install Qt
       uses: jurplel/install-qt-action@v2
-      with:
-        modules: xmlpatterns
     - name: Setup env variables
       id: envs
       run: |

diff --git a/scripts/Linux/0_setup_env_ubuntu.sh b/scripts/Linux/0_setup_env_ubuntu.sh
@@ -5,6 +5,6 @@
 # Run this script if you never installed any of the MeshLab dependencies.
 
 sudo apt-get update 
-sudo apt-get install -y qt5-default qttools5-dev-tools qtdeclarative5-dev libqt5xmlpatterns5-dev 
+sudo apt-get install -y qt5-default qttools5-dev-tools qtdeclarative5-dev
 sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev lib3ds-dev libeigen3-dev 
 sudo apt-get install -y libopenctm-dev libgmp-dev libqhull-dev patchelf cmake
diff --git a/scripts/Linux/resources/snap/snap_noversion.yaml b/scripts/Linux/resources/snap/snap_noversion.yaml
@@ -58,7 +58,6 @@ parts:
       - qt5-default
       - qttools5-dev-tools
       - qtdeclarative5-dev
-      - libqt5xmlpatterns5-dev
       - mesa-common-dev
       - libglu1-mesa-dev
       - lib3ds-dev
@@ -76,7 +75,6 @@ parts:
       - libglew-dev
       - libqt5opengl5-dev
       - qtdeclarative5-dev
-      - libqt5xmlpatterns5-dev
       - libqt5gui5
     override-build: |
       sh scripts/Linux/1_build.sh

diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -58,7 +58,6 @@ parts:
       - qt5-default
       - qttools5-dev-tools
       - qtdeclarative5-dev
-      - libqt5xmlpatterns5-dev
       - mesa-common-dev
       - libglu1-mesa-dev
       - lib3ds-dev
@@ -76,7 +75,6 @@ parts:
       - libglew-dev
       - libqt5opengl5-dev
       - qtdeclarative5-dev
-      - libqt5xmlpatterns5-dev
       - libqt5gui5
     override-build: |
       sh scripts/Linux/1_build.sh

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -23,7 +23,7 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 find_package(
 	Qt5
-	COMPONENTS OpenGL Xml Network# XmlPatterns
+	COMPONENTS OpenGL Xml Network
 	REQUIRED)
 find_package(OpenMP)
 

diff --git a/src/README.md b/src/README.md
@@ -19,7 +19,7 @@ The following folders are used by `cmake`:
 
 ## Build MeshLab
 
-MeshLab builds with the three major compilers: `gcc`, `clang`, and `msvc`. It requires [Qt](https://www.qt.io/) >= 5.12, with `xmlpatterns` as additional package.
+MeshLab builds with the three major compilers: `gcc`, `clang`, and `msvc`. It requires [Qt](https://www.qt.io/) >= 5.12.
 
 After setting up the Qt environment:
 

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -64,8 +64,6 @@ target_link_libraries(
 		Qt5::OpenGL
 		Qt5::Widgets
 		Qt5::Xml
-		Qt5::Network
-		#Qt5::XmlPatterns
 		external-glew
 )
 

diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro
@@ -3,7 +3,6 @@ include (../general.pri)
 QT += gui
 QT += opengl
 QT += xml
-#QT += xmlpatterns
 QT += network
 
 #CONFIG += debug_and_release

diff --git a/src/meshlab/rich_parameter_gui/richparameterlistframe.cpp b/src/meshlab/rich_parameter_gui/richparameterlistframe.cpp
@@ -31,7 +31,6 @@
 #include <QClipboard>
 #include <QColorDialog>
 #include <QToolBar>
-#include "../mainwindow.h"
 
 
 using namespace vcg;

diff --git a/src/meshlabplugins/edit_pickpoints/CMakeLists.txt b/src/meshlabplugins/edit_pickpoints/CMakeLists.txt
@@ -32,7 +32,7 @@ add_library(edit_pickpoints MODULE ${SOURCES} ${HEADERS} ${RESOURCES} ${UI})
 target_include_directories(edit_pickpoints PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(edit_pickpoints PUBLIC meshlab-common)
 
-target_link_libraries(edit_pickpoints PRIVATE OpenGL::GLU Qt5::Network)
+target_link_libraries(edit_pickpoints PRIVATE OpenGL::GLU)
 
 set_property(TARGET edit_pickpoints PROPERTY FOLDER Plugins)
 

diff --git a/src/meshlabplugins/edit_pickpoints/edit_pickpoints.pro b/src/meshlabplugins/edit_pickpoints/edit_pickpoints.pro
@@ -1,7 +1,5 @@
 include (../../shared.pri)
 
-QT += network
-
 HEADERS += \
 	edit_pickpoints_factory.h \
 	editpickpoints.h \

diff --git a/src/meshlabplugins/edit_pickpoints/editpickpoints.cpp b/src/meshlabplugins/edit_pickpoints/editpickpoints.cpp
@@ -28,9 +28,10 @@
  */
 
 #include <GL/glew.h>
+#include <qdebug.h>
 
 #include "editpickpoints.h"
-#include <meshlab/mainwindow.h>
+#include <meshlab/glarea.h>
 
 #include <wrap/gl/picking.h>
 #include <wrap/gl/pick.h>

diff --git a/src/shared.pri b/src/shared.pri
@@ -6,7 +6,6 @@ TEMPLATE = lib
 CONFIG += plugin
 QT += opengl
 QT += xml
-#QT += xmlpatterns
 
 win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/meshlab-common.lib -lopengl32 -lGLU32
 win32-g++:LIBS += -lmeshlab-common -lopengl32 -lGLU32

diff --git a/src/templates/common.cmake b/src/templates/common.cmake
@@ -29,7 +29,6 @@ target_link_libraries({{name}}
     Qt5::Script
     Qt5::Widgets
     Qt5::Xml
-    #Qt5::XmlPatterns
     external-glew)
 {% endblock %}