From b056658d700bb862b9f07c3e83dcdcc288804c5f Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 2 Mar 2020 12:00:03 +0200 Subject: [PATCH] Update README.md to reflect previous commit --- README.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 6729dc4..1885fdc 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,16 @@ -# android_openssl -OpenSSL scripts and bins for Android (useful for Qt on Android apps) +# Android OpenSSL support for Qt +OpenSSL scripts and binaries for Android (useful for Qt Android apps) -In this repo you can find prebuilt openssl libs for Android and a qmake `.pri` file. +In this repo you can find the prebuilt OpenSSL libs for Android and a qmake include project `.pri` file that can be used integrated with Qt projects. -The following branches/tag(s) are available -* `1.0.x` branch has OpenSSL 1.0.x which can be used with **Qt up to 5.12.3** -* `5.12.4_5.13.0` tag has OpenSSL 1.1.x which can be used **ONLY with 5.12.4 and 5.13.0**. Be aware that on Android 5 (API 21) these libs names are clasing with the system SSL libs which are using OpenSSL 1.0, this means your Qt app will fail to use OpenSSL 1.1 as the system ones are already loaded by the OS. -* `master` branch is needed for **Qt 5.12.5+ and 5.13.1+** +The following directories are available +* `Qt-5.12.3`: used for Qt 5.12.3 and below. +* `Qt-5.12.4_5.13.0`: this has OpenSSL 1.1.x which can be used **ONLY** with Qt 5.12.4 and 5.13.0. Be aware that on Android 5 (API 21) these libs names are clashing with the system SSL libs which are using OpenSSL 1.0, this means your Qt app will fail to use OpenSSL 1.1 as the system ones are already loaded by the OS. +* `latest`: used for Qt 5.12.5+ and 5.13.1+. -To add openssl in your qmake project just add: +To add OpenSSL in your qmake project just add the line below to your `.pro` file: ``` include(