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 /recipes-qt/qt5/qt5.inc | |
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 'recipes-qt/qt5/qt5.inc')
-rw-r--r-- | recipes-qt/qt5/qt5.inc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index b29bc891..79a4833c 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -22,6 +22,17 @@ 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}" +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" + PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " # extra -dbg packages |