mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile/kirigami: first steps to switching to Kirigami 5.76

Browse source 
Our half-assed manual build of Kirigami was becoming completely unmaintainable.
So let's try to use the build method that the Kirigami team recommends. Which
unfortunately requires us to have access to the KDE extra cmake modules (ECM).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-11-23 09:34:02 -08:00
parent daebd0ad0e
commit 0851224b6c
6 changed files with 36 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mobile-widgets/3rdparty/CMakeLists.txt vendored Normal file
View file

@ -0,0 +1,4 @@
# simply pull in Kirigami, making sure it's statically built
option(BUILD_SHARED_LIBS "Build a shared module" OFF)
add_subdirectory(kirigami)

16
mobile-widgets/CMakeLists.txt
View file

@ -4,25 +4,9 @@ set(SUBSURFACE_MOBILE_SRCS
qmlinterface.cpp
qmlmanager.cpp
themeinterface.cpp
qml/kirigami/src/columnview.cpp
qml/kirigami/src/delegaterecycler.cpp
qml/kirigami/src/enums.cpp
qml/kirigami/src/formlayoutattached.cpp
qml/kirigami/src/icon.cpp
qml/kirigami/src/kirigamiplugin.cpp
qml/kirigami/src/mnemonicattached.cpp
qml/kirigami/src/scenepositionattached.cpp
qml/kirigami/src/settings.cpp
qml/kirigami/src/wheelhandler.cpp
qml/kirigami/src/libkirigami/basictheme.cpp
qml/kirigami/src/libkirigami/kirigamipluginfactory.cpp
qml/kirigami/src/libkirigami/platformtheme.cpp
qml/kirigami/src/libkirigami/tabletmodewatcher.cpp
)
if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable")
include_directories(${CMAKE_SOURCE_DIR}/mobile-widgets/qml/kirigami/src/libkirigami)
add_definitions(-DKIRIGAMI_BUILD_TYPE_STATIC)
add_library(subsurface_mobile STATIC ${SUBSURFACE_MOBILE_SRCS})
target_link_libraries(subsurface_mobile ${QT_LIBRARIES})
endif()

26
mobile-widgets/qml/mobile-resources.qrc
View file

@ -96,34 +96,8 @@
<file alias="icons/ic_sort.svg">icons/ic_sort_24px.svg</file>
<file alias="icons/trip_details.svg">icons/local_offer.svg</file>
<!-- ********** kirigami icons ********** -->
<file alias="icons/application-menu.svg">kirigami/icons/application-menu.svg</file>
<file alias="icons/dialog-cancel.svg">kirigami/icons/dialog-cancel.svg</file>
<file alias="icons/distribute-horizontal-x.svg">kirigami/icons/distribute-horizontal-x.svg</file>
<file alias="icons/document-edit.svg">kirigami/icons/document-edit.svg</file>
<file alias="icons/document-save.svg">kirigami/icons/document-save.svg</file>
<file alias="icons/go-up.svg">kirigami/icons/go-up.svg</file>
<file alias="icons/gps.svg">kirigami/icons/gps.svg</file>
<file alias="icons/handle-left.svg">kirigami/icons/handle-left.svg</file>
<file alias="icons/handle-right.svg">kirigami/icons/handle-right.svg</file>
<file alias="icons/map-globe.svg">kirigami/icons/map-globe.svg</file>
<file alias="icons/list-add.svg">kirigami/icons/list-add.svg</file>
<file alias="icons/overflow-menu.svg">kirigami/icons/overflow-menu.svg</file>
<file alias="icons/trash-empty.svg">kirigami/icons/trash-empty.svg</file>
<file alias="icons/edit-copy.svg">kirigami/icons/edit-copy.svg</file>
<file alias="icons/edit-paste.svg">kirigami/icons/edit-paste.svg</file>
<file alias="icons/view-readermode.svg">kirigami/icons/view-readermode.svg</file>
</qresource>
<qresource prefix="/">
<!-- ********** kirigami icons ********** -->
<file alias="/org/kde/kirigami/templates/private/go-next-symbolic">kirigami/icons/go-next.svg</file>
<file alias="/org/kde/kirigami/templates/private/go-previous-symbolic">kirigami/icons/go-previous.svg</file>
<file alias="go-next-symbolic">kirigami/icons/go-next.svg</file>
<file alias="go-previous-symbolic">kirigami/icons/go-previous.svg</file>
</qresource>
<qresource prefix="/xslt">
<!-- ********** xslt ********** -->
<file alias="commonTemplates.xsl">../../xslt/commonTemplates.xsl</file>