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

QML UI: update to latest Kirigami

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-04-15 07:54:09 -07:00
parent 026e90df3d
commit 24a798a5c3
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -287,8 +287,10 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable")
mobile-widgets/qml/kirigami/src/kirigamiplugin.cpp mobile-widgets/qml/kirigami/src/kirigamiplugin.cpp
mobile-widgets/qml/kirigami/src/settings.cpp mobile-widgets/qml/kirigami/src/settings.cpp
mobile-widgets/qml/kirigami/src/enums.cpp mobile-widgets/qml/kirigami/src/enums.cpp
mobile-widgets/qml/kirigami/src/formlayoutattached.cpp mobile-widgets/qml/kirigami/src/formlayoutattached.cpp
mobile-widgets/qml/kirigami/src/mnemonicattached.cpp mobile-widgets/qml/kirigami/src/mnemonicattached.cpp
mobile-widgets/qml/kirigami/src/delegaterecycler.cpp
mobile-widgets/qml/kirigami/src/desktopicon.cpp
mobile-widgets/qml/kirigami/src/libkirigami/basictheme.cpp mobile-widgets/qml/kirigami/src/libkirigami/basictheme.cpp
mobile-widgets/qml/kirigami/src/libkirigami/kirigamipluginfactory.cpp mobile-widgets/qml/kirigami/src/libkirigami/kirigamipluginfactory.cpp
mobile-widgets/qml/kirigami/src/libkirigami/platformtheme.cpp mobile-widgets/qml/kirigami/src/libkirigami/platformtheme.cpp
@ -297,9 +299,6 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable")
map-widget/qmlmapwidgethelper.cpp map-widget/qmlmapwidgethelper.cpp
) )
include_directories(${CMAKE_SOURCE_DIR}/mobile-widgets/qml/kirigami/src/libkirigami) include_directories(${CMAKE_SOURCE_DIR}/mobile-widgets/qml/kirigami/src/libkirigami)
if(NOT ANDROID AND NOT iOS)
set(MOBILE_SRC ${MOBILE_SRC} mobile-widgets/qml/kirigami/src/desktopicon.cpp)
endif()
add_definitions(-DKIRIGAMI_BUILD_TYPE_STATIC) add_definitions(-DKIRIGAMI_BUILD_TYPE_STATIC)
qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/mobile-resources.qrc) qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/mobile-resources.qrc)
qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/kirigami/kirigami.qrc) qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/kirigami/kirigami.qrc)

2
scripts/mobilecomponents.sh
View file

@ -33,7 +33,7 @@ if [ "$NOPULL" = "" ] ; then
git checkout master git checkout master
git pull origin master git pull origin master
# if we want to pin a specific Kirigami version, we can do this here # if we want to pin a specific Kirigami version, we can do this here
git checkout 38a9dec7317945e5751c86a6c54de787c261e024 git checkout 70c025ef6f6dc63c85180867f70f5e00ba5a8dba
popd popd
fi fi
if [ ! -d breeze-icons ] ; then if [ ! -d breeze-icons ] ; then