diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-25 12:13:15 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-10-25 12:13:15 +0300 |
| commit | 429a8e9a0b720b2ca1e66fff921888bbdef3e378 (patch) | |
| tree | b6c7af9a86571c5e1e9d1097534cb5985d89e920 | |
| parent | 9195d9dc805fd3132023ff33bc77ace1f3f7e40f (diff) | |
| parent | 9aa870eecf6dc7a87678393bd55b97e21033ab48 (diff) | |
Merge remote-tracking branch 'gerrit/upstream/master' into 5.8
* gerrit/upstream/master:
qtbase: avoid qmake errors due to missing oe-device-extra.pri
Conflicts:
recipes-qt/qt5/qtbase_git.bb
Change-Id: Ib6975f5a7966ffbf9f96d40d69b89f226cd59040
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 50795bfb..bb56a15b 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -166,6 +166,9 @@ do_configure() { } do_install_append() { + # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" + touch ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/oe-device-extra.pri + # Replace host paths with qmake built-in properties sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX/get]|g' \ -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \ |