From cfe9ef697dd64233fa5dfdce9e486fc4f906f154 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 26 Feb 2020 13:57:10 +0100 Subject: [PATCH] Use CMAKE configuration for specify URL location for about view --- src/app/App.cpp | 3 +++ src/config.h.cmake | 1 + ui/views/App/Main/Dialogs/About.qml | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/App.cpp b/src/app/App.cpp index febb9efd9..09d0457dc 100644 --- a/src/app/App.cpp +++ b/src/app/App.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -317,6 +318,8 @@ void App::initContentApp () { mEngine->addImageProvider(ImageProvider::ProviderId, new ImageProvider()); mEngine->addImageProvider(ThumbnailProvider::ProviderId, new ThumbnailProvider()); + mEngine->rootContext()->setContextProperty("applicationUrl", APPLICATION_URL); + registerTypes(); registerSharedTypes(); registerToolTypes(); diff --git a/src/config.h.cmake b/src/config.h.cmake index 5d0a5dcf2..093539e08 100644 --- a/src/config.h.cmake +++ b/src/config.h.cmake @@ -24,6 +24,7 @@ #cmakedefine APPLICATION_ID "${APPLICATION_ID}" #cmakedefine APPLICATION_NAME "${APPLICATION_NAME}" #cmakedefine APPLICATION_VENDOR "${APPLICATION_VENDOR}" +#cmakedefine APPLICATION_URL "${APPLICATION_URL}" #cmakedefine ENABLE_UPDATE_CHECK 1 #cmakedefine EXECUTABLE_NAME "${EXECUTABLE_NAME}" #cmakedefine MSPLUGINS_DIR "${MSPLUGINS_DIR}" diff --git a/ui/views/App/Main/Dialogs/About.qml b/ui/views/App/Main/Dialogs/About.qml index af3709b29..1f4a5e54e 100644 --- a/ui/views/App/Main/Dialogs/About.qml +++ b/ui/views/App/Main/Dialogs/About.qml @@ -82,7 +82,7 @@ DialogPlus { elide: Text.ElideRight font.pointSize: AboutStyle.copyrightBlock.url.pointSize linkColor: AboutStyle.copyrightBlock.url.color - text: 'https://www.linphone.org' + text: ''+applicationUrl+'' width: parent.width