Commit f6210291 authored by Jehan Monnier's avatar Jehan Monnier

update belle-sip & linphone subs

parent b340d811
......@@ -234,7 +234,7 @@ if(NOT WIN32)
add_dependencies(update_translations check_qml)
endif()
set_target_properties(${TARGET_NAME} PROPERTIES OUTPUT_NAME "${EXECUTABLE_NAME}")
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${LINPHONE_INCLUDE_DIRS}" "${LINPHONECXX_INCLUDE_DIRS}" "${BELCARD_INCLUDE_DIRS}" "${BCTOOLBOX_INCLUDE_DIRS}")
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${LINPHONECXX_INCLUDE_DIRS}" "${LINPHONE_INCLUDE_DIRS}" "${BELCARD_INCLUDE_DIRS}" "${BCTOOLBOX_INCLUDE_DIRS}")
foreach (package ${QT5_PACKAGES})
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE "${Qt5${package}_INCLUDE_DIRS}")
# `qt5_create_translation` is provided from `LinguistTools` package.
......
......@@ -58,7 +58,7 @@ private:
// =============================================================================
const unsigned int ChatProxyModel::ENTRIES_CHUNK_SIZE = 50;
const int ChatProxyModel::ENTRIES_CHUNK_SIZE = 50;
ChatProxyModel::ChatProxyModel (QObject *parent) : QSortFilterProxyModel(parent) {
m_chat_model_filter = new ChatModelFilter(this);
......
......@@ -68,7 +68,7 @@ private:
ChatModelFilter *m_chat_model_filter;
int m_n_max_displayed_entries = ENTRIES_CHUNK_SIZE;
static const unsigned int ENTRIES_CHUNK_SIZE;
static const int ENTRIES_CHUNK_SIZE;
};
#endif // CHAT_PROXY_MODEL_H_
belle-sip @ 2b67687e
Subproject commit 00cd6d6f387260596fd2f3d2a9cf98d33957a575
Subproject commit 2b67687ea52f0118de469434b448ada57025599b
linphone @ 0f08eba9
Subproject commit cb194fdce31155ebb60e46b4843966aa3a9d0c8c
Subproject commit 0f08eba9cd825cd226a2290c7f294afc602fc9a5
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment