diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-11-25 22:38:43 +0000 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-17 09:17:54 -0800 |
| commit | 732d7ac8c8fece0485208c986d498f20117ce303 (patch) | |
| tree | 6500376269033a662f014ba0af8c7e99185aed8d | |
| parent | 582a2479ac2ae9242caea6d00d3281738141eb8e (diff) | |
| download | subsurface-732d7ac8c8fece0485208c986d498f20117ce303.tar.gz | |
mobile/qmake: use correct Kirigami files
And don't try to build kirigami in the same qmake run. The inclusion of the
.pri file doesn't appear to lead to a build that works.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | Subsurface-mobile.pro | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Subsurface-mobile.pro b/Subsurface-mobile.pro index bbb2d561e..cd0c19db9 100644 --- a/Subsurface-mobile.pro +++ b/Subsurface-mobile.pro @@ -299,8 +299,6 @@ HEADERS += \ profile-widget/diverectitem.h \ profile-widget/divetextitem.h -include(mobile-widgets/qml/kirigami/kirigami.pri) - RESOURCES += mobile-widgets/qml/mobile-resources.qrc \ map-widget/qml/map-widget.qrc @@ -321,6 +319,7 @@ android { # at link time our CWD is parallel to the install-root LIBS += ../install-root-$${QT_ARCH}/lib/libdivecomputer.a \ + ../install-root-$${QT_ARCH}/lib/qml/org/kde/kirigami.2/libkirigamiplugin.a \ ../install-root-$${QT_ARCH}/lib/libgit2.a \ ../install-root-$${QT_ARCH}/lib/libzip.a \ ../install-root-$${QT_ARCH}/lib/libxslt.a \ @@ -348,7 +347,7 @@ android { ../install-root-$${QT_ARCH}/include/openssl \ . \ core \ - mobile-widgets/qml/kirigami/src/libkirigami + mobile-widgets/3rdparty/kirigami/src } ios { @@ -379,7 +378,7 @@ ios { ../install-root/ios/include/openssl \ . \ ./core \ - ./mobile-widgets/qml/kirigami/src/libkirigami \ + ./mobile-widgets/3rdparty/kirigami/src/libkirigami \ /usr/include/libxml2 } |