diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-03-21 13:03:58 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-03-21 13:06:39 +0200 |
| commit | 160bd85916f723ecdde8b0514c8a67fdeb4dfe73 (patch) | |
| tree | e6e92edead0d78aeaf5b879e5c26a90a99b98861 /recipes-qt/automotive/gammaray_git.bb | |
| parent | d481b98fe28e5bbb7d5e5a73f89abed1fedf4efb (diff) | |
| parent | 00b5087da9fa37ab49a29021bf4b1e405634a751 (diff) | |
| download | meta-boot2qt-160bd85916f723ecdde8b0514c8a67fdeb4dfe73.tar.gz | |
Merge remote-tracking branch 'origin/krogoth' into dev
* origin/krogoth:
AM: update revision
Add appman versions of Kit and Qt to creator
fonts: add recipe for GNU FreeFonts
Add multiscreen automotive demo
neptune: update to include fix for i18ndemo
fonts: update URL for lohit font
Update GammaRay to the same version as used by the QtAS 1.1 host tools
emulator: correctly append qtsimulator configuration
Update automotive components
setup-environment: don't exit the shell on error
neptune-ui: add runtime dependencies
update meta-qt5 (merged upstream/master) SHA1 to manifest.xml
AM: Add appman tools to automotive nativesdk
configure-qtcreator: suppress unnecessary error
Update GammaRay to the latest 2.7 branch
Conflicts:
recipes-qt/automotive/neptune-ui_git.bb
recipes-qt/automotive/qtapplicationmanager_git.bb
recipes-qt/qt5/qtlocation_git.bbappend
scripts/manifest.xml
Change-Id: I96601e7d7a1827a6631fe59d18101d2ad3b70871
Diffstat (limited to 'recipes-qt/automotive/gammaray_git.bb')
| -rw-r--r-- | recipes-qt/automotive/gammaray_git.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb index 6304096..6317040 100644 --- a/recipes-qt/automotive/gammaray_git.bb +++ b/recipes-qt/automotive/gammaray_git.bb | |||
| @@ -2,15 +2,15 @@ SUMMARY = "GammaRay Qt introspection probe" | |||
| 2 | HOMEPAGE = "http://www.kdab.com/gammaray" | 2 | HOMEPAGE = "http://www.kdab.com/gammaray" |
| 3 | 3 | ||
| 4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE.GPL.txt;md5=5996517d53e3c2722d457fb633e970ed" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.GPL.txt;md5=560b8b2e529f7a17ee5dde6e5d0c0d69" |
| 6 | 6 | ||
| 7 | inherit cmake_qt5 | 7 | inherit cmake_qt5 |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}" | 9 | SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}" |
| 10 | 10 | ||
| 11 | BRANCH = "master" | 11 | BRANCH = "2.7" |
| 12 | SRCREV = "b961eb1b84718256acc678ec16a2b45e98990cd7" | 12 | SRCREV = "a22da6d63cab08f3ef8588611fdbda3f96731efe" |
| 13 | PV = "master+git${SRCPV}" | 13 | PV = "${BRANCH}+git${SRCPV}" |
| 14 | 14 | ||
| 15 | DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml \ | 15 | DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml \ |
| 16 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" | 16 | ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" |