From 5c653576fa1408d522d8a11086c2fe47b7dad451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Wed, 10 Jun 2020 21:01:03 +0800 Subject: Certificate location to embed, defaults to FreeBSD's --- kelakon.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kelakon.pro b/kelakon.pro index beceb6b..5114df3 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -26,7 +26,7 @@ android { -lc++ QT += svg certs.path = /assets/certs - certs.files = /etc/ssl/certs/ca-certificates.crt + certs.files = /usr/local/share/certs/ca-root-nss.crt INSTALLS += certs } -- cgit v1.2.3 From 6940a14a5b19d85844e075934103d6f839c67eb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Thu, 11 Jun 2020 08:59:19 +0800 Subject: Add important Android SDK env var to instruction --- README.md | 1 + qrtclient | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index bb93754..f4241ce 100644 --- a/README.md +++ b/README.md @@ -30,5 +30,6 @@ or so on. ```sh $ make # -jN (with N an integer number of parallel tasks you allow your computer to run for compiling this) $ make install INSTALL_ROOT=android-build +$ export ANDROID_SDK_ROOT=/opt/android-sdk-update-manager $ /opt/Qt5.14.2/5.14.2/android/bin/androiddeployqt --input android-kelakon-deployment-settings.json --output android-build --android-platform android-24 ``` diff --git a/qrtclient b/qrtclient index f59ee7e..7eae4b0 160000 --- a/qrtclient +++ b/qrtclient @@ -1 +1 @@ -Subproject commit f59ee7e17a7d44ee8920cf45d5e825f579d8650d +Subproject commit 7eae4b0263a2e1454fb35f7962d72b3bf25fe6fc -- cgit v1.2.3