fix: libcommuni moment

remove irc maybe
Chatterino · Oct 19, 2023 · 0aef07a · 0aef07a
1 parent e3894c5
commit 0aef07a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/.CI/CreateUbuntuDeb.sh b/.CI/CreateUbuntuDeb.sh
@@ -26,7 +26,7 @@ case "$ubuntu_release" in
     22.04)
         if [ -n "$Qt6_DIR" ]; then
             echo "Qt6_DIR set, assuming Qt6"
-            dependencies="libc6, libstdc++6, libqt6core6, libqt6widgets6, libqt6network6, libqt6svg6, qt6-qpa-plugins, qt6-image-formats-plugins"
+            dependencies="libc6, libstdc++6, libqt6core6, libqt6widgets6, libqt6network6, libqt6core5compat6, libqt6svg6, qt6-qpa-plugins, qt6-image-formats-plugins"
         else
             dependencies="libc6, libstdc++6, libqt5core5a, libqt5concurrent5, libqt5dbus5, libqt5gui5, libqt5network5, libqt5svg5, libqt5widgets5, qt5-image-formats-plugins, libboost-filesystem1.74.0"
         fi

diff --git a/.docker/Dockerfile-ubuntu-22.04-qt6-build b/.docker/Dockerfile-ubuntu-22.04-qt6-build
@@ -39,7 +39,7 @@ RUN apt-get -y install \
 
 RUN pip3 install -U pip && \
         pip3 install aqtinstall && \
-        aqt install-qt linux desktop $QT_VERSION -O /opt/qt
+        aqt install-qt linux desktop $QT_VERSION -O /opt/qt --modules qt5compat
 
 ADD . /src
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -130,7 +130,7 @@ jobs:
         uses: jurplel/install-qt-action@v3.3.0
         with:
           cache: false
-          modules: qtimageformats
+          modules: qt5compat qtimageformats
           set-env: false
           version: 6.5.3
           extra: --noarchives

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
       fail-fast: false
     env:
       C2_BUILD_WITH_QT6: ${{ startsWith(matrix.qt-version, '6.') && 'ON' || 'OFF' }}
-      QT_MODULES: ${{ startsWith(matrix.qt-version, '6.') && 'qtimageformats' || '' }}
+      QT_MODULES: ${{ startsWith(matrix.qt-version, '6.') && 'qt5compat qtimageformats' || '' }}
 
     steps:
       - uses: actions/checkout@v4

diff --git a/BUILDING_ON_WINDOWS.md b/BUILDING_ON_WINDOWS.md
@@ -32,6 +32,7 @@ Notes:
 2. Unfold the top most tree element (latest stable Qt version, e.g. `Qt 6.5.3`)
 3. Under this version, select the following entries:
    - `MSVC 2019 64-bit` (or alternative version if you are using that)
+   - `Qt 5 Compatibility Module`
    - `Additional Libraries` > `Qt Image Formats`
 4. Under the "Tools" tree element (at the bottom), ensure that `Qt Creator X.X.X` and `Debugging Tools for Windows` are selected. (they should be checked by default)
 5. Continue through the installer and let the installer finish installing Qt.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,7 +42,7 @@
 - Dev: Update vcpkg to use Qt6. (#4872)
 - Dev: Replace `boost::optional` with `std::optional`. (#4877)
 - Dev: Improve performance by reducing repaints caused by selections. (#4889)
-- Dev: Removed dependency on Qt 5 compatibility module. (#4906)
+- Dev: Removed direct dependency on Qt 5 compatibility module. (#4906)
 
 ## 2.4.6