diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-08 22:56:59 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-09 13:56:49 +0200 |
| commit | d8314098bf945b4db15302d47eae1d6fc2df882c (patch) | |
| tree | e89d4d43f927bd2c3fc9a10e91e2c972add7fdd4 /recipes-qt/qt5/qtjsbackend-native.inc | |
| parent | 7caede7850d7b33011a5a0e3124180db2f7a0d6c (diff) | |
qmake5: drop QT_DIR_NAME subdirectory from many OE_QMAKE_PATH_* variables and add it back in qt5.inc
* we're using QT_DIR_NAME subdirectory mostly to prevent conflicts with existing files from qt4
but setting it in all OE_QMAKE_PATH_* variables causes all apps which are just using qmake to
build to install e.g. in /qt5 which for stuff like qterminal or something doesn't
sound right (as long as there isn't qterminal4 and qterminal5 recipe)
* some variables are kept with default QT_DIR_NAME, e.g. qml, imports, plugins we can assume that
every application which installs some QML files will install them in location shared by all
* add qt5-native.inc which also adds this QT_DIR_NAME and common
inherits (later will be used also by qtwayland-native.inc)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtjsbackend-native.inc')
| -rw-r--r-- | recipes-qt/qt5/qtjsbackend-native.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtjsbackend-native.inc b/recipes-qt/qt5/qtjsbackend-native.inc index 2cf113d8..4369af03 100644 --- a/recipes-qt/qt5/qtjsbackend-native.inc +++ b/recipes-qt/qt5/qtjsbackend-native.inc @@ -9,9 +9,9 @@ DEPENDS = "qtbase-native" QT_MODULE = "qtjsbackend" -INC_PR = "r0" +require qt5-native.inc -inherit native qmake5_base +INC_PR = "r0" SRC_URI += "\ file://0001-Install-the-mkv8snapshot-tool-to-the-native-side.patch \ |