diff --git a/vendor/DOtherSide/.gitignore b/vendor/DOtherSide/.gitignore index 860cc2e469..ebf186e89f 100644 --- a/vendor/DOtherSide/.gitignore +++ b/vendor/DOtherSide/.gitignore @@ -11,6 +11,7 @@ nimcache *.orig doc cmake-build-* +.cache # libraries *.a diff --git a/vendor/DOtherSide/.gitmodules b/vendor/DOtherSide/.gitmodules index c4e3e88034..59b9688477 100644 --- a/vendor/DOtherSide/.gitmodules +++ b/vendor/DOtherSide/.gitmodules @@ -1,3 +1,3 @@ [submodule "vendor/SortFilterProxyModel"] path = vendor/SortFilterProxyModel - url = git@github.com:status-im/SortFilterProxyModel.git + url = https://github.com/status-im/SortFilterProxyModel.git diff --git a/vendor/DOtherSide/CMakeLists.txt b/vendor/DOtherSide/CMakeLists.txt index 174d00650f..ef7d97dd27 100644 --- a/vendor/DOtherSide/CMakeLists.txt +++ b/vendor/DOtherSide/CMakeLists.txt @@ -25,6 +25,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) endif() endif() +add_subdirectory(vendor/SortFilterProxyModel) add_subdirectory(lib) if(ENABLE_DOCS) diff --git a/vendor/DOtherSide/lib/CMakeLists.txt b/vendor/DOtherSide/lib/CMakeLists.txt index 6e6c1511c1..7f59b4dc30 100644 --- a/vendor/DOtherSide/lib/CMakeLists.txt +++ b/vendor/DOtherSide/lib/CMakeLists.txt @@ -27,10 +27,10 @@ macro(add_target name type) target_include_directories(${name} PUBLIC include include/Qt) endif() - target_link_libraries(${name} PRIVATE Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Qml Qt5::Quick Qt5::Network Qt5::Multimedia) + target_link_libraries(${name} PRIVATE Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Qml Qt5::Quick Qt5::Network Qt5::Multimedia SortFilterProxyModel) # for DOtherSide.pc - set(PC_REQUIRES "Qt5Core, Qt5Gui, Qt5Widgets, Qt5Qml, Qt5Quick, Qt5Network, Qt5DBus, Qt5Multimedia") + set(PC_REQUIRES "Qt5Core, Qt5Gui, Qt5Widgets, Qt5Qml, Qt5Quick, Qt5Network, Qt5DBus, Qt5Multimedia SortFilterProxyModel") if (${Qt5QuickControls2_FOUND}) target_link_libraries(${name} PRIVATE Qt5::QuickControls2) set(PC_REQUIRES "${PC_REQUIRES}, Qt5QuickControls2") diff --git a/vendor/DOtherSide/lib/src/DOtherSide.cpp b/vendor/DOtherSide/lib/src/DOtherSide.cpp index 6b1e6acb89..067ec88964 100644 --- a/vendor/DOtherSide/lib/src/DOtherSide.cpp +++ b/vendor/DOtherSide/lib/src/DOtherSide.cpp @@ -74,6 +74,8 @@ #include "DOtherSide/Status/QClipboardProxy.h" #include "DOtherSide/DosSpellchecker.h" +#include + namespace { void register_meta_types() @@ -83,7 +85,7 @@ void register_meta_types() qmlRegisterType("DotherSide", 0 , 1, "StatusSyntaxHighlighter"); qmlRegisterType("DotherSide", 0, 1, "SpellChecker"); qmlRegisterSingletonType("DotherSide", 0 , 1, "QClipboardProxy", &QClipboardProxy::qmlInstance); - + qqsfpm::registerTypes(); } }