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/qtchooser/qtchooser_git.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/qtchooser/qtchooser_git.bb')
| -rw-r--r-- | recipes-qt/qtchooser/qtchooser_git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qtchooser/qtchooser_git.bb b/recipes-qt/qtchooser/qtchooser_git.bb index f7656450..e745e8ad 100644 --- a/recipes-qt/qtchooser/qtchooser_git.bb +++ b/recipes-qt/qtchooser/qtchooser_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Wrapper to select between Qt development binary versions" HOMEPAGE = "http://macieira.org/qtchooser" LICENSE = "LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | GPL-3.0" -SRC_URI = "git://code.qt.io/qt/qtchooser.git;branch=master \ +SRC_URI = "git://code.qt.io/cgit/qtsdk/qtchooser.git;branch=master \ file://0001-Makefile-install-the-man-dir.patch" LIC_FILES_CHKSUM = " \ @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ " S = "${WORKDIR}/git" -SRCREV = "4717841185d34bbe450e3b24445f2d35e3325a6a" -PV = "39+git${SRCREV}" +SRCREV = "a1b6736e4f2daf86cd1626004d40ef57db85fbb5" +#PV = "39+git${SRCREV}" inherit pkgconfig |