Finally fixed the ssl issue on andorid by updating openssl to v1.1.1
This commit is contained in:
parent
b3b5fd1940
commit
23aca9da07
7 changed files with 4 additions and 7 deletions
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0"?>
|
||||
<manifest package="com.itsblue.flgvertretungtest" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.2" android:versionCode="16" android:installLocation="auto">
|
||||
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
|
||||
<uses-sdk android:minSdkVersion="16" 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. -->
|
||||
|
|
BIN
android-sources/libs/armeabi-v7a/libcrypto.so
Normal file → Executable file
BIN
android-sources/libs/armeabi-v7a/libcrypto.so
Normal file → Executable file
Binary file not shown.
Binary file not shown.
BIN
android-sources/libs/armeabi-v7a/libssl.so
Normal file → Executable file
BIN
android-sources/libs/armeabi-v7a/libssl.so
Normal file → Executable file
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -18,7 +18,6 @@ TEMPLATE = app
|
|||
TARGET = fannyapp
|
||||
|
||||
ICON = shared/graphics/favicon.icns
|
||||
RC_ICONS = shared/graphics/favicon.ico
|
||||
|
||||
SOURCES += \
|
||||
sources/serverconn.cpp \
|
||||
|
@ -55,10 +54,10 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
|
|||
android {
|
||||
QT += androidextras
|
||||
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources
|
||||
LIBS += "$$PWD/android-sources/libs/armeabi-v7a/libssl.a"
|
||||
LIBS += "$$PWD/android-sources/libs/armeabi-v7a/libcrypto.a"
|
||||
}
|
||||
|
||||
win {
|
||||
RC_ICONS = shared/graphics/favicon.ico
|
||||
LIBS += "$$PWD/windows-libs/libeay32.dll"
|
||||
LIBS += "$$PWD/windows-libs/ssleay32.dll"
|
||||
}
|
||||
|
@ -69,7 +68,5 @@ ios {
|
|||
|
||||
DISTFILES += \
|
||||
android-sources/AndroidManifest.xml \
|
||||
CHANGELOG.md \
|
||||
$$files(shared/icons/*.png, true) \
|
||||
shared/icons/ibmaterial/index.theme
|
||||
CHANGELOG.md
|
||||
|
||||
|
|
Reference in a new issue