From f6210291a1a248b17fd4f049a011b4b72b8617ce Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 28 Mar 2017 10:20:57 +0200
Subject: [PATCH] update belle-sip & linphone subs

---
 linphone-desktop/CMakeLists.txt                         | 2 +-
 linphone-desktop/src/components/chat/ChatProxyModel.cpp | 2 +-
 linphone-desktop/src/components/chat/ChatProxyModel.hpp | 2 +-
 submodules/belle-sip                                    | 2 +-
 submodules/linphone                                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/linphone-desktop/CMakeLists.txt b/linphone-desktop/CMakeLists.txt
index 9850262cc..895ee56f8 100644
--- a/linphone-desktop/CMakeLists.txt
+++ b/linphone-desktop/CMakeLists.txt
@@ -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.
diff --git a/linphone-desktop/src/components/chat/ChatProxyModel.cpp b/linphone-desktop/src/components/chat/ChatProxyModel.cpp
index 3c35c1ec7..7d44cd6c3 100644
--- a/linphone-desktop/src/components/chat/ChatProxyModel.cpp
+++ b/linphone-desktop/src/components/chat/ChatProxyModel.cpp
@@ -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);
diff --git a/linphone-desktop/src/components/chat/ChatProxyModel.hpp b/linphone-desktop/src/components/chat/ChatProxyModel.hpp
index baa1129f9..c9c86530d 100644
--- a/linphone-desktop/src/components/chat/ChatProxyModel.hpp
+++ b/linphone-desktop/src/components/chat/ChatProxyModel.hpp
@@ -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_
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 00cd6d6f3..2b67687ea 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 00cd6d6f387260596fd2f3d2a9cf98d33957a575
+Subproject commit 2b67687ea52f0118de469434b448ada57025599b
diff --git a/submodules/linphone b/submodules/linphone
index cb194fdce..0f08eba9c 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit cb194fdce31155ebb60e46b4843966aa3a9d0c8c
+Subproject commit 0f08eba9cd825cd226a2290c7f294afc602fc9a5