Upgrade to Qt 6.8.0

rectalogic · Oct 15, 2024 · ebf74d8 · ebf74d8
1 parent 8827af2
commit ebf74d8
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 20 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,8 +5,8 @@
         "context": "../builders",
         "cacheFrom": "type=registry,ref=ghcr.io/rectalogic/mediafx:buildcache",
         "args": {
-            "QT_VER": "6.7.2",
-            "QT_INSTALLER_VER": "4.8.0"
+            "QT_VER": "6.8.0",
+            "QT_INSTALLER_VER": "4.8.1"
         },
         "options": [
             "--platform",
@@ -46,4 +46,4 @@
             }
         }
     }
-}
+}
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ for the QML elements and modules.
 
 ## Dependencies
 
-MediaFX use [Qt 6.6](https://doc.qt.io/qt-6/),
+MediaFX use [Qt 6](https://doc.qt.io/qt-6/),
 and [FFmpeg](https://ffmpeg.org/).
 
 ## Example

diff --git a/builders/Darwin/install-qt6.sh b/builders/Darwin/install-qt6.sh
@@ -9,7 +9,8 @@ source "$CURRENT/../versions"
 INSTALLDIR=${QTDIR%/*/*}
 (
     cd "$BUILD_ROOT"
-    QTSPEC=qt6.${QT_VER//.}
+    QT_VER_NODOT=${QT_VER//.}
+    QTSPEC=qt6.${QT_VER_NODOT}
     INSTALLER=qt-online-installer-macOS-x64-${QT_INSTALLER_VER}
     curl -L -O https://qt.mirror.constant.com/archive/online_installers/${QT_INSTALLER_VER%.*}/${INSTALLER}.dmg \
     && hdiutil attach ${INSTALLER}.dmg \
@@ -18,13 +19,13 @@ INSTALLDIR=${QTDIR%/*/*}
         --auto-answer telemetry-question=No --no-default-installations --no-force-installations \
         install \
         qt.${QTSPEC}.clang_64 \
-        qt.${QTSPEC}.qtquick3d \
-        qt.${QTSPEC}.qtquicktimeline \
+        qt.${QTSPEC}.addons.qtquick3d \
+        qt.${QTSPEC}.addons.qtquicktimeline \
         qt.${QTSPEC}.addons.qtpositioning \
         qt.${QTSPEC}.addons.qtwebchannel \
-        qt.${QTSPEC}.addons.qtwebengine \
+        extensions.qtwebengine.${QT_VER_NODOT}.clang_64 \
         qt.${QTSPEC}.addons.qtmultimedia \
-        qt.${QTSPEC}.qtshadertools \
+        qt.${QTSPEC}.addons.qtshadertools \
         qt.${QTSPEC}.addons.qtquickeffectmaker \
         qt.tools.qtcreator_gui \
     && hdiutil detach /Volumes/${INSTALLER} \

diff --git a/builders/Linux/Dockerfile b/builders/Linux/Dockerfile
@@ -54,21 +54,22 @@ RUN --mount=type=secret,id=qtaccount,target=/root/.local/share/Qt/qtaccount.ini
     else
         ARCH=x64
     fi
-    QTSPEC=qt6.${QT_VER//.}
+    QT_VER_NODOT=${QT_VER//.}
+    QTSPEC=qt6.${QT_VER_NODOT}
     INSTALLER=qt-online-installer-linux-${ARCH}-${QT_INSTALLER_VER}.run
     curl -O https://qt.mirror.constant.com/archive/online_installers/${QT_INSTALLER_VER%.*}/${INSTALLER} \
     && chmod +x ${INSTALLER} \
     && ./${INSTALLER} --root /usr/local/Qt --accept-licenses --accept-obligations --default-answer --confirm-command \
       --auto-answer telemetry-question=No --no-default-installations --no-force-installations \
       install \
       qt.${QTSPEC}.linux_gcc_64 \
-      qt.${QTSPEC}.qtquick3d \
-      qt.${QTSPEC}.qtquicktimeline \
+      qt.${QTSPEC}.addons.qtquick3d \
+      qt.${QTSPEC}.addons.qtquicktimeline \
       qt.${QTSPEC}.addons.qtpositioning \
       qt.${QTSPEC}.addons.qtwebchannel \
-      qt.${QTSPEC}.addons.qtwebengine \
+      extensions.qtwebengine.${QT_VER_NODOT}.linux_gcc_64 \
       qt.${QTSPEC}.addons.qtmultimedia \
-      qt.${QTSPEC}.qtshadertools \
+      qt.${QTSPEC}.addons.qtshadertools \
     && find /usr/local/Qt/Docs/Qt-${QT_VER} -type f -and -not -name '*.index' -delete \
     && curl -o iwyu-mapgen-qt.py https://raw.githubusercontent.com/include-what-you-use/include-what-you-use/clang_17/mapgen/iwyu-mapgen-qt.py \
     && python3 iwyu-mapgen-qt.py /usr/local/Qt/${QT_VER}/*/include > "/usr/local/Qt/${QT_VER}/qt.imp"

diff --git a/builders/versions b/builders/versions
@@ -1,5 +1,5 @@
-export QT_VER=6.7.2
-export QT_INSTALLER_VER=4.8.0
+export QT_VER=6.8.0
+export QT_INSTALLER_VER=4.8.1
 export SOURCE_ROOT="${BASH_SOURCE%/*}/.."
 BUILD_ROOT="${BASH_SOURCE%/*}/../build/$(uname)"
 mkdir -p "${BUILD_ROOT}"

diff --git a/src/MediaFX/audio_renderer.cpp b/src/MediaFX/audio_renderer.cpp
@@ -8,7 +8,6 @@
 #include <QPointer>
 #include <QQmlEngine>
 #include <QQmlInfo>
-#include <QmlTypeAndRevisionsRegistration>
 #include <QtCore>
 
 /*!

diff --git a/src/MediaFX/media_clip.cpp b/src/MediaFX/media_clip.cpp
@@ -13,7 +13,6 @@
 #include <QQmlInfo>
 #include <QUrl>
 #include <QVideoSink>
-#include <QmlTypeAndRevisionsRegistration>
 #include <chrono>
 #include <compare>
 #include <ratio>

diff --git a/src/MediaFX/render_session.cpp b/src/MediaFX/render_session.cpp
@@ -22,7 +22,6 @@
 #include <QQmlInfo>
 #include <QString>
 #include <QVariant>
-#include <QmlTypeAndRevisionsRegistration>
 #include <QtLogging>
 using namespace Qt::Literals::StringLiterals;
 

diff --git a/src/MediaFX/render_window.cpp b/src/MediaFX/render_window.cpp
@@ -11,7 +11,6 @@
 #include <QQmlEngine>
 #include <QQmlInfo>
 #include <QQuickItem>
-#include <QmlTypeAndRevisionsRegistration>
 #ifdef MEDIAFX_ENABLE_VULKAN
 #include <QQuickGraphicsConfiguration>
 #include <QSGRendererInterface>