Skip to content

Commit

Permalink
Qt5.15: Update documentation with the Qt version upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
cbentejac committed Jan 27, 2023
1 parent fbcbe95 commit 33a28f0
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ If applicable, copy paste the relevant log output (please embed the text in a ma
**Desktop (please complete the following and other pertinent information):**
- OS: [e.g. win 10, osx, ]
- Python version [e.g. 2.6]
- Qt/PySide version [e.g. 5.12.4]
- Qt/PySide version [e.g. 5.15.2]
- Meshroom version: please specify if you are using a release version or your own build
- Binary version (if applicable) [e.g. 2019.1]
- Commit reference (if applicable) [e.g. 08ddbe2]
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/question_help.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ If applicable, copy paste the relevant log output (please embed the text in a ma
**Desktop (please complete the following and other pertinent information):**
- OS: [e.g. win 10, osx, ]
- Python version [e.g. 2.6]
- Qt/PySide version [e.g. 5.12.4]
- Qt/PySide version [e.g. 5.15.2]
- Meshroom version: please specify if you are using a release version or your own build
- Binary version (if applicable) [e.g. 2019.1]
- Commit reference (if applicable) [e.g. 08ddbe2]
Expand Down
6 changes: 3 additions & 3 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ pip install -r requirements.txt -r dev_requirements.txt
> Note: `dev_requirements` is only related to testing and packaging. It is not mandatory to run Meshroom.
### Qt/PySide
* PySide >= 5.12.2
Warning: On Windows, the plugin AssimpSceneParser is missing from pre-built binaries, so you need to add it manually (from an older version for instance).
See https://bugreports.qt.io/browse/QTBUG-74535
* PySide >= 5.15.2.1
Warning: The plugin AssimpSceneParser is missing from pre-built binaries, so you need to add it manually (from an older version for instance).
See https://bugreports.qt.io/browse/QTBUG-88821

### Qt Plugins
Additional Qt plugins can be built to extend Meshroom UI features. They can be found on separate repositories,
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_centos_deps
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LABEL maintainer="AliceVision Team alicevision-team@googlegroups.com"
ENV MESHROOM_DEV=/opt/Meshroom \
MESHROOM_BUILD=/tmp/Meshroom_build \
MESHROOM_BUNDLE=/opt/Meshroom_bundle \
QT_DIR=/opt/Qt5.14.1/5.14.1/gcc_64 \
QT_DIR=/opt/Qt5.15.2/5.15.2/gcc_64 \
QT_CI_LOGIN=alicevisionjunk@gmail.com \
QT_CI_PASSWORD=azerty1.

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ENV MESHROOM_DEV=/opt/Meshroom \
MESHROOM_BUILD=/tmp/Meshroom_build \
MESHROOM_BUNDLE=/opt/Meshroom_bundle \
AV_INSTALL=/opt/AliceVision_install \
QT_DIR=/opt/Qt5.14.1/5.14.1/gcc_64 \
QT_DIR=/opt/Qt5.15.2/5.15.2/gcc_64 \
PATH="${PATH}:${MESHROOM_BUNDLE}" \
OPENIMAGEIO_LIBRARY=/opt/AliceVision_install/lib

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_ubuntu_deps
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ LABEL maintainer="AliceVision Team alicevision-team@googlegroups.com"

ENV MESHROOM_DEV=/opt/Meshroom \
MESHROOM_BUILD=/tmp/Meshroom_build \
QT_DIR=/opt/Qt5.14.1/5.14.1/gcc_64 \
QT_DIR=/opt/Qt5.15.2/5.15.2/gcc_64 \
QT_CI_LOGIN=alicevisionjunk@gmail.com \
QT_CI_PASSWORD=azerty1.

Expand Down

0 comments on commit 33a28f0

Please sign in to comment.