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 <Martin.Jansa@gmail.com>
This commit is contained in:
parent
727b27e936
commit
4c197c6223
|
@ -51,25 +51,7 @@ QT_DIR_NAME ?= "qt5"
|
|||
# this one needs to be exported, because qmake reads it from shell env
|
||||
export QT_CONF_PATH = "${WORKDIR}/qt.conf"
|
||||
|
||||
OE_QMAKE_PATH_PREFIX = "${prefix}"
|
||||
OE_QMAKE_PATH_HEADERS = "${includedir}"
|
||||
OE_QMAKE_PATH_LIBS = "${libdir}"
|
||||
OE_QMAKE_PATH_ARCHDATA = "${libdir}"
|
||||
OE_QMAKE_PATH_DATA = "${datadir}"
|
||||
OE_QMAKE_PATH_BINS = "${bindir}"
|
||||
OE_QMAKE_PATH_LIBEXECS = "${libdir}/${QT_DIR_NAME}/libexec"
|
||||
OE_QMAKE_PATH_PLUGINS = "${libdir}/${QT_DIR_NAME}/plugins"
|
||||
OE_QMAKE_PATH_IMPORTS = "${libdir}/${QT_DIR_NAME}/imports"
|
||||
OE_QMAKE_PATH_QML = "${libdir}/${QT_DIR_NAME}/qml"
|
||||
OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/translations"
|
||||
OE_QMAKE_PATH_DOCS = "${docdir}"
|
||||
OE_QMAKE_PATH_SETTINGS = "${sysconfdir}"
|
||||
OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples"
|
||||
OE_QMAKE_PATH_TESTS = "${datadir}/tests"
|
||||
OE_QMAKE_PATH_HOST_PREFIX = ""
|
||||
OE_QMAKE_PATH_HOST_BINS = "${bindir}/${QT_DIR_NAME}"
|
||||
OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}"
|
||||
OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}"
|
||||
inherit qmake5_paths
|
||||
|
||||
do_generate_qt_config_file() {
|
||||
cat > ${QT_CONF_PATH} <<EOF
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
# If your distribution supports only qt5, or you don't care
|
||||
# about conflicts with qt4, then you can add qmake5_paths.bbclass
|
||||
# to your distro layer and flatten all QT_DIR_NAME directories
|
||||
|
||||
OE_QMAKE_PATH_PREFIX = "${prefix}"
|
||||
OE_QMAKE_PATH_HEADERS = "${includedir}"
|
||||
OE_QMAKE_PATH_LIBS = "${libdir}"
|
||||
OE_QMAKE_PATH_ARCHDATA = "${libdir}"
|
||||
OE_QMAKE_PATH_DATA = "${datadir}"
|
||||
OE_QMAKE_PATH_BINS = "${bindir}"
|
||||
OE_QMAKE_PATH_LIBEXECS = "${libdir}/${QT_DIR_NAME}/libexec"
|
||||
OE_QMAKE_PATH_PLUGINS = "${libdir}/${QT_DIR_NAME}/plugins"
|
||||
OE_QMAKE_PATH_IMPORTS = "${libdir}/${QT_DIR_NAME}/imports"
|
||||
OE_QMAKE_PATH_QML = "${libdir}/${QT_DIR_NAME}/qml"
|
||||
OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/translations"
|
||||
OE_QMAKE_PATH_DOCS = "${docdir}"
|
||||
OE_QMAKE_PATH_SETTINGS = "${sysconfdir}"
|
||||
OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples"
|
||||
OE_QMAKE_PATH_TESTS = "${datadir}/tests"
|
||||
OE_QMAKE_PATH_HOST_PREFIX = ""
|
||||
OE_QMAKE_PATH_HOST_BINS = "${bindir}/${QT_DIR_NAME}"
|
||||
OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}"
|
||||
OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}"
|
||||
|
||||
# for qt5 components we're using QT_DIR_NAME subdirectory in more
|
||||
# variables, because we don't want conflicts with qt4
|
||||
# This block is usefull for components which install their
|
||||
# own files without QT_DIR_NAME but need to reference paths e.g.
|
||||
# with QT headers
|
||||
OE_QMAKE_PATH_QT_HEADERS = "${includedir}/${QT_DIR_NAME}"
|
||||
OE_QMAKE_PATH_QT_ARCHDATA = "${libdir}/${QT_DIR_NAME}"
|
||||
OE_QMAKE_PATH_QT_DATA = "${datadir}/${QT_DIR_NAME}"
|
||||
OE_QMAKE_PATH_QT_BINS = "${bindir}/${QT_DIR_NAME}"
|
||||
OE_QMAKE_PATH_QT_TRANSLATIONS = "${datadir}/${QT_DIR_NAME}/translations"
|
||||
OE_QMAKE_PATH_QT_DOCS = "${docdir}/${QT_DIR_NAME}"
|
||||
OE_QMAKE_PATH_QT_SETTINGS = "${sysconfdir}/${QT_DIR_NAME}"
|
||||
OE_QMAKE_PATH_QT_EXAMPLES = "${datadir}/${QT_DIR_NAME}/examples"
|
||||
OE_QMAKE_PATH_QT_TESTS = "${datadir}/${QT_DIR_NAME}/tests"
|
|
@ -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}"
|
||||
|
|
|
@ -10,15 +10,15 @@ ICU_powerpc = "pango"
|
|||
QT_MODULE ?= "${BPN}"
|
||||
|
||||
# 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}"
|
||||
|
||||
PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
|
||||
|
||||
|
|
Loading…
Reference in New Issue