From 3a07651dd86fe29001213cb5a449bd0746bfae6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= Date: Thu, 2 Feb 2023 14:56:09 +0100 Subject: [PATCH] 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 --- vendor/DOtherSide/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/DOtherSide/CMakeLists.txt b/vendor/DOtherSide/CMakeLists.txt index cdd1788201..f7690915c1 100644 --- a/vendor/DOtherSide/CMakeLists.txt +++ b/vendor/DOtherSide/CMakeLists.txt @@ -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)