summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt5-native.inc
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2018-01-08 06:52:07 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2018-01-15 17:55:20 +0000
commit34a3a4bf4b58ea7e63ff81eaf35963cbd4cf59b5 (patch)
treebb5d34eee52585bbd9ea3833d42f78abe3328b8c /recipes-qt/qt5/qt5-native.inc
parentf5cb85e6293e1f742d77959cd1d7e42d536b259f (diff)
downloadmeta-qt5-34a3a4bf4b58ea7e63ff81eaf35963cbd4cf59b5.tar.gz
qtbase: fix a regression
A flaw was introduced by commit b8a236df: [ qt5: Fix cmake config files ] Removing ${S}/include must be done before configure script being called, but it's not in that case for qtbase-native recipe after the commit, that is saying, ${S}/include was removed after configure being called, which causes compiling issues for native build. Further more, the logic introduced by commit b8a236df should only apply to qtbase recipes, so they should be moved to qtbase recipes as well. Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt5-native.inc')
-rw-r--r--recipes-qt/qt5/qt5-native.inc7
1 files changed, 0 insertions, 7 deletions
diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc
index 85350288..76816027 100644
--- a/recipes-qt/qt5/qt5-native.inc
+++ b/recipes-qt/qt5/qt5-native.inc
@@ -10,10 +10,3 @@ OE_QMAKE_PATH_DOCS = "${OE_QMAKE_PATH_QT_DOCS}"
10OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}" 10OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}"
11OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}" 11OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}"
12OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}" 12OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}"
13
14# Regenerate header files when they are included in source tarball
15# Otherwise cmake files don't set PRIVATE_HEADERS correctly
16do_configure_prepend() {
17 rm -rf ${S}/include
18 mkdir -p ${S}/.git || true
19}