status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore(DOtherSide): Use SortFilterProxyModel from StatusQ 

Previously DOtherSide was an external, standalone library with own
submodule for SortFilterProxyModel. After merging DOtherSide directly
to status-desktop it should be treated as a build tool or part of build
configuration. Instead of owning c++ files by itselft, DOtherSide should
refer to all needed c++ sources in order to compile them and build
status-desktop properly.

Removing SortFilterProxyModel submodule from original DOtherSide and
changing config after merge to status-desktop was needed to be done
along with merge itself because otherwise there would be a conflict -
both DOtherSide and status-desktop had the same submodule
(SortFilterProxyModel).

Closes: #9410
This commit is contained in:
Michał Cieślak 2023-02-02 14:56:09 +01:00 committed by Michał
parent c0a1cd58ab
commit 3a07651dd8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/DOtherSide/CMakeLists.txt vendored
View File

@ -28,7 +28,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
endif()
endif()
add_subdirectory(vendor/SortFilterProxyModel)
add_subdirectory(../../ui/StatusQ/vendor/SortFilterProxyModel SortFilterProxyModel)
add_subdirectory(lib)
if(ENABLE_DOCS)