package/qt5: remove menu comment about deprecated modules

As now the Qt version is configurable to simplify the menu display
logic we remove the menu comment about deprecated modules and
indicate it in the relevant modules' help text instead, and also
mention in the help text if a package's tech preview status has been
changed between Qt 5.6 and Qt 5.8

Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index c3560c3777b802cdf3e8f62893cae8a62024d279..df6ce4deb2579508c2d7f6293114538fc2951605 100644 (file)
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -58,23 +58,22 @@ source "package/qt5/qt5base/Config.in"
 source "package/qt5/qt5canvas3d/Config.in"
 source "package/qt5/qt5connectivity/Config.in"
 source "package/qt5/qt5declarative/Config.in"
+source "package/qt5/qt5enginio/Config.in"
 source "package/qt5/qt5graphicaleffects/Config.in"
 source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5location/Config.in"
 source "package/qt5/qt5multimedia/Config.in"
 source "package/qt5/qt5quickcontrols/Config.in"
 source "package/qt5/qt5quickcontrols2/Config.in"
+source "package/qt5/qt5script/Config.in"
 source "package/qt5/qt5sensors/Config.in"
 source "package/qt5/qt5serialbus/Config.in"
 source "package/qt5/qt5serialport/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5tools/Config.in"
 source "package/qt5/qt5webchannel/Config.in"
+source "package/qt5/qt5webkit/Config.in"
 source "package/qt5/qt5websockets/Config.in"
 source "package/qt5/qt5x11extras/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
-comment "legacy compatibility"
-source "package/qt5/qt5enginio/Config.in"
-source "package/qt5/qt5script/Config.in"
-source "package/qt5/qt5webkit/Config.in"
 endif

diff --git a/package/qt5/qt53d/Config.in b/package/qt5/qt53d/Config.in
index ff50204fc80b98d29063bc42033dacb24c72271c..27f27a80704b94eeab6e8cfd3f60b7a09f578c9c 100644 (file)
--- a/package/qt5/qt53d/Config.in
+++ b/package/qt5/qt53d/Config.in
@@ -12,6 +12,10 @@ config BR2_PACKAGE_QT53D
 
          This package corresponds to the qt53d module.
 
+
+         This module was in tech preview in Qt 5.6, and promoted
+         to a core module in Qt 5.7.0.
+
          Enable the assimp package to gain the assimp sceneparser plugin.
 
          http://doc.qt.io/qt-5/qt3d-index.html

diff --git a/package/qt5/qt5enginio/Config.in b/package/qt5/qt5enginio/Config.in
index fcb866cd6d1a02efc3d8ccc85984b960bb6f5a07..dba75e2bdf2c925429473de9b18ddb67dd7fc2a1 100644 (file)
--- a/package/qt5/qt5enginio/Config.in
+++ b/package/qt5/qt5enginio/Config.in
@@ -10,4 +10,7 @@ config BR2_PACKAGE_QT5ENGINIO
 
          This package corresponds to the qt5enginio module.
 
+         This package has been tagged as deprecated since version
+         5.6 and not recommended for new design.
+
          http://qt.io

diff --git a/package/qt5/qt5quickcontrols2/Config.in b/package/qt5/qt5quickcontrols2/Config.in
index 1e57674dc864837ea9d6843acd804664b2075d67..d2267cba2f039501f6459bffc4840b15069c070d 100644 (file)
--- a/package/qt5/qt5quickcontrols2/Config.in
+++ b/package/qt5/qt5quickcontrols2/Config.in
@@ -10,6 +10,9 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2
 
          This package corresponds to the qt5quickcontrols2 module.
 
+         This module was in tech preview in Qt 5.6, and promoted
+         to a core module in Qt 5.7.0.
+
          http://qt.io
 
 comment "qt5quickcontrols2 needs an OpenGL-capable backend"

diff --git a/package/qt5/qt5serialbus/Config.in b/package/qt5/qt5serialbus/Config.in
index f5b713dbaec3f1fde8ad850a1516048394f7fb08..3960adac518c241960399fba3cba1fb1c5399804 100644 (file)
--- a/package/qt5/qt5serialbus/Config.in
+++ b/package/qt5/qt5serialbus/Config.in
@@ -9,6 +9,9 @@ config BR2_PACKAGE_QT5SERIALBUS
 
          This package corresponds to the qt5serialbus module.
 
+         This module was in tech preview in Qt 5.6, and promoted
+         to a core module in Qt 5.8.0.
+
          http://qt.io
 
 comment "qt5serialbus needs headers >= 3.6"