From d2561b0512300d1bff720b284cb5a1e247cad8a0 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sat, 14 May 2022 02:22:33 +0200 Subject: [PATCH] Use newer libolm --- .gitlab-ci.yml | 4 ++-- src/ChatPage.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93bfa439..fd0a792c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,13 +18,13 @@ build-clazy: libssl-dev libqt5multimedia5-plugins libqt5multimediagsttools5 libqt5multimediaquick5 libqt5svg5-dev qtmultimedia5-dev qtquickcontrols2-5-dev qttools5-dev qttools5-dev-tools qtdeclarative5-dev qml-module-qtmultimedia qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qt-labs-platform - qt5keychain-dev ccache clazy libcurl4-openssl-dev libevent-dev libspdlog-dev git libolm-dev nlohmann-json3-dev libcmark-dev asciidoc + qt5keychain-dev ccache clazy libcurl4-openssl-dev libevent-dev libspdlog-dev git nlohmann-json3-dev libcmark-dev asciidoc # libolm-dev script: - export PATH="/usr/local/bin/:/usr/lib/ccache:${PATH}" - export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l) - cmake -GNinja -H. -Bbuild -DCMAKE_INSTALL_PREFIX=.deps/usr - -DHUNTER_ENABLED=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=ON -DUSE_BUNDLED_MTXCLIENT=ON -DUSE_BUNDLED_COEURL=ON -DUSE_BUNDLED_LMDBXX=ON + -DHUNTER_ENABLED=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=ON -DUSE_BUNDLED_MTXCLIENT=ON -DUSE_BUNDLED_COEURL=ON -DUSE_BUNDLED_LMDBXX=ON -DUSE_BUNDLED_OLM=ON -DVOIP=OFF -DCMAKE_BUILD_TYPE=Release -DCI_BUILD=ON -DFETCHCONTENT_QUIET=OFF -DCMAKE_CXX_COMPILER=clazy -DCMAKE_CXX_FLAGS="-Werror" diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp index 674a5424..cd7f3779 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp @@ -242,7 +242,8 @@ ChatPage::ChatPage(QSharedPointer userSettings, QObject *parent) this, [this]() { QTimer::singleShot(std::chrono::minutes(5), this, &ChatPage::removeOldFallbackKey); - disconnect(this, &ChatPage::newSyncResponse, this, &ChatPage::startRemoveFallbackKeyTimer); + disconnect( + this, &ChatPage::newSyncResponse, this, &ChatPage::startRemoveFallbackKeyTimer); }, Qt::QueuedConnection);