Skip to content
Snippets Groups Projects
0001-build-use-qt5compat-qml-module-to-build-on-qt6.4-for.patch 6.21 KiB
Newer Older
  • Learn to ignore specific revisions
  • From 82e3eda5709f1f8dd6bdb898a3c6b71a41cc4e62 Mon Sep 17 00:00:00 2001
    
    From: jkito <belter@riseup.net>
    
    Date: Sun, 25 Aug 2024 17:18:10 +0530
    Subject: [PATCH] build: use qt5compat qml module to build on qt6.4 for ubuntu
     and debian
    
    
    ---
     bitmask.pro                    |  2 +-
     gui/components/ErrorBox.qml    |  2 +-
     gui/components/Footer.qml      | 14 ++++++--------
     gui/components/Home.qml        |  2 +-
     gui/components/InitErrors.qml  |  2 +-
     gui/components/Locations.qml   |  7 +++----
     gui/components/MotdBox.qml     |  2 +-
     gui/components/Preferences.qml |  4 ++--
     gui/components/SignalIcon.qml  |  7 +++----
     gui/components/Splash.qml      |  2 +-
     gui/components/StatusBox.qml   |  2 +-
     11 files changed, 21 insertions(+), 25 deletions(-)
    
    diff --git a/bitmask.pro b/bitmask.pro
    
    index bbeacb12..58ba5f2f 100644
    
    --- a/bitmask.pro
    +++ b/bitmask.pro
    @@ -1,8 +1,8 @@
    
     TARGET = $$TARGET
    
     
     QT += quickcontrols2 svg
    -CONFIG += qt staticlib
     CONFIG += c++17 strict_c++
    +CONFIG += qt staticlib core5compat
     CONFIG += qtquickcompiler
    
    diff --git a/gui/components/ErrorBox.qml b/gui/components/ErrorBox.qml
    
    index 5667ed9d..ef8f58fb 100644
    
    --- a/gui/components/ErrorBox.qml
    +++ b/gui/components/ErrorBox.qml
    @@ -1,6 +1,6 @@
     import QtQuick
     import QtQuick.Controls
    -import QtQuick.Effects
    +import Qt5Compat.GraphicalEffects
     import "../themes/themes.js" as Theme
     
     Item {
    
    diff --git a/gui/components/Footer.qml b/gui/components/Footer.qml
    
    index d534f96a..9df6db62 100644
    
    --- a/gui/components/Footer.qml
    +++ b/gui/components/Footer.qml
    
    @@ -2,7 +2,7 @@ import QtQuick
    
     import QtQuick.Controls
     import QtQuick.Controls.Material
     import QtQuick.Layouts
    -import QtQuick.Effects
    +import Qt5Compat.GraphicalEffects
     import "../themes/themes.js" as Theme
     
    
     ToolBar {
    @@ -49,7 +49,7 @@ ToolBar {
    
             }
     
             Image {
    -            id: lightning
    +            id: lightning 
                 smooth: true
                 visible: ctx != undefined & root.selectedGateway == "auto"
                 width: 16
    
    @@ -61,11 +61,10 @@ ToolBar {
                     verticalCenter: gwButton.verticalCenter
    
                 }
             }
    -        MultiEffect {
    +        ColorOverlay{
                 anchors.fill: lightning
                 source: lightning
    -            colorizationColor: getLocationColor()
    -            colorization: 1.0
    +            color: getLocationColor()
                 antialiasing: true
             }
     
    
    @@ -123,11 +122,10 @@ ToolBar {
    
                     rightMargin: 20
                 }
             }
    -        MultiEffect {
    +        ColorOverlay{
                 anchors.fill: gwQuality
                 source: gwQuality
    -            colorizationColor: getSignalColor()
    -            colorization: 1.0
    +            color: getSignalColor()
                 antialiasing: false
             }
         }
    
    diff --git a/gui/components/Home.qml b/gui/components/Home.qml
    
    index f3bea85a..7830f46d 100644
    
    --- a/gui/components/Home.qml
    +++ b/gui/components/Home.qml
    @@ -1,6 +1,6 @@
     import QtQuick
     import QtQuick.Controls
    -import QtQuick.Effects
    +import Qt5Compat.GraphicalEffects
     
     Page {
         StatusBox {
    
    diff --git a/gui/components/InitErrors.qml b/gui/components/InitErrors.qml
    
    index aaf9897b..10b4755c 100644
    
    --- a/gui/components/InitErrors.qml
    +++ b/gui/components/InitErrors.qml
    @@ -1,6 +1,6 @@
     import QtQuick
     import QtQuick.Controls
    -import QtQuick.Effects
    +import Qt5Compat.GraphicalEffects
     
     ErrorBox {
     
    
    diff --git a/gui/components/Locations.qml b/gui/components/Locations.qml
    
    index 2a188738..6228a58c 100644
    
    --- a/gui/components/Locations.qml
    +++ b/gui/components/Locations.qml
    @@ -1,7 +1,7 @@
     import QtQuick
     import QtQuick.Controls
     import QtQuick.Layouts
    -import QtQuick.Effects
    +import Qt5Compat.GraphicalEffects
     
     import "../themes/themes.js" as Theme
     
    
    @@ -81,11 +81,10 @@ ThemedPage {
    
                             //verticalCenterOffset: 3
                         }
                     }
    -                MultiEffect {
    +                ColorOverlay{
                         anchors.fill: lightning
                         source: lightning
    -                    colorizationColor: "black"
    -                    colorization: 1.0
    +                    color: "black"
                         antialiasing: true
                     }
                 }
    
    diff --git a/gui/components/MotdBox.qml b/gui/components/MotdBox.qml
    
    index 2c8cdb8b..7b851c0c 100644
    
    --- a/gui/components/MotdBox.qml
    +++ b/gui/components/MotdBox.qml
    @@ -1,6 +1,6 @@
     import QtQuick
     import QtQuick.Controls
    -import QtQuick.Effects
    +import Qt5Compat.GraphicalEffects
     import "../themes/themes.js" as Theme
     
     Item {
    
    diff --git a/gui/components/Preferences.qml b/gui/components/Preferences.qml
    
    index d8ed6587..a0b6bba6 100644
    
    --- a/gui/components/Preferences.qml
    +++ b/gui/components/Preferences.qml
    
    @@ -2,8 +2,8 @@ import QtQuick
    
     import QtQuick.Controls
     import QtQuick.Layouts
     import QtQuick.Controls.Material
    -import QtQuick.Effects
    -import QtCore
    +import Qt5Compat.GraphicalEffects
    +import Qt.labs.settings
     
     import "../themes/themes.js" as Theme
     
    
    diff --git a/gui/components/SignalIcon.qml b/gui/components/SignalIcon.qml
    
    index 8747f054..38a23710 100644
    
    --- a/gui/components/SignalIcon.qml
    +++ b/gui/components/SignalIcon.qml
    @@ -1,7 +1,7 @@
     import QtQuick
     import QtQuick.Controls
     import QtQuick.Layouts
    -import QtQuick.Effects
    +import Qt5Compat.GraphicalEffects
     
     import "../themes/themes.js" as Theme
     
    
    @@ -41,11 +41,10 @@ Item {
    
                 ]
             }
         }
    -    MultiEffect {
    +    ColorOverlay{
             anchors.fill: icon
             source: icon
    -        colorizationColor: getQualityColor()
    -        colorization: 1.0
    +        color: getQualityColor()
             antialiasing: true
         }
     
    
    diff --git a/gui/components/Splash.qml b/gui/components/Splash.qml
    
    index c9351804..d18cc3ba 100644
    
    --- a/gui/components/Splash.qml
    +++ b/gui/components/Splash.qml
    @@ -1,6 +1,6 @@
     import QtQuick
     import QtQuick.Controls
    -import QtQuick.Effects
    +import Qt5Compat.GraphicalEffects
     import "../themes/themes.js" as Theme
     
     Page {
    
    diff --git a/gui/components/StatusBox.qml b/gui/components/StatusBox.qml
    
    index d17c2fe0..24a1f8f2 100644
    
    --- a/gui/components/StatusBox.qml
    +++ b/gui/components/StatusBox.qml
    @@ -1,6 +1,6 @@
     import QtQuick
     import QtQuick.Controls
    -import QtQuick.Effects
    +import Qt5Compat.GraphicalEffects
     import QtQuick.Layouts
     import QtQuick.Templates as T
    
     import QtQuick.Controls.impl
    --