mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
iOS build: directly include Kirigami
Instead of building a library that we link against, let's just use the .pri file and include Kirigami in the primary build. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
39d8479549
commit
81166bc971
2 changed files with 2 additions and 2 deletions
|
@ -112,7 +112,6 @@ LIBS += ../install-root/lib/libcrypto.a \
|
|||
../install-root/lib/libxml2.a \
|
||||
../install-root/lib/libssh2.a \
|
||||
../install-root/lib/libssl.a \
|
||||
../install-root/lib/libkirigamiplugin.a \
|
||||
-liconv
|
||||
|
||||
INCLUDEPATH += ../install-root/include/ \
|
||||
|
@ -222,6 +221,8 @@ QML_IMPORT_PATH =
|
|||
# Default rules for deployment.
|
||||
include(deployment.pri)
|
||||
|
||||
include(../../../mobile-widgets/qml/kirigami/kirigami.pri)
|
||||
|
||||
ios {
|
||||
ios_icon.files = $$files(../../../icons/AppIcon*.png)
|
||||
app_launch_images.files = ../SubsurfaceMobileLaunch.xib $$files(../SubsurfaceMobileLaunchImage*.png)
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#include "qt-models/gpslistmodel.h"
|
||||
#include "mobile-widgets/qmlprofile.h"
|
||||
|
||||
#define KIRIGAMI_BUILD_TYPE_STATIC
|
||||
#include "mobile-widgets/qml/kirigami/src/kirigamiplugin.h"
|
||||
|
||||
QObject *qqWindowObject = NULL;
|
||||
|
|
Loading…
Reference in a new issue