summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id>2020-06-11 09:02:08 +0800
committerꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id>2020-06-11 09:02:08 +0800
commit492b758f970968a33788c626a5deb8d8cfd72645 (patch)
tree4b89c1ab85972decc92a0db02b8ecca408247cd0
parent80fc7b0678ac33364c3c229448725ab2ad65b50e (diff)
parent6940a14a5b19d85844e075934103d6f839c67eb4 (diff)
Merge branch 'master' into cmake
-rw-r--r--README.md3
m---------qrtclient0
2 files changed, 2 insertions, 1 deletions
diff --git a/README.md b/README.md
index c6ceb64..c8291d6 100644
--- a/README.md
+++ b/README.md
@@ -54,5 +54,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
-$ /opt/Qt5.14.2/5.14.2/android/bin/androiddeployqt --input android_deployment_settings.json --output android-build --android-platform android-24
+$ 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
-Subproject f59ee7e17a7d44ee8920cf45d5e825f579d8650
+Subproject 7eae4b0263a2e1454fb35f7962d72b3bf25fe6f