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

feat: register SortFilterProxyModel types 

- it allows to `import SortFilterProxyModel 0.2`

relates: status-im/status-desktop#6510
This commit is contained in:
Patryk Osmaczko 2022-07-20 12:59:31 +02:00 committed by Michał
parent e5f0387ef6
commit 109e45966b
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vendor/DOtherSide/.gitignore vendored
View File

@ -11,6 +11,7 @@ nimcache
*.orig *.orig
doc doc
cmake-build-* cmake-build-*
.cache
# libraries # libraries
*.a *.a

2
vendor/DOtherSide/.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "vendor/SortFilterProxyModel"] [submodule "vendor/SortFilterProxyModel"]
path = vendor/SortFilterProxyModel path = vendor/SortFilterProxyModel
url = git@github.com:status-im/SortFilterProxyModel.git url = https://github.com/status-im/SortFilterProxyModel.git

1
vendor/DOtherSide/CMakeLists.txt vendored
View File

@ -25,6 +25,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
endif() endif()
endif() endif()
add_subdirectory(vendor/SortFilterProxyModel)
add_subdirectory(lib) add_subdirectory(lib)
if(ENABLE_DOCS) if(ENABLE_DOCS)

4
vendor/DOtherSide/lib/CMakeLists.txt vendored
View File

@ -27,10 +27,10 @@ macro(add_target name type)
target_include_directories(${name} PUBLIC include include/Qt) target_include_directories(${name} PUBLIC include include/Qt)
endif() 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 # 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}) if (${Qt5QuickControls2_FOUND})
target_link_libraries(${name} PRIVATE Qt5::QuickControls2) target_link_libraries(${name} PRIVATE Qt5::QuickControls2)
set(PC_REQUIRES "${PC_REQUIRES}, Qt5QuickControls2") set(PC_REQUIRES "${PC_REQUIRES}, Qt5QuickControls2")

4
vendor/DOtherSide/lib/src/DOtherSide.cpp vendored
View File

@ -74,6 +74,8 @@
#include "DOtherSide/Status/QClipboardProxy.h" #include "DOtherSide/Status/QClipboardProxy.h"
#include "DOtherSide/DosSpellchecker.h" #include "DOtherSide/DosSpellchecker.h"
#include <qqmlsortfilterproxymodeltypes.h>
namespace { namespace {
void register_meta_types() void register_meta_types()
@ -83,7 +85,7 @@ void register_meta_types()
qmlRegisterType<StatusSyntaxHighlighterHelper>("DotherSide", 0 , 1, "StatusSyntaxHighlighter"); qmlRegisterType<StatusSyntaxHighlighterHelper>("DotherSide", 0 , 1, "StatusSyntaxHighlighter");
qmlRegisterType<SpellChecker>("DotherSide", 0, 1, "SpellChecker"); qmlRegisterType<SpellChecker>("DotherSide", 0, 1, "SpellChecker");
qmlRegisterSingletonType<QClipboardProxy>("DotherSide", 0 , 1, "QClipboardProxy", &QClipboardProxy::qmlInstance); qmlRegisterSingletonType<QClipboardProxy>("DotherSide", 0 , 1, "QClipboardProxy", &QClipboardProxy::qmlInstance);
qqsfpm::registerTypes();
} }
} }