diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-08 22:56:59 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-09 13:56:49 +0200 |
| commit | d8314098bf945b4db15302d47eae1d6fc2df882c (patch) | |
| tree | e89d4d43f927bd2c3fc9a10e91e2c972add7fdd4 /classes | |
| parent | 7caede7850d7b33011a5a0e3124180db2f7a0d6c (diff) | |
qmake5: drop QT_DIR_NAME subdirectory from many OE_QMAKE_PATH_* variables and add it back in qt5.inc
* we're using QT_DIR_NAME subdirectory mostly to prevent conflicts with existing files from qt4
but setting it in all OE_QMAKE_PATH_* variables causes all apps which are just using qmake to
build to install e.g. in /qt5 which for stuff like qterminal or something doesn't
sound right (as long as there isn't qterminal4 and qterminal5 recipe)
* some variables are kept with default QT_DIR_NAME, e.g. qml, imports, plugins we can assume that
every application which installs some QML files will install them in location shared by all
* add qt5-native.inc which also adds this QT_DIR_NAME and common
inherits (later will be used also by qtwayland-native.inc)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qmake5_base.bbclass | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 0bfacec3..37037706 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -52,20 +52,20 @@ QT_DIR_NAME ?= "qt5" export QT_CONF_PATH = "${WORKDIR}/qt.conf" OE_QMAKE_PATH_PREFIX = "${prefix}" -OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" +OE_QMAKE_PATH_HEADERS = "${includedir}" OE_QMAKE_PATH_LIBS = "${libdir}" -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_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}/${QT_DIR_NAME}/translations" -OE_QMAKE_PATH_DOCS = "${datadir}/${QT_DIR_NAME}/doc" -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_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}" |