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

(From meta-qt5 rev: b0100c1b5704e0216733a35ff42afab3c350bef4)

Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-qt5/classes/qmake5_base.bbclass b/meta-qt5/classes/qmake5_base.bbclass
index 04518ef..2db0fa3 100644 (file)
--- a/meta-qt5/classes/qmake5_base.bbclass
+++ b/meta-qt5/classes/qmake5_base.bbclass
@@ -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"

diff --git a/meta-qt5/classes/qmake5_paths.bbclass b/meta-qt5/classes/qmake5_paths.bbclass
index 8f1857f..2b5bf4b 100644 (file)
--- a/meta-qt5/classes/qmake5_paths.bbclass
+++ b/meta-qt5/classes/qmake5_paths.bbclass
@@ -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}"