From 4c197c6223a1c878dfa8c0277a91021c68091a93 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 21:17:01 +0200 Subject: qmake5_base: Define OE_QMAKE_PATH_QT_* variables * and move it to separate .bbclass which is easier to replace in distro layer when you don't care about conflicts with qt4 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-native.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'recipes-qt/qt5/qt5-native.inc') diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index e1a77987..76816027 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc @@ -1,12 +1,12 @@ inherit native qmake5_base # we don't want conflicts with qt4 -OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_ARCHDATA = "${libdir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_DATA = "${datadir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_BINS = "${bindir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/${QT_DIR_NAME}/translations" -OE_QMAKE_PATH_DOCS = "${docdir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_SETTINGS = "${sysconfdir}/${QT_DIR_NAME}" -OE_QMAKE_PATH_EXAMPLES = "${datadir}/${QT_DIR_NAME}/examples" -OE_QMAKE_PATH_TESTS = "${datadir}/${QT_DIR_NAME}/tests" +OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" +OE_QMAKE_PATH_ARCHDATA = "${OE_QMAKE_PATH_QT_ARCHDATA}" +OE_QMAKE_PATH_DATA = "${OE_QMAKE_PATH_QT_DATA}" +OE_QMAKE_PATH_BINS = "${OE_QMAKE_PATH_QT_BINS}" +OE_QMAKE_PATH_TRANSLATIONS = "${OE_QMAKE_PATH_QT_TRANSLATIONS}" +OE_QMAKE_PATH_DOCS = "${OE_QMAKE_PATH_QT_DOCS}" +OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}" +OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}" +OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}" -- cgit v1.2.3-54-g00ecf