From ecb69f257a664b1f03d39f53a2f5d959253759f4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 9 May 2013 19:16:32 +0200 Subject: [PATCH] qmake5: move default do_configure and do_install to qmake5.bbclass * it's useful for many recipes outside qt5 and easy to overwrite when needed Signed-off-by: Patrick Ohly --- meta-qt5/classes/qmake5.bbclass | 8 ++++++++ meta-qt5/recipes-qt/qt5/qt5.inc | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-qt5/classes/qmake5.bbclass b/meta-qt5/classes/qmake5.bbclass index 349928f..a49a789 100644 --- a/meta-qt5/classes/qmake5.bbclass +++ b/meta-qt5/classes/qmake5.bbclass @@ -14,3 +14,11 @@ DEPENDS_prepend = "${QT5TOOLSDEPENDS}" #OE_QMAKE_LIBS_X11SM = "-lSM -lICE" #OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease5" #OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate5" + +do_configure() { + qmake5_base_do_configure +} + +do_install() { + qmake5_base_do_install +} diff --git a/meta-qt5/recipes-qt/qt5/qt5.inc b/meta-qt5/recipes-qt/qt5/qt5.inc index 0bf8e63..a892988 100644 --- a/meta-qt5/recipes-qt/qt5/qt5.inc +++ b/meta-qt5/recipes-qt/qt5/qt5.inc @@ -9,14 +9,6 @@ ICU_powerpc = "pango" QT_MODULE ?= "${BPN}" -do_configure() { - qmake5_base_do_configure -} - -do_install() { - qmake5_base_do_install -} - # we don't want conflicts with qt4 OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" OE_QMAKE_PATH_ARCHDATA = "${libdir}/${QT_DIR_NAME}" -- 2.7.4