qt: add an option to install the test module

When building Qt in a minimal configuration, a couple of Qt modules
(QtNetwork, QtSql, QtTest and QtXml) are built in addition to QtCore,
so they are installed in the sysroot but they are not copied into the
target tree.

Among these modules that could be built but optionally installed, only
QtTest had no option to allow being installed in the target fs.

Thus, programs linking against QtTest would successfully build, but
would miserably fail at runtime due to this missing dependency.

So far, the only package triggering this issue is OpenCV (the highgui
module built with Qt support).

A followup patch will add this missing dependency in OpenCV using this
new option.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/qt/Config.in b/package/qt/Config.in
index 8d67e37bdecee0bb815773aa535acd9eead66983..0a21e93c13fee2d00b7ced0787278144df4f72f5 100644 (file)
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -416,4 +416,9 @@ config BR2_PACKAGE_QT_DECLARATIVE
          Build the Qt Declarative Module for qml support
          if unsure, say n.
 
+config BR2_PACKAGE_QT_TEST
+       bool "Test Module"
+       help
+         Install the Test module.
+
 endif # BR2_PACKAGE_QT

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index f54b6e67c338df6ba03001022b7ab17259cc22ff..6d01023cf7dc1ff5d570faa51972e4d6c01444e8 100644 (file)
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -586,6 +586,9 @@ endif
 ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
 QT_INSTALL_LIBS    += pvrQWSWSEGL
 endif
+ifeq ($(BR2_PACKAGE_QT_TEST),y)
+QT_INSTALL_LIBS    += QtTest
+endif
 
 QT_CONF_FILE=$(HOST_DIR)/usr/bin/qt.conf