data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Qt warning: Update qml resource for policy QTP0001

Browse source
This commit is contained in:
Julien Wadel 2024-10-21 10:54:34 +02:00
parent 84aa09cdab
commit fea341444c
11 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Linphone/CMakeLists.txt
View file

@ -128,10 +128,9 @@ qt6_add_executable(Linphone
set_source_files_properties(${_LINPHONEAPP_QML_SINGLETONS} PROPERTIES QT_QML_SINGLETON_TYPE TRUE) set_source_files_properties(${_LINPHONEAPP_QML_SINGLETONS} PROPERTIES QT_QML_SINGLETON_TYPE TRUE)
qt_policy(SET QTP0001 NEW)
qt6_add_qml_module(Linphone qt6_add_qml_module(Linphone
URI Linphone URI Linphone
RESOURCE_PREFIX ""
VERSION 1.0 VERSION 1.0
QML_FILES ${_LINPHONEAPP_QML_FILES} ${_LINPHONEAPP_QML_SINGLETONS} QML_FILES ${_LINPHONEAPP_QML_FILES} ${_LINPHONEAPP_QML_SINGLETONS}
RESOURCES data/fonts.qrc RESOURCES data/fonts.qrc

5
Linphone/core/App.cpp
View file

@ -438,7 +438,6 @@ void App::initCore() {
selector->setExtraSelectors(selectors); selector->setExtraSelectors(selectors);
lInfo() << log().arg("Activated selectors:") << selector->selector()->allSelectors(); lInfo() << log().arg("Activated selectors:") << selector->selector()->allSelectors();
mEngine->addImportPath(":/");
mEngine->rootContext()->setContextProperty("applicationDirPath", QGuiApplication::applicationDirPath()); mEngine->rootContext()->setContextProperty("applicationDirPath", QGuiApplication::applicationDirPath());
#ifdef APPLICATION_VENDOR #ifdef APPLICATION_VENDOR
mEngine->rootContext()->setContextProperty("applicationVendor", APPLICATION_VENDOR); mEngine->rootContext()->setContextProperty("applicationVendor", APPLICATION_VENDOR);
@ -482,7 +481,7 @@ void App::initCore() {
Qt::UniqueConnection); Qt::UniqueConnection);
setLocale(settings->getConfigLocale()); setLocale(settings->getConfigLocale());
const QUrl url(u"qrc:/Linphone/view/Page/Window/Main/MainWindow.qml"_qs); const QUrl url(u"qrc:/qt/qml/Linphone/view/Page/Window/Main/MainWindow.qml"_qs);
QObject::connect( QObject::connect(
mEngine, &QQmlApplicationEngine::objectCreated, this, mEngine, &QQmlApplicationEngine::objectCreated, this,
[this, url](QObject *obj, const QUrl &objUrl) { [this, url](QObject *obj, const QUrl &objUrl) {
@ -714,7 +713,7 @@ bool App::notify(QObject *receiver, QEvent *event) {
QQuickWindow *App::getCallsWindow(QVariant callGui) { QQuickWindow *App::getCallsWindow(QVariant callGui) {
mustBeInMainThread(getClassName()); mustBeInMainThread(getClassName());
if (!mCallsWindow) { if (!mCallsWindow) {
const QUrl callUrl("qrc:/Linphone/view/Page/Window/Call/CallsWindow.qml"); const QUrl callUrl("qrc:/qt/qml/Linphone/view/Page/Window/Call/CallsWindow.qml");
lInfo() << log().arg("Creating subwindow: `%1`.").arg(callUrl.toString()); lInfo() << log().arg("Creating subwindow: `%1`.").arg(callUrl.toString());

2
Linphone/core/notifier/Notifier.cpp
View file

@ -45,7 +45,7 @@ DEFINE_ABSTRACT_OBJECT(Notifier)
using namespace std; using namespace std;
namespace { namespace {
constexpr char NotificationsPath[] = "qrc:/Linphone/view/Control/Popup/Notification/"; constexpr char NotificationsPath[] = "qrc:/qt/qml/Linphone/view/Control/Popup/Notification/";
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// Notifications QML properties/methods. // Notifications QML properties/methods.

4
Linphone/tool/Constants.hpp
View file

@ -154,8 +154,8 @@ public:
static constexpr char LanguagePath[] = ":/languages/"; static constexpr char LanguagePath[] = ":/languages/";
// The main windows of Linphone desktop. // The main windows of Linphone desktop.
static constexpr char QmlViewMainWindow[] = "qrc:/Linphone/view/Page/Window/Main/MainWindow.qml"; static constexpr char QmlViewMainWindow[] = "qrc:/qt/qml/Linphone/view/Page/Window/Main/MainWindow.qml";
static constexpr char QmlViewCallsWindow[] = "qrc:/Linphone/view/Page/Window/Call/CallsWindow.qml"; static constexpr char QmlViewCallsWindow[] = "qrc:/qt/qml/Linphone/view/Page/Window/Call/CallsWindow.qml";
static constexpr char MainQmlUri[] = "Linphone"; static constexpr char MainQmlUri[] = "Linphone";

2
Linphone/view/Control/Button/Settings/ComboSetting.qml
View file

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls.Basic import QtQuick.Controls.Basic
import QtQuick.Layouts import QtQuick.Layouts
import Linphone import Linphone
import 'qrc:/Linphone/view/Control/Tool/Helper/utils.js' as Utils import 'qrc:/qt/qml/Linphone/view/Control/Tool/Helper/utils.js' as Utils
ComboBox { ComboBox {
id: comboBox id: comboBox

2
Linphone/view/Page/Form/Login/SIPLoginPage.qml
View file

@ -4,7 +4,7 @@ import QtQuick.Controls.Basic as Control
import Linphone import Linphone
import ConstantsCpp import ConstantsCpp
import SettingsCpp import SettingsCpp
import 'qrc:/Linphone/view/Control/Tool/Helper/utils.js' as Utils import 'qrc:/qt/qml/Linphone/view/Control/Tool/Helper/utils.js' as Utils
LoginLayout { LoginLayout {
id: mainItem id: mainItem

2
Linphone/view/Page/Form/Settings/AccountSettingsPage.qml
View file

@ -8,7 +8,7 @@ import SettingsCpp 1.0
import LinphoneAccountsCpp import LinphoneAccountsCpp
AbstractSettingsMenu { AbstractSettingsMenu {
layoutsPath: "qrc:/Linphone/view/Page/Layout/Settings" layoutsPath: "qrc:/qt/qml/Linphone/view/Page/Layout/Settings"
titleText: qsTr("Mon compte") titleText: qsTr("Mon compte")
property AccountProxy accounts: AccountProxy {id: accountProxy} property AccountProxy accounts: AccountProxy {id: accountProxy}
property AccountGui account: accountProxy.defaultAccount property AccountGui account: accountProxy.defaultAccount

2
Linphone/view/Page/Form/Settings/SettingsPage.qml
View file

@ -5,7 +5,7 @@ import QtQuick.Controls.Basic as Control
import SettingsCpp import SettingsCpp
AbstractSettingsMenu { AbstractSettingsMenu {
layoutsPath: "qrc:/Linphone/view/Page/Layout/Settings" layoutsPath: "qrc:/qt/qml/Linphone/view/Page/Layout/Settings"
titleText: qsTr("Paramètres") titleText: qsTr("Paramètres")
families: [ families: [
{title: qsTr("Appels"), layout: "CallSettingsLayout"}, {title: qsTr("Appels"), layout: "CallSettingsLayout"},

2
Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml
View file

@ -5,7 +5,7 @@ import QtQuick.Controls.Basic as Control
import SettingsCpp 1.0 import SettingsCpp 1.0
import UtilsCpp 1.0 import UtilsCpp 1.0
import Linphone import Linphone
import 'qrc:/Linphone/view/Control/Tool/Helper/utils.js' as Utils import 'qrc:/qt/qml/Linphone/view/Control/Tool/Helper/utils.js' as Utils
AbstractSettingsLayout { AbstractSettingsLayout {
contentComponent: content contentComponent: content

3
Linphone/view/Page/Main/Call/CallPage.qml
View file

@ -244,9 +244,7 @@ AbstractMainPage {
onFilterTextChanged: maxDisplayItems = initialDisplayItems onFilterTextChanged: maxDisplayItems = initialDisplayItems
initialDisplayItems: historyListView.height / (56 * DefaultStyle.dp) + 5 initialDisplayItems: historyListView.height / (56 * DefaultStyle.dp) + 5
displayItemsStep: initialDisplayItems / 2 displayItemsStep: initialDisplayItems / 2
onCountChanged: console.log("callHistoryProxy : " +count)
} }
Component.onCompleted: console.log("historyListView completed")
cacheBuffer: contentHeight>0 ? contentHeight : 0// cache all items cacheBuffer: contentHeight>0 ? contentHeight : 0// cache all items
flickDeceleration: 10000 flickDeceleration: 10000
spacing: 10 * DefaultStyle.dp spacing: 10 * DefaultStyle.dp
@ -276,7 +274,6 @@ AbstractMainPage {
anchors.topMargin: 5 * DefaultStyle.dp anchors.topMargin: 5 * DefaultStyle.dp
anchors.bottomMargin: 5 * DefaultStyle.dp anchors.bottomMargin: 5 * DefaultStyle.dp
visible: !!modelData visible: !!modelData
Component.onCompleted: console.log(index + " => Completed "+visible)
RowLayout { RowLayout {
z: 1 z: 1
anchors.fill: parent anchors.fill: parent

2
Linphone/view/Page/Main/Help/HelpPage.qml
View file

@ -117,7 +117,7 @@ AbstractMainPage {
title: qsTr("Dépannage") title: qsTr("Dépannage")
onClicked: { onClicked: {
rightPanelStackView.clear() rightPanelStackView.clear()
rightPanelStackView.push("qrc:/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml", { titleText: troubleShooting.title, container: rightPanelStackView }) rightPanelStackView.push("qrc:/qt/qml/Linphone/view/Page/Layout/Settings/DebugSettingsLayout.qml", { titleText: troubleShooting.title, container: rightPanelStackView })
} }
} }
Item { Item {