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>
This commit is contained in:
parent
7caede7850
commit
d8314098bf
|
@ -52,20 +52,20 @@ QT_DIR_NAME ?= "qt5"
|
||||||
export QT_CONF_PATH = "${WORKDIR}/qt.conf"
|
export QT_CONF_PATH = "${WORKDIR}/qt.conf"
|
||||||
|
|
||||||
OE_QMAKE_PATH_PREFIX = "${prefix}"
|
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_LIBS = "${libdir}"
|
||||||
OE_QMAKE_PATH_ARCHDATA = "${libdir}/${QT_DIR_NAME}"
|
OE_QMAKE_PATH_ARCHDATA = "${libdir}"
|
||||||
OE_QMAKE_PATH_DATA = "${datadir}/${QT_DIR_NAME}"
|
OE_QMAKE_PATH_DATA = "${datadir}"
|
||||||
OE_QMAKE_PATH_BINS = "${bindir}/${QT_DIR_NAME}"
|
OE_QMAKE_PATH_BINS = "${bindir}"
|
||||||
OE_QMAKE_PATH_LIBEXECS = "${libdir}/${QT_DIR_NAME}/libexec"
|
OE_QMAKE_PATH_LIBEXECS = "${libdir}/${QT_DIR_NAME}/libexec"
|
||||||
OE_QMAKE_PATH_PLUGINS = "${libdir}/${QT_DIR_NAME}/plugins"
|
OE_QMAKE_PATH_PLUGINS = "${libdir}/${QT_DIR_NAME}/plugins"
|
||||||
OE_QMAKE_PATH_IMPORTS = "${libdir}/${QT_DIR_NAME}/imports"
|
OE_QMAKE_PATH_IMPORTS = "${libdir}/${QT_DIR_NAME}/imports"
|
||||||
OE_QMAKE_PATH_QML = "${libdir}/${QT_DIR_NAME}/qml"
|
OE_QMAKE_PATH_QML = "${libdir}/${QT_DIR_NAME}/qml"
|
||||||
OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/${QT_DIR_NAME}/translations"
|
OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/translations"
|
||||||
OE_QMAKE_PATH_DOCS = "${datadir}/${QT_DIR_NAME}/doc"
|
OE_QMAKE_PATH_DOCS = "${docdir}"
|
||||||
OE_QMAKE_PATH_SETTINGS = "${sysconfdir}/${QT_DIR_NAME}"
|
OE_QMAKE_PATH_SETTINGS = "${sysconfdir}"
|
||||||
OE_QMAKE_PATH_EXAMPLES = "${datadir}/${QT_DIR_NAME}/examples"
|
OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples"
|
||||||
OE_QMAKE_PATH_TESTS = "${datadir}/${QT_DIR_NAME}/tests"
|
OE_QMAKE_PATH_TESTS = "${datadir}/tests"
|
||||||
OE_QMAKE_PATH_HOST_PREFIX = ""
|
OE_QMAKE_PATH_HOST_PREFIX = ""
|
||||||
OE_QMAKE_PATH_HOST_BINS = "${bindir}/${QT_DIR_NAME}"
|
OE_QMAKE_PATH_HOST_BINS = "${bindir}/${QT_DIR_NAME}"
|
||||||
OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}"
|
OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}"
|
||||||
|
|
|
@ -0,0 +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"
|
|
@ -22,6 +22,17 @@ do_install() {
|
||||||
qmake5_base_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 "
|
PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
|
||||||
|
|
||||||
# extra -dbg packages
|
# extra -dbg packages
|
||||||
|
|
|
@ -5,10 +5,10 @@ HOMEPAGE = "http://qt-project.org"
|
||||||
|
|
||||||
INC_PR = "r1"
|
INC_PR = "r1"
|
||||||
|
|
||||||
inherit native qmake5_base
|
|
||||||
|
|
||||||
QT_MODULE = "qtbase"
|
QT_MODULE = "qtbase"
|
||||||
|
|
||||||
|
require qt5-native.inc
|
||||||
|
|
||||||
# shared with target qtbase
|
# shared with target qtbase
|
||||||
SRC_URI += " \
|
SRC_URI += " \
|
||||||
file://0001-Add-linux-oe-g-platform.patch \
|
file://0001-Add-linux-oe-g-platform.patch \
|
||||||
|
|
|
@ -9,9 +9,9 @@ DEPENDS = "qtbase-native"
|
||||||
|
|
||||||
QT_MODULE = "qtjsbackend"
|
QT_MODULE = "qtjsbackend"
|
||||||
|
|
||||||
INC_PR = "r0"
|
require qt5-native.inc
|
||||||
|
|
||||||
inherit native qmake5_base
|
INC_PR = "r0"
|
||||||
|
|
||||||
SRC_URI += "\
|
SRC_URI += "\
|
||||||
file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \
|
file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \
|
||||||
|
|
Loading…
Reference in New Issue