summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mkspecs/mkspecs.pro6
m---------src/3rdparty/qface0
2 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
diff --git a/src/3rdparty/qface b/src/3rdparty/qface
-Subproject 295824c8df7f74af8f3d1f368ec15942e6622f2
+Subproject 9da793d6cbc63d617ad5e2ffd13e9f6d055c88e