diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-14 12:35:37 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-25 09:22:18 +0000 |
| commit | b716195f609de6547cfdfadfd4fd25292a6bbf09 (patch) | |
| tree | 023714d64a2dfd392d0d9052761d657225a407df /classes | |
| parent | 3224b028e70ab3a910ce4fccdd9f3fac4e37011f (diff) | |
| download | meta-qt5-b716195f609de6547cfdfadfd4fd25292a6bbf09.tar.gz | |
qmake5_paths: change the default QT_DIR_NAME to be empty
* there aren't many people using qt4 and qt5 in the same
image anymore, it's time to stop using this work around
and to follow default packaging rules
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qmake5_paths.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass index f3c7b112..ca7e4fc2 100644 --- a/classes/qmake5_paths.bbclass +++ b/classes/qmake5_paths.bbclass | |||
| @@ -2,7 +2,7 @@ | |||
| 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" | 5 | QT_DIR_NAME ?= "" |
| 6 | 6 | ||
| 7 | # This is useful for target recipes to reference native mkspecs | 7 | # This is useful for target recipes to reference native mkspecs |
| 8 | QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}${QT_DIR_NAME}" | 8 | QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}${QT_DIR_NAME}" |