mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use bc_compute_full_version on package name, move DesktopTools initialisation, add availability check for request permissions, update description for permissions

Browse source
This commit is contained in:
Julien Wadel 2020-04-07 17:23:34 +02:00
parent 1f913e76ed
commit 229c8256c8
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-app/cmake_builder/linphone_package/CMakeLists.txt
View file

@ -38,7 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui")
# ==============================================================================
# Build package version.
# ==============================================================================
bc_compute_full_version(APP_PROJECT_VERSION)
if (GIT_EXECUTABLE AND NOT(APP_PROJECT_VERSION))
execute_process(
COMMAND ${GIT_EXECUTABLE} describe --always

12
linphone-app/cmake_builder/linphone_package/macos/Info.plist.in
View file

@ -54,5 +54,17 @@
<string>Streaming Video between devices</string>
<key>NSMicrophoneUsageDescription</key>
<string>Streaming Audio between devices</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>Store attachment and allow camera record when selected</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>Store attachment and allow camera record when selected</string>
<key>NSDesktopFolderUsageDescription</key>
<string>Storing configuration files</string>
<key>NSDocumentsFolderUsageDescription</key>
<string>Can use Documents folder to put logs</string>
<key>NSDownloadsFolderUsageDescription</key>
<string>Getting files from Download folder for sending attachment</string>
<key>NSAppleEventsUsageDescription</key>
<string>Used for sending notifications and working with Appnap</string>
</dict>
</plist>

1
linphone-app/src/app/App.cpp
View file

@ -209,7 +209,6 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true, Mode::U
qInfo() << QStringLiteral("Starting " APPLICATION_NAME " (bin: " EXECUTABLE_NAME ")");
qInfo() << QStringLiteral("Use locale: %1").arg(mLocale);
DesktopTools::init();
}
App::~App () {

2
linphone-app/src/app/AppController.cpp
View file

@ -28,6 +28,7 @@
#include "AppController.hpp"
#include "components/other/desktop-tools/DesktopTools.hpp"
// =============================================================================
using namespace std;
@ -38,6 +39,7 @@ namespace {
}
AppController::AppController (int &argc, char *argv[]) {
DesktopTools::init();
QT_REQUIRE_VERSION(argc, argv, ApplicationMinimalQtVersion)
Q_ASSERT(!mApp);
// Disable QML cache. Avoid malformed cache.