From f083bb2a67c791d4855823474abea007cda0034d Mon Sep 17 00:00:00 2001
From: alemuntoni <muntoni.alessandro@gmail.com>
Date: Wed, 7 Oct 2020 13:22:13 +0200
Subject: [PATCH] adjusting dependencies after jhead removal; revert to qt 5.12

---
 .github/workflows/BuildAndRelease.yml |  3 ---
 .github/workflows/BuildMacOS.yml      |  1 -
 .github/workflows/BuildUbuntu.yml     |  1 -
 .github/workflows/BuildWindows.yml    |  2 --
 src/meshlab.pro                       | 24 ++++++++++++------------
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/BuildAndRelease.yml b/.github/workflows/BuildAndRelease.yml
index b2b367d79..eaf2081c8 100644
--- a/.github/workflows/BuildAndRelease.yml
+++ b/.github/workflows/BuildAndRelease.yml
@@ -54,7 +54,6 @@ jobs:
       uses: jurplel/install-qt-action@v2
       with:
         modules: xmlpatterns
-        version: '5.15.0'
     - name: Install dependencies
       run: |
        sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev
@@ -141,7 +140,6 @@ jobs:
       uses: jurplel/install-qt-action@v2
       with:
         modules: xmlpatterns
-        version: '5.15.0'
     - name: Setup env variables
       id: envs
       shell: bash
@@ -196,7 +194,6 @@ jobs:
       uses: jurplel/install-qt-action@v2
       with:
         modules: xmlpatterns
-        version: '5.15.0'
     - name: Build MeshLab
       run: |
         .\install\windows\windows_build.ps1
diff --git a/.github/workflows/BuildMacOS.yml b/.github/workflows/BuildMacOS.yml
index 776d62348..6ad59ed4e 100644
--- a/.github/workflows/BuildMacOS.yml
+++ b/.github/workflows/BuildMacOS.yml
@@ -20,7 +20,6 @@ jobs:
       uses: jurplel/install-qt-action@v2
       with:
         modules: xmlpatterns
-        version: '5.15.0'
     - name: Setup env variables
       id: envs
       shell: bash
diff --git a/.github/workflows/BuildUbuntu.yml b/.github/workflows/BuildUbuntu.yml
index f5afa4162..ecc46e397 100644
--- a/.github/workflows/BuildUbuntu.yml
+++ b/.github/workflows/BuildUbuntu.yml
@@ -16,7 +16,6 @@ jobs:
       uses: jurplel/install-qt-action@v2
       with:
         modules: xmlpatterns
-        version: '5.15.0'
     - name: Install dependencies
       run: |
        sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev
diff --git a/.github/workflows/BuildWindows.yml b/.github/workflows/BuildWindows.yml
index d224c69c8..9fcd7a9dc 100644
--- a/.github/workflows/BuildWindows.yml
+++ b/.github/workflows/BuildWindows.yml
@@ -28,7 +28,6 @@ jobs:
       uses: jurplel/install-qt-action@v2
       with:
         modules: xmlpatterns
-        version: '5.15.0'
         #mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
     - name: Build MeshLab
       run: |
@@ -71,7 +70,6 @@ jobs:
       uses: jurplel/install-qt-action@v2
       with:
         modules: xmlpatterns
-        version: '5.15.0'
         #mirror: 'http://mirrors.ocf.berkeley.edu/qt/'
     - name: Setup env variables
       id: envs
diff --git a/src/meshlab.pro b/src/meshlab.pro
index 465390d40..ed2d80880 100644
--- a/src/meshlab.pro
+++ b/src/meshlab.pro
@@ -196,7 +196,7 @@ edit_pickpoints.subdir = meshlabplugins/edit_pickpoints
 
 ## what subproject depends on others ##
 # meshlab_mini subdirs
-common.depends = external
+#common.depends = external
 meshlab.depends = common
 meshlabserver.depends = common
 io_base.depends = common
@@ -204,17 +204,17 @@ decorate_base.depends = common
 filter_measure.depends = common
 filter_meshing.depends = common
 # IO plugins
-io_3ds.depends = common
+io_3ds.depends = common external
 io_bre.depends = common
 io_collada.depends = common
-io_ctm.depends = common
+io_ctm.depends = common external
 io_expe.depends = common
 io_json.depends = common
-io_tri.depends = common
-io_x3d.depends = common
 io_pdb.depends = common
+io_tri.depends = common
 io_txt.depends = common
-io_u3d.depends = common
+io_u3d.depends = common external
+io_x3d.depends = common
 # Filter samples
 edit_sample.depends = common
 filter_sample.depends = common
@@ -229,26 +229,26 @@ filter_clean.depends = common
 filter_color_projection.depends = common
 filter_colorproc.depends = common
 filter_create.depends = common
-filter_csg.depends = common
+filter_csg.depends = common external
 filter_dirt.depends = common
 filter_fractal.depends = common
-filter_func.depends = common
+filter_func.depends = common external
 filter_globalregistration.depends = common
 filter_img_patch_param.depends = common
-filter_isoparametrization.depends = common
+filter_isoparametrization.depends = common external
 filter_layer.depends = common
 filter_mls.depends = common
 filter_mutualglobal.depends = common
 filter_mutualinfo.depends = common
 filter_plymc.depends = common
-filter_qhull.depends = common
+filter_qhull.depends = common external
 filter_quality.depends = common
 filter_sampling.depends = common
 filter_screened_poisson.depends = common
 filter_sdfgpu.depends = common
 filter_select.depends = common
 filter_sketchfab.depends = common
-filter_ssynth.depends = common
+filter_ssynth.depends = common external
 filter_texture.depends = common
 filter_trioptimize.depends = common
 filter_unsharp.depends = common
@@ -263,7 +263,7 @@ render_radiance_scaling.depends = common
 edit_align.depends = common
 edit_manipulators.depends = common
 edit_measure.depends = common
-edit_mutualcorrs.depends = common
+edit_mutualcorrs.depends = common external
 edit_paint.depends = common
 edit_point.depends = common
 edit_referencing.depends = common