diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-07 15:30:56 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-07 15:57:48 +0200 |
| commit | ae45cb478fbfacc7e2e23eb365c1f740ad325335 (patch) | |
| tree | 07ccb55679d65126635ba9410d449d03d49810bd /recipes-qt/qt5/qtwayland.inc | |
| parent | c87998953133d7b9a5a8ba55b00fa1803b937337 (diff) | |
| download | meta-qt5-ae45cb478fbfacc7e2e23eb365c1f740ad325335.tar.gz | |
qt5module: drop it and include only qt5.inc
* not all modules depend on qtbase, qtbase-native dependency is added
by qmake5.bbclass:
QT5TOOLSDEPENDS ?= "qtbase-native "
DEPENDS_prepend = "${QT5TOOLSDEPENDS}"
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwayland.inc')
| -rw-r--r-- | recipes-qt/qt5/qtwayland.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc index 32fb08e9..0c76b993 100644 --- a/recipes-qt/qt5/qtwayland.inc +++ b/recipes-qt/qt5/qtwayland.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | require qt5module.inc | 1 | require qt5.inc |
| 2 | 2 | ||
| 3 | LICENSE = "BSD & LGPL-2.1 | GPL-3.0" | 3 | LICENSE = "BSD & LGPL-2.1 | GPL-3.0" |
| 4 | LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenode.cpp;endline=40;md5=e38eccd7e9a6a149c9e31b6fb47daac1 \ | 4 | LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenode.cpp;endline=40;md5=e38eccd7e9a6a149c9e31b6fb47daac1 \ |
| @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenod | |||
| 11 | # make it easier to remove by .bbappend (e.g. for building qtwayland with danny which doesn't | 11 | # make it easier to remove by .bbappend (e.g. for building qtwayland with danny which doesn't |
| 12 | # have libxkbcommon in oe-core). | 12 | # have libxkbcommon in oe-core). |
| 13 | XKB_DEPENDS = "libxkbcommon" | 13 | XKB_DEPENDS = "libxkbcommon" |
| 14 | DEPENDS += "qtdeclarative wayland wayland-native ${XKB_DEPENDS}" | 14 | DEPENDS += "qtbase qtdeclarative wayland wayland-native ${XKB_DEPENDS}" |
| 15 | 15 | ||
| 16 | INC_PR = "r1" | 16 | INC_PR = "r1" |
| 17 | 17 | ||