Update Qt version to 5.15.2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -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]

.github/ISSUE_TEMPLATE/question_help.md

@@ -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]

CMakeLists.txt

@@ -44,8 +44,8 @@ ExternalProject_Add(${QMLALEMBIC_TARGET}
       PREFIX ${BUILD_DIR}
       BUILD_IN_SOURCE 0
       BUILD_ALWAYS 0
-      SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/qmlalembic
-      BINARY_DIR ${BUILD_DIR}/qmlalembic_build
+      SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/qmlAlembic
+      BINARY_DIR ${BUILD_DIR}/qmlAlembic_build
       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
       CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${ALEMBIC_CMAKE_FLAGS} -DCMAKE_PREFIX_PATH:PATH=${QT_DIR} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
       )

INSTALL.md

@@ -35,9 +35,14 @@ 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 it needs to be added manually (see https://bugreports.qt.io/browse/QTBUG-88821).
+It can either be taken from an older version, or directly downloaded from here:
+  * Linux: [libassimpsceneimport.so](https://gdirect.cc/d/bBomG&type=1)
+  * Windows: [assimpsceneimport.dll](https://gdirect.cc/d/JXD82&type=1)
+
+and then copied into PySide's installation folder, in `plugins/sceneparsers`.
+
 
 ### Qt Plugins
 Additional Qt plugins can be built to extend Meshroom UI features. They can be found on separate repositories,

docker/Dockerfile_centos

@@ -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/Qt/5.15.2/gcc_64 \
     PATH="${PATH}:${MESHROOM_BUNDLE}" \
     OPENIMAGEIO_LIBRARY=/opt/AliceVision_install/lib
 
@@ -27,14 +27,14 @@ RUN cmake "${MESHROOM_DEV}" -DCMAKE_PREFIX_PATH="${AV_INSTALL}" -DALICEVISION_RO
 RUN make "-j$(nproc)" qmlAlembic
 RUN make "-j$(nproc)" qtAliceVision
 RUN make "-j$(nproc)" && \
-  rm -rf "${MESHROOM_BUILD}" "${MESHROOM_DEV}" \
-    ${MESHROOM_BUNDLE}/aliceVision/share/doc \
-    ${MESHROOM_BUNDLE}/aliceVision/share/eigen3 \
-    ${MESHROOM_BUNDLE}/aliceVision/share/fonts \
-    ${MESHROOM_BUNDLE}/aliceVision/share/lemon \
-    ${MESHROOM_BUNDLE}/aliceVision/share/libraw \
-    ${MESHROOM_BUNDLE}/aliceVision/share/man/ \
-    aliceVision/share/pkgconfig
+    rm -rf "${MESHROOM_BUILD}" "${MESHROOM_DEV}" \
+           ${MESHROOM_BUNDLE}/aliceVision/share/doc \
+           ${MESHROOM_BUNDLE}/aliceVision/share/eigen3 \
+           ${MESHROOM_BUNDLE}/aliceVision/share/fonts \
+           ${MESHROOM_BUNDLE}/aliceVision/share/lemon \
+           ${MESHROOM_BUNDLE}/aliceVision/share/libraw \
+           ${MESHROOM_BUNDLE}/aliceVision/share/man/ \
+           aliceVision/share/pkgconfig
 
 COPY *requirements.txt *.md *.py ${MESHROOM_DEV}/
 COPY ./docs ${MESHROOM_DEV}/docs
@@ -61,6 +61,8 @@ RUN source scl_source enable rh-python36 && \
            ${MESHROOM_BUNDLE}/lib/PySide2/rcc \
            ${MESHROOM_BUNDLE}/lib/PySide2/designer
 
+# Copy missing libassimpsceneimport.so
+COPY dl/libassimpsceneimport.so ${MESHROOM_BUNDLE}/lib/PySide2/Qt/plugins/sceneparsers
 
 # Enable SSH X11 forwarding, needed when the Docker image
 # is run on a remote machine

docker/Dockerfile_centos_deps

@@ -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/Qt/5.15.2/gcc_64 \
     QT_CI_LOGIN=alicevisionjunk@gmail.com \
     QT_CI_P=azerty1.
 
@@ -44,6 +44,8 @@ RUN yum install -y \
         mesa-libGLU-devel \
         xcb-util-keysyms \
         xcb-util-image \
+        xcb-util-wm \
+        xcb-util-renderutil \
         libxkbcommon-x11
 
 # Install Python3
@@ -58,8 +60,8 @@ RUN source scl_source enable rh-python36 && pip install -r dev_requirements.txt
 # Install Qt (to build plugins)
 WORKDIR /tmp/qt
 COPY dl/qt.run /tmp/qt
-COPY ./docker/qt-installer-noninteractive.qs ${MESHROOM_DEV}/docker/
-RUN chmod +x qt.run && \
-    ./qt.run --verbose --platform minimal --script "${MESHROOM_DEV}/docker/qt-installer-noninteractive.qs" && \
-    rm qt.run
-
+RUN chmod +x qt.run
+RUN ./qt.run --verbose --email ${QT_CI_LOGIN} --password ${QT_CI_P} --accept-obligations --accept-licenses \
+    --default-answer --platform minimal --no-force-installations --no-default-installations --confirm-command \
+    install qt.qt5.5152.gcc_64 qt.qt5.5152.qtcharts qt.qt5.5152.qtcharts.gcc_64
+RUN rm qt.run

docker/Dockerfile_ubuntu

@@ -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/Qt/5.15.2/gcc_64 \
     PATH="${PATH}:${MESHROOM_BUNDLE}" \
     OPENIMAGEIO_LIBRARY=/opt/AliceVision_install/lib
 
@@ -54,6 +54,9 @@ RUN make "-j$(nproc)" && \
 		${MESHROOM_BUNDLE}/aliceVision/share/man/ \
 		aliceVision/share/pkgconfig
 
+# Copy missing libassimpsceneimport.so
+COPY dl/libassimpsceneimport.so ${MESHROOM_BUNDLE}/lib/PySide2/Qt/plugins/sceneparsers
+
 # Enable SSH X11 forwarding, needed when the Docker image
 # is run on a remote machine
 RUN apt install ssh xauth && \

docker/Dockerfile_ubuntu_deps

@@ -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/Qt/5.15.2/gcc_64 \
     QT_CI_LOGIN=alicevisionjunk@gmail.com \
     QT_CI_P=azerty1.
 
@@ -42,7 +42,6 @@ RUN apt-get update && \
 	libz-dev \
 	systemd \
 	ssh
-
 
 RUN apt-get install -y --no-install-recommends \
 	software-properties-common
@@ -53,10 +52,11 @@ RUN apt install python3-pip -y && pip3 install --upgrade pip
 # Install Qt (to build plugins)
 WORKDIR /tmp/qt
 COPY dl/qt.run /tmp/qt
-COPY ./docker/qt-installer-noninteractive.qs ${MESHROOM_DEV}/docker/
-RUN chmod +x qt.run && \
-    ./qt.run --verbose --platform minimal --script "${MESHROOM_DEV}/docker/qt-installer-noninteractive.qs" && \
-    rm qt.run
+RUN chmod +x qt.run
+RUN ./qt.run --verbose --email ${QT_CI_LOGIN} --password ${QT_CI_P} --accept-obligations --accept-licenses \
+    --default-answer --platform minimal --no-force-installations --no-default-installations --confirm-command \
+    install qt.qt5.5152.gcc_64 qt.qt5.5152.qtcharts qt.qt5.5152.qtcharts.gcc_64
+RUN rm qt.run
 
 COPY ./*requirements.txt ./setup.py ${MESHROOM_DEV}/
 

docker/build-centos.sh

@@ -22,7 +22,12 @@ test -d docker || (
 test -d dl || \
         mkdir dl
 test -f dl/qt.run || \
-        wget "https://download.qt.io/archive/qt/5.14/5.14.1/qt-opensource-linux-x64-5.14.1.run" -O "dl/qt.run" --no-check-certificate
+        wget --no-check-certificate "https://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run" -O "dl/qt.run"
+
+# Download a prebuilt assimp importer to address https://bugreports.qt.io/browse/QTBUG-88821
+test -f dl/libassimpsceneimport.so || \
+        wget --no-check-certificate "https://gdirect.cc/d/bBomG&type=1" -O "dl/libassimpsceneimport.so"
+
 
 # DEPENDENCIES
 

docker/build-ubuntu.sh

@@ -3,7 +3,7 @@ set -e
 
 test -z "$MESHROOM_VERSION" && MESHROOM_VERSION="$(git rev-parse --abbrev-ref HEAD)-$(git rev-parse --short HEAD)"
 test -z "$AV_VERSION" && echo "AliceVision version not specified, set AV_VERSION in the environment" && exit 1
-test -z "$CUDA_VERSION" && CUDA_VERSION=11.0
+test -z "$CUDA_VERSION" && CUDA_VERSION=11.3.1
 test -z "$UBUNTU_VERSION" && UBUNTU_VERSION=20.04
 
 test -d docker || (
@@ -14,7 +14,11 @@ test -d docker || (
 test -d dl || \
 	mkdir dl
 test -f dl/qt.run || \
-	wget "https://download.qt.io/archive/qt/5.14/5.14.1/qt-opensource-linux-x64-5.14.1.run" -O "dl/qt.run"
+        wget --no-check-certificate "https://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run" -O "dl/qt.run"
+
+# Download a prebuilt assimp importer to address https://bugreports.qt.io/browse/QTBUG-88821
+test -f dl/libassimpsceneimport.so || \
+        wget --no-check-certificate "https://gdirect.cc/d/bBomG&type=1" -O "dl/libassimpsceneimport.so"
 
 # DEPENDENCIES
 docker build \

meshroom/__init__.py

@@ -145,3 +145,6 @@ def addToEnvPath(var, val, index=-1):
                 os.environ[key] = value
     else:
         addToEnvPath("PATH", os.environ.get("ALICEVISION_BIN_PATH", ""))
+
+
+os.environ["QML_XHR_ALLOW_FILE_READ"] = '1'

meshroom/ui/palette.py

@@ -57,3 +57,22 @@ def togglePalette(self):
 
     paletteChanged = Signal()
     palette = Property(QPalette, lambda self: QApplication.instance().palette(), notify=paletteChanged)
+    alternateBase = Property(QColor, lambda self: self.palette.color(QPalette.AlternateBase), notify=paletteChanged)
+    base = Property(QColor, lambda self: self.palette.color(QPalette.Base), notify=paletteChanged)
+    button = Property(QColor, lambda self: self.palette.color(QPalette.Button), notify=paletteChanged)
+    buttonText = Property(QColor, lambda self: self.palette.color(QPalette.ButtonText), notify=paletteChanged)
+    disabledButtonText = Property(QColor, lambda self: self.palette.color(QPalette.Disabled, QPalette.ButtonText), notify=paletteChanged)
+    highlight = Property(QColor, lambda self: self.palette.color(QPalette.Highlight), notify=paletteChanged)
+    disabledHighlight = Property(QColor, lambda self: self.palette.color(QPalette.Disabled, QPalette.Highlight), notify=paletteChanged)
+    highlightedText = Property(QColor, lambda self: self.palette.color(QPalette.HighlightedText), notify=paletteChanged)
+    disabledHighlightedText = Property(QColor, lambda self: self.palette.color(QPalette.Disabled, QPalette.HighlightedText), notify=paletteChanged)
+    link = Property(QColor, lambda self: self.palette.color(QPalette.Link), notify=paletteChanged)
+    mid = Property(QColor, lambda self: self.palette.color(QPalette.Mid), notify=paletteChanged)
+    shadow = Property(QColor, lambda self: self.palette.color(QPalette.Shadow), notify=paletteChanged)
+    text = Property(QColor, lambda self: self.palette.color(QPalette.Text), notify=paletteChanged)
+    disabledText = Property(QColor, lambda self: self.palette.color(QPalette.Disabled, QPalette.Text), notify=paletteChanged)
+    toolTipBase = Property(QColor, lambda self: self.palette.color(QPalette.ToolTipBase), notify=paletteChanged)
+    toolTipText = Property(QColor, lambda self: self.palette.color(QPalette.ToolTipText), notify=paletteChanged)
+    window = Property(QColor, lambda self: self.palette.color(QPalette.Window), notify=paletteChanged)
+    windowText = Property(QColor, lambda self: self.palette.color(QPalette.WindowText), notify=paletteChanged)
+    disabledWindowText = Property(QColor, lambda self: self.palette.color(QPalette.Disabled, QPalette.WindowText), notify=paletteChanged)

meshroom/ui/qml/AboutDialog.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.11
 import Utils 1.0
 import MaterialIcons 2.2
 
@@ -193,11 +193,12 @@ Dialog {
                         TextArea {
                             id: textArea
                             readOnly: true
+                            implicitWidth: parent.implicitWidth
                             selectByMouse: true
                             selectByKeyboard: true
                             wrapMode: TextArea.WrapAnywhere
                             textFormat: TextEdit.RichText
-                            onLinkActivated: Qt.openUrlExternally(link)
+                            onLinkActivated: function(link) { Qt.openUrlExternally(link) }
                         }
                     }
                 }

meshroom/ui/qml/Charts/ChartViewCheckBox.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.3
+import QtQuick 2.15
+import QtQuick.Controls 2.15
 
 
 /**

meshroom/ui/qml/Charts/ChartViewLegend.qml

@@ -1,6 +1,6 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.9
-import QtCharts 2.3
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtCharts 2.15
 
 
 /**
@@ -29,12 +29,12 @@ Flow {
     // Update internal ListModel when ChartView's series change
     Connections {
         target: chartView
-        onSeriesAdded: seriesModel.append({"series": series})
-        onSeriesRemoved: {
-            for(var i = 0; i < seriesModel.count; ++i)
-            {
-                if(seriesModel.get(i)["series"] === series)
-                {
+        function onSeriesAdded(series) {
+            seriesModel.append({"series": series})
+        }
+        function onSeriesRemoved(series) {
+            for(var i = 0; i < seriesModel.count; ++i) {
+                if(seriesModel.get(i)["series"] === series) {
                     seriesModel.remove(i);
                     return;
                 }

meshroom/ui/qml/Charts/InteractiveChartView.qml

@@ -1,11 +1,11 @@
-import QtQuick 2.9
-import QtQuick.Controls 2.3
-import QtQuick.Layouts 1.3
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.11
 import MaterialIcons 2.2
-import QtPositioning 5.8
-import QtLocation 5.9
+import QtPositioning 5.15
+import QtLocation 5.15
 
-import QtCharts 2.13
+import QtCharts 2.15
 
 import Controls 1.0
 import Utils 1.0

meshroom/ui/qml/Controls/ColorChart.qml

@@ -1,5 +1,5 @@
-import QtQuick 2.10
-import QtQuick.Controls 2.10
+import QtQuick 2.15
+import QtQuick.Controls 2.15
 
 import Utils 1.0