diff options
| -rw-r--r-- | classes/qmake5.bbclass | 8 | ||||
| -rw-r--r-- | recipes-qt/qt5/qt5.inc | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index 349928f0..a49a7895 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass | |||
| @@ -14,3 +14,11 @@ DEPENDS_prepend = "${QT5TOOLSDEPENDS}" | |||
| 14 | #OE_QMAKE_LIBS_X11SM = "-lSM -lICE" | 14 | #OE_QMAKE_LIBS_X11SM = "-lSM -lICE" |
| 15 | #OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease5" | 15 | #OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease5" |
| 16 | #OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate5" | 16 | #OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate5" |
| 17 | |||
| 18 | do_configure() { | ||
| 19 | qmake5_base_do_configure | ||
| 20 | } | ||
| 21 | |||
| 22 | do_install() { | ||
| 23 | qmake5_base_do_install | ||
| 24 | } | ||
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 0bf8e638..a8929886 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc | |||
| @@ -9,14 +9,6 @@ ICU_powerpc = "pango" | |||
| 9 | 9 | ||
| 10 | QT_MODULE ?= "${BPN}" | 10 | QT_MODULE ?= "${BPN}" |
| 11 | 11 | ||
| 12 | do_configure() { | ||
| 13 | qmake5_base_do_configure | ||
| 14 | } | ||
| 15 | |||
| 16 | do_install() { | ||
| 17 | qmake5_base_do_install | ||
| 18 | } | ||
| 19 | |||
| 20 | # we don't want conflicts with qt4 | 12 | # we don't want conflicts with qt4 |
| 21 | OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" | 13 | OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" |
| 22 | OE_QMAKE_PATH_ARCHDATA = "${libdir}/${QT_DIR_NAME}" | 14 | OE_QMAKE_PATH_ARCHDATA = "${libdir}/${QT_DIR_NAME}" |
