Skip to content
Snippets Groups Projects
Commit 6c9b9693 authored by Sébastien Blin's avatar Sébastien Blin Committed by Andreas Traczyk
Browse files

project: misc fixups

Change-Id: I97f256873bbffd79eb08707f0a809172bca06e6b
parent 7cc48a48
Branches
Tags
No related merge requests found
......@@ -290,7 +290,7 @@ AvAdapter::getScreenNumber() const
// Get display
QString display_env {getenv("DISPLAY")};
if (!display_env.isEmpty()) {
auto list = display_env.split(":", Qt::SkipEmptyParts);
auto list = display_env.split(':', QString::SplitBehavior::SkipEmptyParts);
// Should only be one display, so get the first one
if (list.size() > 0) {
display = list.at(0).toInt();
......
......@@ -23,6 +23,7 @@
#include "version.h"
#include <QCryptographicHash>
#include <QApplication>
#include <QtWebEngine>
#include <clocale>
......@@ -60,8 +61,10 @@ main(int argc, char* argv[])
QApplication::setQuitOnLastWindowClosed(false);
QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
QCoreApplication::setApplicationVersion(QString(VERSION_STRING));
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
QApplication::setHighDpiScaleFactorRoundingPolicy(
Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
#endif
QtWebEngine::initialize();
char ARG_DISABLE_WEB_SECURITY[] = "--disable-web-security";
......
......@@ -48,6 +48,7 @@
#include <QQmlContext>
#include <locale.h>
#include <thread>
#ifdef Q_OS_WIN
#include <windows.h>
......
......@@ -18,6 +18,10 @@
#pragma once
#include <QJSEngine>
#include <QQmlEngine>
#include <QObject>
#define NS_MODELS "net.jami.Models"
#define NS_ADAPTERS "net.jami.Adapters"
#define NS_CONSTANTS "net.jami.Constants"
......
......@@ -29,8 +29,8 @@ class QrImageProvider : public QuickImageProviderBase
public:
QrImageProvider(LRCInstance* instance = nullptr)
: QuickImageProviderBase(QQuickImageProvider::Image,
QQmlImageProviderBase::ForceAsynchronousImageLoading,
instance)
QQmlImageProviderBase::ForceAsynchronousImageLoading,
instance)
{}
enum class QrType { Account, Contact };
......@@ -43,11 +43,11 @@ public:
*/
QPair<QrType, QString> getIndexFromID(const QString& id)
{
auto list = id.split('_', Qt::SkipEmptyParts);
auto list = id.split('_', QString::SplitBehavior::SkipEmptyParts);
if (list.size() < 2)
return QPair(QrType::Account, "");
return {QrType::Account, ""};
if (list.contains("account") && list.size() > 1) {
return QPair(QrType::Account, list[1]);
return {QrType::Account, list[1]};
} else if (list.contains("contact") && list.size() > 1) {
/*
* For contact_xxx, xxx is "" initially
......@@ -55,9 +55,9 @@ public:
const auto& convInfo = lrcInstance_->getConversationFromConvUid(list[1]);
auto contact = lrcInstance_->getCurrentAccountInfo().contactModel->getContact(
convInfo.participants.at(0));
return QPair(QrType::Contact, contact.profileInfo.uri);
return {QrType::Contact, contact.profileInfo.uri};
}
return QPair(QrType::Account, "");
return {QrType::Account, ""};
}
QImage requestImage(const QString& id, QSize* size, const QSize& requestedSize) override
......
......@@ -20,6 +20,8 @@
#include <QSystemTrayIcon>
#include <functional>
class AppSettingsManager;
class SystemTray final : public QSystemTrayIcon
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment