remove: obsolete qt5compat

Signed-off-by: Patrizio Bekerle <[email protected]>
pbek · Aug 8, 2024 · 8146855 · 8146855
1 parent 5332d64
commit 8146855
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/.github/workflows/build-release-qt6.yml b/.github/workflows/build-release-qt6.yml
@@ -35,7 +35,7 @@ env:
   QMAKE_PROJECT: "QOwnNotes.pro"
   PUBLISHER: "Patrizio Bekerle"
   REPO_DIR: "/home/runner/work/QOwnNotes"
-  QT_MODULES: "qtwebsockets qt5compat"
+  QT_MODULES: "qtwebsockets"
   QMAKE: qmake6
   CORES: 16
 

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -164,7 +164,7 @@ jobs:
         aqtversion: '==2.0.0'
         version: ${{ matrix.qt-version }}
         arch: win64_mingw
-        modules: qtwebsockets qt5compat
+        modules: qtwebsockets
         cache: true
     - if: contains( matrix.os, 'windows') && startsWith( matrix.qt-version, '6.' ) && matrix.qt-version != '6.2.4'
       name: Install Qt 6 on Windows
@@ -173,7 +173,7 @@ jobs:
         aqtversion: '==2.1.*'
         version: ${{ matrix.qt-version }}
         arch: win64_mingw
-        modules: qtwebsockets qt5compat
+        modules: qtwebsockets
         cache: true
     - if: false == contains( matrix.os, 'windows') && false == startsWith( matrix.qt-version, '6.' )
       name: Install Qt < 6 on Linux/macOS
@@ -188,7 +188,7 @@ jobs:
       with:
         aqtversion: '==2.0.0'
         version: ${{ matrix.qt-version }}
-        modules: qtwebsockets qt5compat
+        modules: qtwebsockets
         cache: true
 
       #

diff --git a/README.md b/README.md
@@ -154,7 +154,7 @@ git submodule update --init
 ```
 
 Then download [Qt Creator](https://www.qt.io/download-open-source), you will also
-need the packages `qtwebsockets` and `qt5compat` to build QOwnNotes with Qt6
+need the packages `qtwebsockets` to build QOwnNotes with Qt6
 (only `qtwebsockets` for Qt5). If you build under Windows, you want to stick to
 *MinGw 64-bit*.
 

diff --git a/flake.nix b/flake.nix
@@ -48,7 +48,6 @@
         qtwebsockets
         qtdeclarative
         qtsvg
-        qt5compat
         botan2
       ];
 

diff --git a/shell.nix b/shell.nix
@@ -28,7 +28,6 @@
       qtwebsockets
       qtdeclarative
       qtsvg
-      qt5compat
       botan2
     ];
 

diff --git a/webpage/src/installation/building.md b/webpage/src/installation/building.md
@@ -14,8 +14,7 @@ git submodule update --init
 
 For debugging, it's easiest to use QtCreator. When downloading
 [Qt Creator](https://www.qt.io/download-qt-installer-oss), you will also
-need the packages `qtwebsockets` and `qt5compat` to build QOwnNotes with Qt6
-(only `qtwebsockets` for Qt5). If you build under Windows, you want to stick to
+need the package `qtwebsockets` to build QOwnNotes with Qt6. If you build under Windows, you want to stick to
 *MinGw 64-bit*. On Linux, you most likely have a package for QtCreator in your repository.
 
 Afterward open the project file `src/QOwnNotes.pro` and click on
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,6 @@ @@
             qtwebsockets
             qtdeclarative
             qtsvg
-            qt5compat
             botan2
           ];
@@ Expand Down @@