diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-10-06 11:59:05 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-10-06 23:22:12 -0700 |
| commit | 8e295db70e1b351839648dd23f25404ac5e5ead3 (patch) | |
| tree | 681b98b2651f5847418c1421f76261db9e587a89 | |
| parent | 95e5bcb081a46a869c569e0bec166934927b26cb (diff) | |
| download | subsurface-8e295db70e1b351839648dd23f25404ac5e5ead3.tar.gz | |
Revert "QML UIL: go back to older Kirigami"
This reverts commit 893ff019dbabf356a477da0bdf7d954123759018.
Thanks to the amazing support from Marco Martin the theming issue in
Kirigami master has been fixed.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rwxr-xr-x | scripts/mobilecomponents.sh | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ff823514..175c4a30c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,6 +262,9 @@ 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 ) diff --git a/scripts/mobilecomponents.sh b/scripts/mobilecomponents.sh index 9c2167e11..04f2a2c6b 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 23ca2077027b214189ba72ca8dab1590a163c955 + # git checkout v2.2.0 popd fi if [ ! -d breeze-icons ] ; then |