diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-09 21:17:01 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-09 21:41:32 +0200 |
commit | 4c197c6223a1c878dfa8c0277a91021c68091a93 (patch) | |
tree | 9f1c49c5341e5e26f27f0702e8e7a4588243504b /classes | |
parent | 727b27e9368a4c079353d68741e6636a56305db7 (diff) |
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>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/qmake5_base.bbclass | 20 | ||||
-rw-r--r-- | classes/qmake5_paths.bbclass | 38 |
2 files changed, 39 insertions, 19 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index d81d283c..8ff9565a 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -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 diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass new file mode 100644 index 00000000..67707add --- /dev/null +++ b/classes/qmake5_paths.bbclass @@ -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" |