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 /classes/qmake5_base.bbclass | |
parent | bb4c8adeeb3107074fbf63bddf292059b370afa5 (diff) | |
download | meta-qt5-b0100c1b5704e0216733a35ff42afab3c350bef4.tar.gz |
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>
Diffstat (limited to 'classes/qmake5_base.bbclass')
-rw-r--r-- | classes/qmake5_base.bbclass | 1 |
1 files changed, 0 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" |