Skip to content

Commit 4cae58d

Browse files
authored
Remove Qt Compat Graphic effects (#11153)
* Remove Qt Compat Graphic effects * Fold compat/MZRingShader into MZAnimatedRings * Remove qt6winhack.qml * Remove qt5compat from linux builds debian * No longer pull qt5compat in TC * Fix broken linter
1 parent fc9be5d commit 4cae58d

54 files changed

Lines changed: 112 additions & 312 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/wasm_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
run: |
5050
# Qt for wasm needs the desktop linux installation
5151
python -m aqt install-qt -O /opt linux desktop $QTVERSION linux_gcc_64 -m qtshadertools
52-
python -m aqt install-qt -O /opt all_os wasm $QTVERSION wasm_singlethread -m qtwebsockets qt5compat qtshadertools
52+
python -m aqt install-qt -O /opt all_os wasm $QTVERSION wasm_singlethread -m qtwebsockets qtshadertools
5353

5454
- name: Setup emsdk
5555
uses: mymindstorm/setup-emsdk@4528d102f7230f0e7b276855c01ea1159be0e984 # v16

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ set_property(GLOBAL PROPERTY AUTOGEN_TARGETS_FOLDER "Autogen")
138138
set_property(GLOBAL PROPERTY AUTOMOC_TARGETS_FOLDER "Autogen")
139139
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "Autogen")
140140

141-
find_package(Qt6 REQUIRED COMPONENTS
141+
find_package(Qt6 6.9 REQUIRED COMPONENTS
142142
Core
143143
Gui
144144
Network

linux/debian/control

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Build-Depends: debhelper (>= 13),
2222
libfreetype6-dev,
2323
libopengl-dev (>= 1.3.0~),
2424
libpolkit-gobject-1-dev,
25-
libqt6core5compat6-dev (>=6.2.0~),
2625
libqt6networkauth6-dev (>=6.2.0~),
2726
libqt6opengl6-dev (>=6.2.0~),
2827
libqt6svg6-dev (>=6.2.0~),
@@ -93,7 +92,6 @@ Depends: wireguard (>=1.0.20200319),
9392
libqt6svg6 (>=6.2.0~),
9493
libqt6websockets6 (>=6.2.0~),
9594
libqt6test6 (>=6.2.0~),
96-
qml6-module-qt5compat-graphicaleffects (>=6.2.0~),
9795
qml6-module-qtquick (>=6.2.0~),
9896
qml6-module-qtquick-controls (>=6.2.0~),
9997
qml6-module-qtquick-layouts (>=6.2.0~),

linux/flatpak/org.mozilla.vpn.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@ modules:
3333
cleanup:
3434
- '*'
3535

36-
- name: qt5compat
37-
buildsystem: cmake-ninja
38-
sources:
39-
- type: git
40-
tag: v6.10.1
41-
url: https://github.com/qt/qt5compat
42-
4336
- name: mozillavpn
4437
buildsystem: cmake-ninja
4538
config-opts:

linux/mozillavpn.spec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Requires: qt6-qtbase >= 6.0
1414
Requires: qt6-qtnetworkauth >= 6.0
1515
Requires: qt6-qtquickcontrols2 >= 6.0
1616
Requires: qt6-qtsvg >= 6.0
17-
Requires: qt6-qt5compat >= 6.0
1817
Requires: wireguard-tools
1918

2019
BuildRequires: cmake
@@ -33,7 +32,6 @@ BuildRequires: qt6-qtdeclarative-devel >= 6.0
3332
BuildRequires: qt6-qtsvg-devel >= 6.0
3433
BuildRequires: qt6-qttools-devel >= 6.0
3534
BuildRequires: qt6-qtwebsockets-devel >= 6.0
36-
BuildRequires: qt6-qt5compat-devel >= 6.0
3735
BuildRequires: qt6-qtbase-mysql >= 6.0
3836
BuildRequires: qt6-qtbase-odbc => 6.0
3937
BuildRequires: qt6-qtbase-postgresql => 6.0

nebula/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
qt_add_library(nebula STATIC)
66

77
add_subdirectory(ui/components)
8-
add_subdirectory(ui/compat)
98
add_subdirectory(ui/themes)
109
add_subdirectory(ui/resources)
1110
add_subdirectory(ui/utils)
@@ -16,8 +15,6 @@ target_link_libraries(nebula PRIVATE
1615
Qt6::Quick
1716
components
1817
componentsplugin
19-
compat
20-
compatplugin
2118
themes
2219
themesplugin
2320
resources

nebula/ui/compat/CMakeLists.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.

nebula/ui/compat/qt6/MZAnimatedRingsShader.qml

Lines changed: 0 additions & 12 deletions
This file was deleted.

nebula/ui/compat/qt6/MZColorOverlay.qml

Lines changed: 0 additions & 12 deletions
This file was deleted.

nebula/ui/compat/qt6/MZDropShadow.qml

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)