summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--classes/qmake5_base.bbclass1
-rw-r--r--classes/qmake5_paths.bbclass2
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}"
46OE_QMAKE_AR = "${AR}" 46OE_QMAKE_AR = "${AR}"
47OE_QMAKE_STRIP = "echo" 47OE_QMAKE_STRIP = "echo"
48OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" 48OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner"
49QT_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
52export QT_CONF_PATH = "${WORKDIR}/qt.conf" 51export 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
5QT_DIR_NAME ?= "qt5"
6
5OE_QMAKE_PATH_PREFIX = "${prefix}" 7OE_QMAKE_PATH_PREFIX = "${prefix}"
6OE_QMAKE_PATH_HEADERS = "${includedir}" 8OE_QMAKE_PATH_HEADERS = "${includedir}"
7OE_QMAKE_PATH_LIBS = "${libdir}" 9OE_QMAKE_PATH_LIBS = "${libdir}"