bslathi19/buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/qt5enginio: drop qt 5.6 support

Browse Source 
And get rid of the now unused BR2_PACKAGE_QT5BASE_OPENSSL symbol.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2020-02-26 15:45:39 +01:00
parent 17fafd712a
commit 366b3bb39f
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/qt5/qt5base/Config.in
View File

@@ -283,10 +283,6 @@ comment "icu support needs a toolchain w/ gcc >= 4.8"
depends on !BR2_BINFMT_FLAT depends on !BR2_BINFMT_FLAT
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
config BR2_PACKAGE_QT5BASE_OPENSSL
bool
default y if BR2_PACKAGE_OPENSSL
config BR2_PACKAGE_QT5BASE_TSLIB config BR2_PACKAGE_QT5BASE_TSLIB
bool "Enable Tslib support" bool "Enable Tslib support"
select BR2_PACKAGE_TSLIB select BR2_PACKAGE_TSLIB

12
package/qt5/qt5enginio/Config.in
View File

@@ -1,6 +1,6 @@
config BR2_PACKAGE_QT5ENGINIO config BR2_PACKAGE_QT5ENGINIO
bool "qt5enginio" bool "qt5enginio"
depends on BR2_PACKAGE_QT5BASE_OPENSSL select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_GUI
select BR2_PACKAGE_QT5BASE_NETWORK select BR2_PACKAGE_QT5BASE_NETWORK
help help
@@ -14,13 +14,3 @@ config BR2_PACKAGE_QT5ENGINIO
5.6 and not recommended for new design. 5.6 and not recommended for new design.
http://doc.qt.io/archives/qt-5.5/enginio-index.html http://doc.qt.io/archives/qt-5.5/enginio-index.html
# When Qt 5.6 is removed, replace the depends on
# BR2_PACKAGE_QT5BASE_OPENSSL above by a select BR2_PACKAGE_OPENSSL.
comment "qt5enginio needs libressl"
depends on BR2_PACKAGE_QT5_VERSION_5_6
depends on !BR2_PACKAGE_QT5BASE_OPENSSL
comment "qt5enginio needs openssl"
depends on BR2_PACKAGE_QT5_VERSION_LATEST
depends on !BR2_PACKAGE_QT5BASE_OPENSSL