diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-10-21 12:11:02 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2016-10-21 12:11:02 +0300 |
| commit | 7741ef0cb46e40658c0eb1a5940d3da1275d561d (patch) | |
| tree | d9fbd3b805383279b0100b530c630649ba236763 | |
| parent | 9955f170ad32bc8d6915d1dc2b6b19a8181a6363 (diff) | |
| parent | 9aa870eecf6dc7a87678393bd55b97e21033ab48 (diff) | |
Merge branch 'upstream/morty' into 5.7
* upstream/morty:
qtbase: avoid qmake errors due to missing oe-device-extra.pri
Change-Id: I8ea051eb8f2d1354c41a1fab903879685548cbea
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 21d9c5ef..3ea41e27 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -196,6 +196,8 @@ 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 # Remove example.pro file as it is useless rm -f ${D}${OE_QMAKE_PATH_EXAMPLES}/examples.pro |