mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 03:18:07 +00:00
Remove Core5Compat dependency and use our own opacity implementation.
This commit is contained in:
parent
2d9f568e3d
commit
229fbe1713
4 changed files with 14 additions and 7 deletions
|
|
@ -206,7 +206,7 @@ set(ENABLE_CSHARP_WRAPPER OFF CACHE BOOL "Build the CSharp wrapper for Liblinpho
|
|||
set(ENABLE_THEORA OFF)
|
||||
set(ENABLE_QT_GL ${ENABLE_VIDEO})
|
||||
|
||||
find_package(Qt6 REQUIRED COMPONENTS Core Quick Widgets Core5Compat)
|
||||
find_package(Qt6 REQUIRED COMPONENTS Core Quick Widgets)
|
||||
|
||||
if(NOT Qt6_FOUND)
|
||||
message(FATAL_ERROR "Minimum supported Qt6!")
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ set(APP_TARGETS ${LinphoneCxx_TARGET}
|
|||
${LibLinphone_TARGET})#Liblinphone
|
||||
|
||||
set(QT_DEFAULT_MAJOR_VERSION 6)
|
||||
set(QT_PACKAGES Quick Qml Widgets Svg Multimedia Test NetworkAuth Concurrent Core5Compat)# Search Core at first for initialize Qt scripts for next find_packages.
|
||||
set(QT_PACKAGES Quick Qml Widgets Svg Multimedia Test NetworkAuth Concurrent)# Search Core at first for initialize Qt scripts for next find_packages.
|
||||
if (UNIX AND NOT APPLE)
|
||||
list(APPEND QT_PACKAGES DBus)
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ list(APPEND _LINPHONEAPP_RC_FILES data/assistant/use-app-sip-account.rc
|
|||
data/assistant/create-app-sip-account.rc
|
||||
data/assistant/use-other-sip-account.rc
|
||||
data/shaders/roundEffect.frag.qsb
|
||||
data/shaders/opacityMask.frag.qsb
|
||||
data/emoji/emoji.json
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import QtQuick.Controls as Control
|
|||
import QtQuick.Layouts
|
||||
import QtQuick.Shapes
|
||||
import QtQuick.Effects
|
||||
import Qt5Compat.GraphicalEffects
|
||||
|
||||
import Linphone
|
||||
import UtilsCpp
|
||||
|
|
@ -94,12 +93,19 @@ ProgressBar {
|
|||
opacity: 0.5
|
||||
}
|
||||
}
|
||||
OpacityMask {
|
||||
ShaderEffect {
|
||||
id: opacityEffect
|
||||
anchors.fill: progressRectangle
|
||||
source: progressRectangle
|
||||
maskSource: mask
|
||||
property var source: ShaderEffectSource
|
||||
{
|
||||
sourceItem: progressRectangle
|
||||
}
|
||||
property var maskSource: ShaderEffectSource
|
||||
{
|
||||
sourceItem: mask
|
||||
}
|
||||
fragmentShader: 'qrc:/data/shaders/opacityMask.frag.qsb'
|
||||
}
|
||||
|
||||
MouseArea {
|
||||
id: progression
|
||||
anchors.fill: parent
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue