diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-10-04 08:20:14 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-10-04 09:05:27 -0700 |
| commit | d774b6cc499220b908a1d57909df786619d8fe60 (patch) | |
| tree | f0fbfaf96a83f5c6c21046a668e1761bc97c5b99 | |
| parent | b19db6afb56947ae04a2a00ab535feda541f328e (diff) | |
| download | subsurface-d774b6cc499220b908a1d57909df786619d8fe60.tar.gz | |
Switch back to latest Kirigami
And fix the build issue.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | scripts/mobilecomponents.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c7314fbcd..175c4a30c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,9 +262,13 @@ 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/libkirigami/basictheme.cpp + mobile-widgets/qml/kirigami/src/libkirigami/kirigamipluginfactory.cpp + mobile-widgets/qml/kirigami/src/libkirigami/platformtheme.cpp subsurface-mobile-main.cpp subsurface-mobile-helper.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() diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index 90ccd2b03..487c55d4c 100755 --- a/scripts/mobilecomponents.sh +++ b/scripts/mobilecomponents.sh @@ -32,8 +32,8 @@ if [ "$NOPULL" = "" ] ; then pushd kirigami git checkout master git pull origin master - # building against master breaks after 23ca2077027b214189ba72ca8dab1590a163c955 - git checkout v2.2.0 + # if we want to pin a specific Kirigami version, we can do this here + # git checkout v2.2.0 popd fi if [ ! -d breeze-icons ] ; then |