summaryrefslogtreecommitdiff
path: root/mkspecs
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2017-12-08 11:10:12 +0100
committerRobert Griebl <robert.griebl@pelagicore.com>2017-12-20 15:49:01 +0000
commit20abed99dd88c487c7a8b42c88462cc6f9af69e9 (patch)
tree50377a03bbe89002dee94465114b980fc5169d89 /mkspecs
parent08cba8b30b0b4f6477f427ef2608e14d9b1933e4 (diff)
downloadqtivi-20abed99dd88c487c7a8b42c88462cc6f9af69e9.tar.gz
Install the ivigenerator qmake features also when using system-ivigenerator
This is needed for yocto to make sure the feature files are installed in the native part as well as on the target sysroot part. Other than in the normal qmake cross-compiling approach, yocto is always using the mkspec folder in the target sysroot. Change-Id: I44c393fbb327513a27c6d206172f837291057276 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/mkspecs.pro6
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/mkspecs.pro b/mkspecs/mkspecs.pro
index 1c6be92..29bc350 100644
--- a/mkspecs/mkspecs.pro
+++ b/mkspecs/mkspecs.pro
@@ -2,4 +2,8 @@ TEMPLATE = subdirs
include($$QTIVI_BUILD_ROOT/src/ivicore/qtivicore-config.pri)
QT_FOR_CONFIG += ivicore ivicore-private
-qtConfig(ivigenerator): !qtConfig(system-ivigenerator): SUBDIRS += features
+
+# The features always need to be installed (also in the system-ivigenerator case)
+# as yocto uses the mkspecs folder in the target sysroot, although the ivigenerator
+# is in the native sysroot
+qtConfig(ivigenerator): SUBDIRS += features