diff options
| author | ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id> | 2020-04-04 22:39:06 +0800 |
|---|---|---|
| committer | ꦌ ꦫꦶ ꦏ꧀ꦦꦿ ꦧ ꦮ ꦑ ꦩ ꦭ꧀ <erik@darapsa.co.id> | 2020-04-04 22:39:06 +0800 |
| commit | 401696102ef4dc31bea2ae6f0ce95ddd7b31f55f (patch) | |
| tree | 7480062d449fc3081ed5f633a7f2ae582e43160f | |
| parent | e7e65ade4a4f85ed24c1829402e2936b189d193f (diff) | |
Update to Qt5.14.1
even though still fails at linking.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | android/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | kelakon.pro | 50 | ||||
| m--------- | qrtclient | 0 |
4 files changed, 32 insertions, 22 deletions
@@ -1,3 +1,3 @@ build-kelakon-* -kelakon.pro.user +*.user* *.swp diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 37a543f..361cec0 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='utf-8'?> <manifest package="id.co.darapsa.kelakon" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto"> - <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28"/> + <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/> <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. Remove the comment if you do not require these default permissions. --> diff --git a/kelakon.pro b/kelakon.pro index 114a8b5..437e784 100644 --- a/kelakon.pro +++ b/kelakon.pro @@ -1,4 +1,4 @@ -QT += quickcontrols2 +QT += quick HEADERS += controller.hxx @@ -11,43 +11,53 @@ RESOURCES += \ larva.qrc \ larva/material-design-icons.qrc -INCLUDEPATH += \ - $$PWD/qrtclient \ - $$PWD/qrtclient/librtclient - LIBS += \ - $$PWD/qrtclient/libqrtclient.a \ - $$PWD/qrtclient/librtclient/librtclient.a \ - -lcurl + -lcurl \ + -lrtclient \ + -lqrtclient contains(ANDROID_TARGET_ARCH,arm64-v8a) { - QMAKE_CFLAGS += -I/usr/local/aarch64-linux-android/sysroot/usr/include LIBS += -L/usr/local/aarch64-linux-android/sysroot/usr/lib ANDROID_EXTRA_LIBS += \ - /usr/local/aarch64-linux-android/sysroot/usr/lib/libcrypto_1_1.so \ - /usr/local/aarch64-linux-android/sysroot/usr/lib/libssl_1_1.so \ - /usr/local/aarch64-linux-android/sysroot/usr/lib/libcurl.so + /usr/local/aarch64-linux-android/sysroot/usr/lib/libcrypto.so \ + /usr/local/aarch64-linux-android/sysroot/usr/lib/libssl.so \ + /usr/local/aarch64-linux-android/sysroot/usr/lib/libcurl.so \ + /usr/local/aarch64-linux-android/sysroot/usr/lib/librtclient.so \ + /opt/Qt5.14.1/5.14.1/android/lib/libqrtclient-arm64-v8a.so } contains(ANDROID_TARGET_ARCH,armeabi-v7a) { - QMAKE_CFLAGS += -I/usr/local/arm-linux-androideabi/sysroot/usr/include LIBS += -L/usr/local/arm-linux-androideabi/sysroot/usr/lib ANDROID_EXTRA_LIBS += \ - /usr/local/arm-linux-androideabi/sysroot/usr/lib/libcrypto_1_1.so \ - /usr/local/arm-linux-androideabi/sysroot/usr/lib/libssl_1_1.so \ - /usr/local/arm-linux-androideabi/sysroot/usr/lib/libcurl.so + /usr/local/arm-linux-androideabi/sysroot/usr/lib/libcrypto.so \ + /usr/local/arm-linux-androideabi/sysroot/usr/lib/libssl.so \ + /usr/local/arm-linux-androideabi/sysroot/usr/lib/libcurl.so \ + /usr/local/arm-linux-androideabi/sysroot/usr/lib/librtclient.so \ + /opt/Qt5.14.1/5.14.1/android/lib/libqrtclient_armeabi-v7a.so } contains(ANDROID_TARGET_ARCH,x86) { - QMAKE_CFLAGS += -I/usr/local/i686-linux-android/sysroot/usr/include LIBS += -L/usr/local/i686-linux-android/sysroot/usr/lib ANDROID_EXTRA_LIBS += \ - /usr/local/i686-linux-android/sysroot/usr/lib/libcrypto_1_1.so \ - /usr/local/i686-linux-android/sysroot/usr/lib/libssl_1_1.so \ - /usr/local/i686-linux-android/sysroot/usr/lib/libcurl.so + /usr/local/i686-linux-android/sysroot/usr/lib/libcrypto.so \ + /usr/local/i686-linux-android/sysroot/usr/lib/libssl.so \ + /usr/local/i686-linux-android/sysroot/usr/lib/libcurl.so \ + /usr/local/i686-linux-android/sysroot/usr/lib/librtclient.so \ + /opt/Qt5.14.1/5.14.1/android/lib/libqrtclient_x86.so +} + +contains(ANDROID_TARGET_ARCH,x86_64) { + LIBS += -L/usr/local/x86_64-linux-android/sysroot/usr/lib64 + ANDROID_EXTRA_LIBS += \ + /usr/local/x86_64-linux-android/sysroot/usr/lib64/libcrypto.so \ + /usr/local/x86_64-linux-android/sysroot/usr/lib64/libssl.so \ + /usr/local/x86_64-linux-android/sysroot/usr/lib64/libcurl.so \ + /usr/local/x86_64-linux-android/sysroot/usr/lib64/librtclient.so \ + /opt/Qt5.14.1/5.14.1/android/lib/libqrtclient_x86_64.so } android { + INCLUDEPATH += /opt/android-ndk/sources/cxx-stl/llvm-libc++/include QT += svg DISTFILES += android/AndroidManifest.xml ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android diff --git a/qrtclient b/qrtclient -Subproject 9e0471185c01049e4e050458572fd2db51d05fd +Subproject 905f99a3e38d10bf3902584a0a0cfa1cd9c355e |