diff options
| author | Samuel Martin <s.martin49@gmail.com> | 2014-04-23 01:15:33 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-05-03 23:05:58 +0200 |
| commit | 2cd9830e7388700e2b42659538307e9c6e4764b3 (patch) | |
| tree | dcbc24512f491504fb32dc7c21b5cbee47c986fa | |
| parent | 4990a381e304a93f7ac125b1aed43df2f39d5bc6 (diff) | |
| download | buildroot-2cd9830e7388700e2b42659538307e9c6e4764b3.tar.gz buildroot-2cd9830e7388700e2b42659538307e9c6e4764b3.zip | |
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>
| -rw-r--r-- | package/qt/Config.in | 5 | ||||
| -rw-r--r-- | package/qt/qt.mk | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/package/qt/Config.in b/package/qt/Config.in index 8d67e37bde..0a21e93c13 100644 --- 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 f54b6e67c3..6d01023cf7 100644 --- 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 |
