diff options
| author | Simon Busch <morphis@gravedo.de> | 2013-07-22 21:14:57 +0000 |
|---|---|---|
| committer | Simon Busch <morphis@gravedo.de> | 2013-07-25 20:12:14 +0000 |
| commit | b0100c1b5704e0216733a35ff42afab3c350bef4 (patch) | |
| tree | 9118878ee3567de02bb980c3e6e0fe9e2fa3c430 | |
| parent | bb4c8adeeb3107074fbf63bddf292059b370afa5 (diff) | |
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>
| -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}" 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/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 @@ # 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}" |