mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-03 15:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile/qmake: use correct Kirigami files

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2020-11-25 22:38:43 +00:00
parent 582a2479ac
commit 732d7ac8c8
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Subsurface-mobile.pro
View file

@ -299,8 +299,6 @@ HEADERS += \
profile-widget/diverectitem.h \ profile-widget/diverectitem.h \
profile-widget/divetextitem.h profile-widget/divetextitem.h
include(mobile-widgets/qml/kirigami/kirigami.pri)
RESOURCES += mobile-widgets/qml/mobile-resources.qrc \ RESOURCES += mobile-widgets/qml/mobile-resources.qrc \
map-widget/qml/map-widget.qrc map-widget/qml/map-widget.qrc
@ -321,6 +319,7 @@ android {
# at link time our CWD is parallel to the install-root # at link time our CWD is parallel to the install-root
LIBS += ../install-root-$${QT_ARCH}/lib/libdivecomputer.a \ 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/libgit2.a \
../install-root-$${QT_ARCH}/lib/libzip.a \ ../install-root-$${QT_ARCH}/lib/libzip.a \
../install-root-$${QT_ARCH}/lib/libxslt.a \ ../install-root-$${QT_ARCH}/lib/libxslt.a \
@ -348,7 +347,7 @@ android {
../install-root-$${QT_ARCH}/include/openssl \ ../install-root-$${QT_ARCH}/include/openssl \
. \ . \
core \ core \
mobile-widgets/qml/kirigami/src/libkirigami mobile-widgets/3rdparty/kirigami/src
} }
ios { ios {
@ -379,7 +378,7 @@ ios {
../install-root/ios/include/openssl \ ../install-root/ios/include/openssl \
. \ . \
./core \ ./core \
./mobile-widgets/qml/kirigami/src/libkirigami \ ./mobile-widgets/3rdparty/kirigami/src/libkirigami \
/usr/include/libxml2 /usr/include/libxml2
} }