diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-04-15 07:54:09 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-04-15 08:16:59 -0700 |
| commit | 24a798a5c314cdc1b3d369cfa296c4e3c8a14867 (patch) | |
| tree | da394878f167b00cdf78072e549c4561b192a4eb | |
| parent | 026e90df3db1bc37fe845db32f02002d4c749fc3 (diff) | |
| download | subsurface-24a798a5c314cdc1b3d369cfa296c4e3c8a14867.tar.gz | |
QML UI: update to latest Kirigami
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rwxr-xr-x | scripts/mobilecomponents.sh | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b9749276a..2e550b6dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -287,8 +287,10 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") mobile-widgets/qml/kirigami/src/kirigamiplugin.cpp mobile-widgets/qml/kirigami/src/settings.cpp mobile-widgets/qml/kirigami/src/enums.cpp - mobile-widgets/qml/kirigami/src/formlayoutattached.cpp - mobile-widgets/qml/kirigami/src/mnemonicattached.cpp + mobile-widgets/qml/kirigami/src/formlayoutattached.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/kirigamipluginfactory.cpp mobile-widgets/qml/kirigami/src/libkirigami/platformtheme.cpp @@ -297,9 +299,6 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") map-widget/qmlmapwidgethelper.cpp ) 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) qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/mobile-resources.qrc) qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/kirigami/kirigami.qrc) diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index 206a5d89c..af93f6281 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -33,7 +33,7 @@ if [ "$NOPULL" = "" ] ; then git checkout master git pull origin master # if we want to pin a specific Kirigami version, we can do this here - git checkout 38a9dec7317945e5751c86a6c54de787c261e024 + git checkout 70c025ef6f6dc63c85180867f70f5e00ba5a8dba popd fi if [ ! -d breeze-icons ] ; then |