diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-11-02 11:13:33 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-11-02 11:15:16 +0200 |
| commit | ec328d9677f39c223a697bbe1cbf8952631e9817 (patch) | |
| tree | 02053800a6baa93715ddffaae4fcfa0b03a3d23e /recipes-qt/examples/qt5everywheredemo_1.0.bb | |
| parent | e0db5666f9c04c92683514ca220b0aafd0a49df2 (diff) | |
| parent | d87335a50a9dd35d890786edbd79b8953fdaa11a (diff) | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9
* qtyocto/upstream/master:
qt5-ptest.inc: fix qtxmlpatterns:do_install_ptest out-of-order call
meta-qt5: Update to 5.9.2 release
qt5: add missing commercial license
qtxmlpatterns: Add HOMEPAGE info into recipe file.
qttools: Add HOMEPAGE info into recipe file.
qtsvg: Add HOMEPAGE info into recipe file.
qtscript: Add HOMEPAGE info into recipe file.
qtquick1: Add HOMEPAGE info into recipe file.
qtdeclarative: Add HOMEPAGE info into recipe file.
meta: drop a useless file
qtbase-native: Force use of built-in pcre
qtbase-native: set path to mkspec for cmake properly again
qtbase: Fix build with musl/clang
qtbase: Add OE clang specific mkspecs
Conflicts:
recipes-qt/qt5/qtcharts_git.bb
recipes-qt/qt5/qtwebengine_git.bb
Change-Id: I78ce0587cf7468bfdc22156ee8bbd24872f79c6a
Diffstat (limited to 'recipes-qt/examples/qt5everywheredemo_1.0.bb')
| -rw-r--r-- | recipes-qt/examples/qt5everywheredemo_1.0.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb b/recipes-qt/examples/qt5everywheredemo_1.0.bb index 7735d902..ee947991 100644 --- a/recipes-qt/examples/qt5everywheredemo_1.0.bb +++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb @@ -1,12 +1,12 @@ SUMMARY = "Qt5 everywhere demo" DESCRIPTION = "Quick tour of Qt 5.0, primarily focusing on its graphical capabilities." +LICENSE = "BSD" HOMEPAGE = "https://qt.gitorious.org/qt-labs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://main.cpp;md5=1187cb795a0f96bce64e63dd1a67dc2b" +LIC_FILES_CHKSUM = "file://qml/QtDemo/main.qml;endline=39;md5=7d80863906a4bc8ffca77fd869e335a9" -DEPENDS = "qtdeclarative qtgraphicaleffects" +DEPENDS = "qtdeclarative qtgraphicaleffects qtsvg qtmultimedia" -SRCREV = "c17fe9e0ec0882ac4c4dc1168095f569acab5d09" +SRCREV = "35d72a2eba7456a2efc5eb8b77afbc00f69ba0ac" SRC_URI = "${QT_LABS_GIT}/qt-labs-qt5-everywhere-demo" S = "${WORKDIR}/git/QtDemo" |