diff --git a/Linphone/core/App.cpp b/Linphone/core/App.cpp index 82dcf8170..5c1d25138 100644 --- a/Linphone/core/App.cpp +++ b/Linphone/core/App.cpp @@ -297,12 +297,6 @@ App::App(int &argc, char *argv[]) QCoreApplication::setApplicationName(EXECUTABLE_NAME); QApplication::setOrganizationDomain(EXECUTABLE_NAME); QCoreApplication::setApplicationVersion(APPLICATION_SEMVER); - // CarshReporter must be call after app initialization like names. -#ifdef HAVE_CRASH_HANDLER - CrashReporter::start(); -#else - lWarning() << "[Main] The application doesn't support the CrashReporter."; -#endif // If not OpenGL, createRender is never call. QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL); diff --git a/Linphone/core/proxy/ListProxy.hpp b/Linphone/core/proxy/ListProxy.hpp index 438ea88d5..4aa01c65a 100644 --- a/Linphone/core/proxy/ListProxy.hpp +++ b/Linphone/core/proxy/ListProxy.hpp @@ -31,7 +31,6 @@ class ListProxy : public AbstractListProxy> { Q_OBJECT public: - Q_PROPERTY(int count READ getCount NOTIFY countChanged) ListProxy(QObject *parent = Q_NULLPTR); virtual ~ListProxy(); diff --git a/Linphone/core/setting/SettingsCore.cpp b/Linphone/core/setting/SettingsCore.cpp index 043aa5919..974e9c495 100644 --- a/Linphone/core/setting/SettingsCore.cpp +++ b/Linphone/core/setting/SettingsCore.cpp @@ -570,8 +570,8 @@ void SettingsCore::setSelf(QSharedPointer me) { disableChatFeature, DisableChatFeature) DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, disableMeetingsFeature, DisableMeetingsFeature) - DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, - showPastMeetings, ShowPastMeetings) + DEFINE_CORE_GET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, + showPastMeetings, ShowPastMeetings) DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, disableBroadcastFeature, DisableBroadcastFeature) DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, @@ -580,8 +580,8 @@ void SettingsCore::setSelf(QSharedPointer me) { HideSettings) DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, hideAccountSettings, HideAccountSettings) - DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, hideFps, - HideFps) + DEFINE_CORE_GET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, hideFps, + HideFps) DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, disableCallRecordings, DisableCallRecordings) DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, @@ -605,16 +605,16 @@ void SettingsCore::setSelf(QSharedPointer me) { assistantThirdPartySipAccountDomain, AssistantThirdPartySipAccountDomain) DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, QString, assistantThirdPartySipAccountTransport, AssistantThirdPartySipAccountTransport) - DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, autoStart, - AutoStart) + DEFINE_CORE_GET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, autoStart, + AutoStart) DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, exitOnClose, ExitOnClose) DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, bool, syncLdapContacts, SyncLdapContacts) DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, QString, configLocale, ConfigLocale) - DEFINE_CORE_GETSET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, QString, - downloadFolder, DownloadFolder) + DEFINE_CORE_GET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, QString, + downloadFolder, DownloadFolder) DEFINE_CORE_GET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, int, shortcutCount, ShortcutCount) DEFINE_CORE_GET_CONNECT(mSettingsModelConnection, SettingsCore, SettingsModel, settingsModel, QVariantList, diff --git a/Linphone/view/Control/Button/CheckableButton.qml b/Linphone/view/Control/Button/CheckableButton.qml index 5f14658ee..5a32a467d 100644 --- a/Linphone/view/Control/Button/CheckableButton.qml +++ b/Linphone/view/Control/Button/CheckableButton.qml @@ -14,7 +14,7 @@ Button { color: style?.color?.normal || DefaultStyle.grey_500 pressedColor: checkedIconUrl ? color : style?.color?.pressed || DefaultStyle.grey_500 hoveredColor: checked ? Qt.darker(pressedColor, 1.05) : style?.color?.hovered || DefaultStyle.grey_500 - property color backgroundColor: hovered + backgroundColor: hovered ? hoveredColor : checked ? pressedColor diff --git a/Linphone/view/Control/Button/PopupButton.qml b/Linphone/view/Control/Button/PopupButton.qml index 285dd80ad..21115e56a 100644 --- a/Linphone/view/Control/Button/PopupButton.qml +++ b/Linphone/view/Control/Button/PopupButton.qml @@ -8,9 +8,9 @@ import "qrc:/qt/qml/Linphone/view/Style/buttonStyle.js" as ButtonStyle Button { id: mainItem property alias popup: popup - property bool shadowEnabled: mainItem.activeFocus && !keyboardFocus || hovered + shadowEnabled: mainItem.activeFocus && !keyboardFocus || hovered property alias popupBackgroundColor: popupBackground.color - property color backgroundColor: checked ? pressedColor : hovered || mainItem.activeFocus ? hoveredColor : color + backgroundColor: checked ? pressedColor : hovered || mainItem.activeFocus ? hoveredColor : color property string popUpTitle: "" property int popupY: height Accessible.name: popup.visible ? diff --git a/Linphone/view/Control/Display/Chat/ChatAudioContent.qml b/Linphone/view/Control/Display/Chat/ChatAudioContent.qml index d56dedba8..dfd6e791b 100644 --- a/Linphone/view/Control/Display/Chat/ChatAudioContent.qml +++ b/Linphone/view/Control/Display/Chat/ChatAudioContent.qml @@ -88,7 +88,7 @@ Item { active: mainItem.recording && !mainItem.chatMessageContentGui property int duration: item?.core.duration || 0 property int captureVolume: item?.core.captureVolume || 0 - property var state: item?.core.state + property var recorderState: item?.core.state Connections { target: mainItem @@ -120,7 +120,7 @@ Item { : chatMessageContentGui.core.fileDuration progressPosition: 0 value: 0 - recording: recorderLoader.state === LinphoneEnums.RecorderState.Running + recording: recorderLoader.recorderState === LinphoneEnums.RecorderState.Running function refresh(){ if(soudPlayerLoader.item){ soudPlayerLoader.item.core.lRefreshPosition() diff --git a/Linphone/view/Page/Main/Account/AccountListView.qml b/Linphone/view/Page/Main/Account/AccountListView.qml index 7affd9a22..a76440f72 100644 --- a/Linphone/view/Page/Main/Account/AccountListView.qml +++ b/Linphone/view/Page/Main/Account/AccountListView.qml @@ -25,7 +25,7 @@ ColumnLayout{ signal editAccount(AccountGui account) readonly property var childrenWidth: Utils.getSizeWithScreenRatio(517) - readonly property real spacing: Utils.getSizeWithScreenRatio(16) + spacing: Utils.getSizeWithScreenRatio(16) required property var getPreviousItem required property var getNextItem property AccountProxy accountProxy @@ -63,16 +63,15 @@ ColumnLayout{ index) : null } } - - Repeater{ - model: AccountProxy { - id: accountProxy + ColumnLayout { + Repeater{ + model: AccountProxy { + id: accountProxy + } + delegate: contactDelegate } - delegate: contactDelegate } HorizontalBar{ - Layout.topMargin: mainItem.spacing - Layout.bottomMargin: mainItem.spacing visible: addAccountButton.visible color: DefaultStyle.main2_300 } diff --git a/Linphone/view/Page/Main/Call/CallPage.qml b/Linphone/view/Page/Main/Call/CallPage.qml index fcc001c67..4352eccdf 100644 --- a/Linphone/view/Page/Main/Call/CallPage.qml +++ b/Linphone/view/Page/Main/Call/CallPage.qml @@ -38,7 +38,6 @@ AbstractMainPage { id: accountProxy } property AccountGui account: accountProxy.defaultAccount - property var state: account && account.core?.registrationState || 0 property bool isRegistered: account ? account.core?.registrationState == LinphoneEnums.RegistrationState.Ok : false property int selectedParticipantsCount diff --git a/Linphone/view/Page/Main/Chat/ChatPage.qml b/Linphone/view/Page/Main/Chat/ChatPage.qml index c7e42b66d..ebcfd9181 100644 --- a/Linphone/view/Page/Main/Chat/ChatPage.qml +++ b/Linphone/view/Page/Main/Chat/ChatPage.qml @@ -28,7 +28,6 @@ AbstractMainPage { id: accountProxy } property AccountGui account: accountProxy.defaultAccount - property var state: account && account.core?.registrationState || 0 property bool isRegistered: account ? account.core?.registrationState == LinphoneEnums.RegistrationState.Ok : false @@ -114,7 +113,7 @@ AbstractMainPage { clip: true initialItem: chatListItem focus: true - onActiveFocusChanged: if (activeFocus) { + onActiveFocusChanged: if (activeFocus && currentItem) { currentItem.forceActiveFocus() } } diff --git a/Linphone/view/Page/Main/Contact/ContactPage.qml b/Linphone/view/Page/Main/Contact/ContactPage.qml index d18d8674d..3c496e2f8 100644 --- a/Linphone/view/Page/Main/Contact/ContactPage.qml +++ b/Linphone/view/Page/Main/Contact/ContactPage.qml @@ -336,9 +336,9 @@ AbstractMainPage { Component { id: contactDetail Item { + objectName: "contactDetail" width: parent?.width height: parent?.height - property string objectName: "contactDetail" function focusEditButton(){ contactDetail.button.forceActiveFocus(Qt.TabFocusReason) @@ -928,7 +928,7 @@ AbstractMainPage { Component { id: contactEdition ContactEdition { - property string objectName: "contactEdition" + objectName: "contactEdition" onCloseEdition: redirectAddress => { goToContactDetails(true) if (redirectAddress) { diff --git a/Linphone/view/Page/Main/Meeting/MeetingPage.qml b/Linphone/view/Page/Main/Meeting/MeetingPage.qml index a57b9fe9f..33f1ee4e9 100644 --- a/Linphone/view/Page/Main/Meeting/MeetingPage.qml +++ b/Linphone/view/Page/Main/Meeting/MeetingPage.qml @@ -145,7 +145,7 @@ AbstractMainPage { Component { id: listLayout FocusScope{ - property string objectName: "listLayout" + objectName: "listLayout" property alias newConfButton: newConfButton Control.StackView.onDeactivated: { mainItem.selectedConference = null diff --git a/Linphone/view/Page/Window/Call/CallsWindow.qml b/Linphone/view/Page/Window/Call/CallsWindow.qml index 083a4f26f..13011c95e 100644 --- a/Linphone/view/Page/Window/Call/CallsWindow.qml +++ b/Linphone/view/Page/Window/Call/CallsWindow.qml @@ -1339,7 +1339,7 @@ AbstractWindow { Component { id: inCallItem Loader { - property string objectName: "inCallItem" + objectName: "inCallItem" asynchronous: true sourceComponent: Item { CallLayout {