From fea341444ce59819274bdcdc9db6be8fe5f63d1a Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Mon, 21 Oct 2024 10:54:34 +0200 Subject: [PATCH] Remove Qt warning: Update qml resource for policy QTP0001 --- Linphone/CMakeLists.txt | 3 +-- Linphone/core/App.cpp | 5 ++--- Linphone/core/notifier/Notifier.cpp | 2 +- Linphone/tool/Constants.hpp | 4 ++-- Linphone/view/Control/Button/Settings/ComboSetting.qml | 2 +- Linphone/view/Page/Form/Login/SIPLoginPage.qml | 2 +- Linphone/view/Page/Form/Settings/AccountSettingsPage.qml | 2 +- Linphone/view/Page/Form/Settings/SettingsPage.qml | 2 +- .../view/Page/Layout/Settings/AdvancedSettingsLayout.qml | 2 +- Linphone/view/Page/Main/Call/CallPage.qml | 3 --- Linphone/view/Page/Main/Help/HelpPage.qml | 2 +- 11 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Linphone/CMakeLists.txt b/Linphone/CMakeLists.txt index 40a54cec5..5b3e60ebb 100644 --- a/Linphone/CMakeLists.txt +++ b/Linphone/CMakeLists.txt @@ -128,10 +128,9 @@ qt6_add_executable(Linphone set_source_files_properties(${_LINPHONEAPP_QML_SINGLETONS} PROPERTIES QT_QML_SINGLETON_TYPE TRUE) - +qt_policy(SET QTP0001 NEW) qt6_add_qml_module(Linphone URI Linphone - RESOURCE_PREFIX "" VERSION 1.0 QML_FILES ${_LINPHONEAPP_QML_FILES} ${_LINPHONEAPP_QML_SINGLETONS} RESOURCES data/fonts.qrc diff --git a/Linphone/core/App.cpp b/Linphone/core/App.cpp index 636f4c1d0..3bbebf293 100644 --- a/Linphone/core/App.cpp +++ b/Linphone/core/App.cpp @@ -438,7 +438,6 @@ void App::initCore() { selector->setExtraSelectors(selectors); lInfo() << log().arg("Activated selectors:") << selector->selector()->allSelectors(); - mEngine->addImportPath(":/"); mEngine->rootContext()->setContextProperty("applicationDirPath", QGuiApplication::applicationDirPath()); #ifdef APPLICATION_VENDOR mEngine->rootContext()->setContextProperty("applicationVendor", APPLICATION_VENDOR); @@ -482,7 +481,7 @@ void App::initCore() { Qt::UniqueConnection); 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( mEngine, &QQmlApplicationEngine::objectCreated, this, [this, url](QObject *obj, const QUrl &objUrl) { @@ -714,7 +713,7 @@ bool App::notify(QObject *receiver, QEvent *event) { QQuickWindow *App::getCallsWindow(QVariant callGui) { mustBeInMainThread(getClassName()); 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()); diff --git a/Linphone/core/notifier/Notifier.cpp b/Linphone/core/notifier/Notifier.cpp index e7a147bb6..0dce0c260 100644 --- a/Linphone/core/notifier/Notifier.cpp +++ b/Linphone/core/notifier/Notifier.cpp @@ -45,7 +45,7 @@ DEFINE_ABSTRACT_OBJECT(Notifier) using namespace std; 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. diff --git a/Linphone/tool/Constants.hpp b/Linphone/tool/Constants.hpp index 79cc10a0a..2332c403e 100644 --- a/Linphone/tool/Constants.hpp +++ b/Linphone/tool/Constants.hpp @@ -154,8 +154,8 @@ public: static constexpr char LanguagePath[] = ":/languages/"; // The main windows of Linphone desktop. - static constexpr char QmlViewMainWindow[] = "qrc:/Linphone/view/Page/Window/Main/MainWindow.qml"; - static constexpr char QmlViewCallsWindow[] = "qrc:/Linphone/view/Page/Window/Call/CallsWindow.qml"; + static constexpr char QmlViewMainWindow[] = "qrc:/qt/qml/Linphone/view/Page/Window/Main/MainWindow.qml"; + static constexpr char QmlViewCallsWindow[] = "qrc:/qt/qml/Linphone/view/Page/Window/Call/CallsWindow.qml"; static constexpr char MainQmlUri[] = "Linphone"; diff --git a/Linphone/view/Control/Button/Settings/ComboSetting.qml b/Linphone/view/Control/Button/Settings/ComboSetting.qml index 1fe09219c..86c8eb7c3 100644 --- a/Linphone/view/Control/Button/Settings/ComboSetting.qml +++ b/Linphone/view/Control/Button/Settings/ComboSetting.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls.Basic import QtQuick.Layouts 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 { id: comboBox diff --git a/Linphone/view/Page/Form/Login/SIPLoginPage.qml b/Linphone/view/Page/Form/Login/SIPLoginPage.qml index fd7deec24..14388193c 100644 --- a/Linphone/view/Page/Form/Login/SIPLoginPage.qml +++ b/Linphone/view/Page/Form/Login/SIPLoginPage.qml @@ -4,7 +4,7 @@ import QtQuick.Controls.Basic as Control import Linphone import ConstantsCpp 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 { id: mainItem diff --git a/Linphone/view/Page/Form/Settings/AccountSettingsPage.qml b/Linphone/view/Page/Form/Settings/AccountSettingsPage.qml index cad56e1f1..20a8d50b1 100644 --- a/Linphone/view/Page/Form/Settings/AccountSettingsPage.qml +++ b/Linphone/view/Page/Form/Settings/AccountSettingsPage.qml @@ -8,7 +8,7 @@ import SettingsCpp 1.0 import LinphoneAccountsCpp AbstractSettingsMenu { - layoutsPath: "qrc:/Linphone/view/Page/Layout/Settings" + layoutsPath: "qrc:/qt/qml/Linphone/view/Page/Layout/Settings" titleText: qsTr("Mon compte") property AccountProxy accounts: AccountProxy {id: accountProxy} property AccountGui account: accountProxy.defaultAccount diff --git a/Linphone/view/Page/Form/Settings/SettingsPage.qml b/Linphone/view/Page/Form/Settings/SettingsPage.qml index 4acf7aa37..66e72534c 100644 --- a/Linphone/view/Page/Form/Settings/SettingsPage.qml +++ b/Linphone/view/Page/Form/Settings/SettingsPage.qml @@ -5,7 +5,7 @@ import QtQuick.Controls.Basic as Control import SettingsCpp AbstractSettingsMenu { - layoutsPath: "qrc:/Linphone/view/Page/Layout/Settings" + layoutsPath: "qrc:/qt/qml/Linphone/view/Page/Layout/Settings" titleText: qsTr("Paramètres") families: [ {title: qsTr("Appels"), layout: "CallSettingsLayout"}, diff --git a/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml b/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml index ac94057d1..6a41a8cdc 100644 --- a/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml +++ b/Linphone/view/Page/Layout/Settings/AdvancedSettingsLayout.qml @@ -5,7 +5,7 @@ import QtQuick.Controls.Basic as Control import SettingsCpp 1.0 import UtilsCpp 1.0 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 { contentComponent: content diff --git a/Linphone/view/Page/Main/Call/CallPage.qml b/Linphone/view/Page/Main/Call/CallPage.qml index fc285d5ca..d3e3fae1a 100644 --- a/Linphone/view/Page/Main/Call/CallPage.qml +++ b/Linphone/view/Page/Main/Call/CallPage.qml @@ -244,9 +244,7 @@ AbstractMainPage { onFilterTextChanged: maxDisplayItems = initialDisplayItems initialDisplayItems: historyListView.height / (56 * DefaultStyle.dp) + 5 displayItemsStep: initialDisplayItems / 2 - onCountChanged: console.log("callHistoryProxy : " +count) } - Component.onCompleted: console.log("historyListView completed") cacheBuffer: contentHeight>0 ? contentHeight : 0// cache all items flickDeceleration: 10000 spacing: 10 * DefaultStyle.dp @@ -276,7 +274,6 @@ AbstractMainPage { anchors.topMargin: 5 * DefaultStyle.dp anchors.bottomMargin: 5 * DefaultStyle.dp visible: !!modelData - Component.onCompleted: console.log(index + " => Completed "+visible) RowLayout { z: 1 anchors.fill: parent diff --git a/Linphone/view/Page/Main/Help/HelpPage.qml b/Linphone/view/Page/Main/Help/HelpPage.qml index ac12ca446..ed3ee2bc6 100644 --- a/Linphone/view/Page/Main/Help/HelpPage.qml +++ b/Linphone/view/Page/Main/Help/HelpPage.qml @@ -117,7 +117,7 @@ AbstractMainPage { title: qsTr("Dépannage") onClicked: { 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 {