diff options
-rw-r--r-- | classes/qmake5_base.bbclass | 1 | ||||
-rw-r--r-- | classes/qmake5_paths.bbclass | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 04518ef4..2db0fa32 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
@@ -46,7 +46,6 @@ OE_QMAKE_LDFLAGS = "${LDFLAGS}" | |||
46 | OE_QMAKE_AR = "${AR}" | 46 | OE_QMAKE_AR = "${AR}" |
47 | OE_QMAKE_STRIP = "echo" | 47 | OE_QMAKE_STRIP = "echo" |
48 | OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" | 48 | OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" |
49 | QT_DIR_NAME ?= "qt5" | ||
50 | 49 | ||
51 | # this one needs to be exported, because qmake reads it from shell env | 50 | # this one needs to be exported, because qmake reads it from shell env |
52 | export QT_CONF_PATH = "${WORKDIR}/qt.conf" | 51 | export QT_CONF_PATH = "${WORKDIR}/qt.conf" |
diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass index 8f1857f0..2b5bf4b6 100644 --- a/classes/qmake5_paths.bbclass +++ b/classes/qmake5_paths.bbclass | |||
@@ -2,6 +2,8 @@ | |||
2 | # about conflicts with qt4, then you can add qmake5_paths.bbclass | 2 | # about conflicts with qt4, then you can add qmake5_paths.bbclass |
3 | # to your distro layer and flatten all QT_DIR_NAME directories | 3 | # to your distro layer and flatten all QT_DIR_NAME directories |
4 | 4 | ||
5 | QT_DIR_NAME ?= "qt5" | ||
6 | |||
5 | OE_QMAKE_PATH_PREFIX = "${prefix}" | 7 | OE_QMAKE_PATH_PREFIX = "${prefix}" |
6 | OE_QMAKE_PATH_HEADERS = "${includedir}" | 8 | OE_QMAKE_PATH_HEADERS = "${includedir}" |
7 | OE_QMAKE_PATH_LIBS = "${libdir}" | 9 | OE_QMAKE_PATH_LIBS = "${libdir}" |