aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-11-16 22:24:01 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2016-11-16 22:27:09 +0200
commit4e113c7b8e0a7512d2f0ad306decc8b4885ef807 (patch)
tree02e337512c2b061d6d3e9b8523491d3441556237 /classes
parent8c7e11523eb0bc1044e79593a1ffa823867ff567 (diff)
parent81fb771c3f31110e50eebcb004809361fdb28194 (diff)
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.8
Conflicts: classes/qmake5_base.bbclass recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtwayland-native_git.bb recipes-qt/qt5/qtwayland_git.bb Change-Id: I4d383e069efb8f64b7469e414ab368c9ca0ff1ad
Diffstat (limited to 'classes')
-rw-r--r--classes/qmake5_base.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index fa1bc563..3da8e655 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -30,7 +30,7 @@ EXTRA_OEMAKE = " \
OE_QMAKE_INCDIR_QT='${STAGING_DIR_TARGET}/${OE_QMAKE_PATH_HEADERS}' \
"
-OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qmake"
+OE_QMAKE_QMAKE = "${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake"
export OE_QMAKE_COMPILER = "${CC}"
export OE_QMAKE_CC = "${CC}"
export OE_QMAKE_CFLAGS = "${CFLAGS}"