xavi
/
qxmpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.5'

This commit is contained in:
Linus Jahn 2023-04-30 13:45:28 +02:00
parent ab4bdf2da4 5a5bebe82e
commit 19a3052f0f
5 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -9,6 +9,13 @@ QXmpp 1.6.0 (UNRELEASED)
*under development*
QXmpp 1.5.5 (Apr 30, 2023)
--------------------------
Fixes:
- Fix dependencies in generated pkg-config files (@krop)
- Fix compilation with android/clang (@lnjX)
QXmpp 1.5.4 (Apr 07, 2023)
--------------------------

6
CMakeLists.txt
View File

@ -126,16 +126,16 @@ install(
)
# Generate QXmppQt5/6.pc
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qxmpp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qxmpp.pc @ONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qxmpp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/${QXMPP_TARGET}.pc @ONLY)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/qxmpp.pc
RENAME QXmppQt${QT_VERSION_MAJOR}.pc
FILES ${CMAKE_CURRENT_BINARY_DIR}/${QXMPP_TARGET}.pc
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
COMPONENT Devel
)
# "qxmpp.pc" for backwards-compatibility
if(QT_VERSION_MAJOR EQUAL 5)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qxmpp_legacy.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qxmpp.pc @ONLY)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/qxmpp.pc
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"

8
qxmpp.pc.in
View File

@ -5,13 +5,13 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/qxmpp
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@QXMPP_TARGET@
Name: Qxmpp
Name: @QXMPP_TARGET@
Description: QXmpp Library
Version: @PROJECT_VERSION@
Libs: -lqxmpp
Libs.private: -lQt5Network -lQt5Xml -lQt5Core
Libs: -l@QXMPP_TARGET@
Libs.private: -lQt@QT_VERSION_MAJOR@Network -lQt@QT_VERSION_MAJOR@Xml -lQt@QT_VERSION_MAJOR@Core
Cflags: -I${includedir}

17
qxmpp_legacy.pc.in Normal file
View File

@ -0,0 +1,17 @@
# SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <niels_ole@salscheider-online.de>
#
# SPDX-License-Identifier: CC0-1.0
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/QXmppQt5
Name: Qxmpp
Description: QXmpp Library
Version: @PROJECT_VERSION@
Requires: QXmppQt5
Libs: -lQXmppQt5
Cflags: -I${includedir}

2
src/client/QXmppHttpFileSharingProvider.cpp
View File

@ -151,7 +151,7 @@ auto QXmppHttpFileSharingProvider::uploadFile(std::unique_ptr<QIODevice> data,
// reduce ref count, so the signal connection doesn't keep the state alive forever
state.reset();
});
QObject::connect(state->upload.get(), &QXmppHttpUpload::progressChanged, [stateRef = std::weak_ptr(state), reportProgress = std::move(reportProgress)]() {
QObject::connect(state->upload.get(), &QXmppHttpUpload::progressChanged, [stateRef = std::weak_ptr<State>(state), reportProgress = std::move(reportProgress)]() {
if (auto state = stateRef.lock()) {
reportProgress(state->upload->bytesSent(), state->upload->bytesTotal());
}