classes: qmake5: move QT_DIR_NAME to qmake5_paths
* qmake5_paths.bbclass refers to QT_DIR_NAME but it's defined on a higher level which doesn't makes sense and breaks some use cases Signed-off-by: Simon Busch <morphis@gravedo.de>
This commit is contained in:
parent
bb4c8adeeb
commit
b0100c1b57
|
@ -46,7 +46,6 @@ OE_QMAKE_LDFLAGS = "${LDFLAGS}"
|
|||
OE_QMAKE_AR = "${AR}"
|
||||
OE_QMAKE_STRIP = "echo"
|
||||
OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner"
|
||||
QT_DIR_NAME ?= "qt5"
|
||||
|
||||
# this one needs to be exported, because qmake reads it from shell env
|
||||
export QT_CONF_PATH = "${WORKDIR}/qt.conf"
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
# about conflicts with qt4, then you can add qmake5_paths.bbclass
|
||||
# to your distro layer and flatten all QT_DIR_NAME directories
|
||||
|
||||
QT_DIR_NAME ?= "qt5"
|
||||
|
||||
OE_QMAKE_PATH_PREFIX = "${prefix}"
|
||||
OE_QMAKE_PATH_HEADERS = "${includedir}"
|
||||
OE_QMAKE_PATH_LIBS = "${libdir}"
|
||||
|
|
Loading…
Reference in New Issue