Skip to content

Commit 4878209

Browse files
authored
Merge pull request #2692 from alicevision/dev/updateQt6
Update to Qt/PySide 6.8.3
2 parents 2565223 + b4f2f9f commit 4878209

File tree

13 files changed

+14
-16
lines changed

13 files changed

+14
-16
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ If applicable, copy paste the relevant log output (please embed the text in a ma
2929
**Desktop (please complete the following and other pertinent information):**
3030
- OS: [e.g. win 10, osx, ]
3131
- Python version [e.g. 2.6]
32-
- Qt/PySide version [e.g. 5.15.2]
32+
- Qt/PySide version [e.g. 6.8.2]
3333
- Meshroom version: please specify if you are using a release version or your own build
34-
- Binary version (if applicable) [e.g. 2019.1]
34+
- Binary version (if applicable) [e.g. 2023.3.0]
3535
- Commit reference (if applicable) [e.g. 08ddbe2]
3636

3737
**Additional context**

.github/ISSUE_TEMPLATE/question_help.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ If applicable, copy paste the relevant log output (please embed the text in a ma
2222
**Desktop (please complete the following and other pertinent information):**
2323
- OS: [e.g. win 10, osx, ]
2424
- Python version [e.g. 2.6]
25-
- Qt/PySide version [e.g. 5.15.2]
25+
- Qt/PySide version [e.g. 6.8.2]
2626
- Meshroom version: please specify if you are using a release version or your own build
27-
- Binary version (if applicable) [e.g. 2019.1]
27+
- Binary version (if applicable) [e.g. 2023.3.0]
2828
- Commit reference (if applicable) [e.g. 08ddbe2]
2929

3030
**Additional context**

INSTALL.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,20 @@ To install all the requirements for runtime, development and packaging, simply r
5656
```bash
5757
pip install -r requirements.txt -r dev_requirements.txt
5858
```
59-
> Note: `dev_requirements` is only related to testing and packaging. It is not mandatory to run Meshroom.
59+
> [!NOTE]
60+
> `dev_requirements` is only related to testing and packaging. It is not mandatory to run Meshroom.
6061
61-
> Note: It is recommended to use a [virtual python environment](https://docs.python.org/3.9/library/venv.html), like `python -v venv meshroom_venv`.
62+
> [!NOTE]
63+
> It is recommended to use a [virtual python environment](https://docs.python.org/3.9/library/venv.html), like `python -m venv meshroom_venv`.
6264
6365

6466
### Qt/PySide
6567

6668
* PySide >= 6.7
67-
Warning: The plugin AssimpSceneParser is missing from pre-built binaries, so it needs to be added manually (see https://bugreports.qt.io/browse/QTBUG-88821).
68-
It can either be taken from an older version, or directly downloaded from here:
69-
* Linux: [libassimpsceneimport.so](https://drive.google.com/uc?export=download&id=1cTU7xrOsLI6ICgRSYz_t9E1lsrNF1kBB))
70-
* Windows: [assimpsceneimport.dll](https://drive.google.com/uc?export=download&id=1X9X9d5W_lCwEHWwF748IdnN1YYipAQT_)
7169

72-
and then copied into PySide's installation folder, in `plugins/sceneparsers`.
70+
> [!WARNING]
71+
> For PySide 6.8.0 and over on Windows, the following error may occur when leaving Meshroom's homepage: `Cannot load /path/to/pip/install/PySide6/qml/QtQuick/Scene3D/qtquickscene3dplugin.dll: specified module cannot be found`. This is caused by Qt63DQuickScene3D.dll which seems to be missing from the
72+
pip distribution, but can be retrieved from a standard Qt installation. Alternatively, the DLL for MSVC2022_64 can be directly downloaded [here](https://drive.google.com/uc?export=download&id=1vhPDmDQJJfM_hBD7KVqRfh8tiqTCN7Jv). It then needs to be placed in `/path/to/pip/install/PySide6`.
7373

7474

7575
### AliceVision

dev_requirements.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# packaging
2-
3-
cx_Freeze==5.1.1;python_version<"3.5"
4-
# Problem with cx_freeze-6.2, see https://github.com/marcelotduarte/cx_Freeze/issues/652
5-
cx_Freeze==6.1;python_version>="3.5"
2+
cx_Freeze==7.2.10
63

74
# testing
85
pytest

meshroom/ui/img/MIKROS.png

-1.06 KB
Loading

meshroom/ui/img/MILL.png

-1.03 KB
Loading

meshroom/ui/img/MPC.png

-1.02 KB
Loading

meshroom/ui/img/logo_CTU.png

-2.03 KB
Loading

meshroom/ui/img/logo_IRIT.png

-822 Bytes
Loading

meshroom/ui/img/logo_enpc.png

-841 Bytes
Loading

0 commit comments

Comments
 (0)