mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-01 06:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

iOS build: directly include Kirigami

Browse source 
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:
Dirk Hohndel 2016-08-16 07:50:45 -07:00
parent 39d8479549
commit 81166bc971
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packaging/ios/Subsurface-mobile/Subsurface-mobile.pro
View file

@ -112,7 +112,6 @@ LIBS += ../install-root/lib/libcrypto.a \
../install-root/lib/libxml2.a \ ../install-root/lib/libxml2.a \
../install-root/lib/libssh2.a \ ../install-root/lib/libssh2.a \
../install-root/lib/libssl.a \ ../install-root/lib/libssl.a \
../install-root/lib/libkirigamiplugin.a \
-liconv -liconv
INCLUDEPATH += ../install-root/include/ \ INCLUDEPATH += ../install-root/include/ \
@ -222,6 +221,8 @@ QML_IMPORT_PATH =
# Default rules for deployment. # Default rules for deployment.
include(deployment.pri) include(deployment.pri)
include(../../../mobile-widgets/qml/kirigami/kirigami.pri)
ios { ios {
ios_icon.files = $$files(../../../icons/AppIcon*.png) ios_icon.files = $$files(../../../icons/AppIcon*.png)
app_launch_images.files = ../SubsurfaceMobileLaunch.xib $$files(../SubsurfaceMobileLaunchImage*.png) app_launch_images.files = ../SubsurfaceMobileLaunch.xib $$files(../SubsurfaceMobileLaunchImage*.png)

1
subsurface-mobile-helper.cpp
View file

@ -21,7 +21,6 @@
#include "qt-models/gpslistmodel.h" #include "qt-models/gpslistmodel.h"
#include "mobile-widgets/qmlprofile.h" #include "mobile-widgets/qmlprofile.h"
#define KIRIGAMI_BUILD_TYPE_STATIC
#include "mobile-widgets/qml/kirigami/src/kirigamiplugin.h" #include "mobile-widgets/qml/kirigami/src/kirigamiplugin.h"
QObject *qqWindowObject = NULL; QObject *qqWindowObject = NULL;