Merge remote-tracking branch 'meta-qt5/master' into 5.7

* meta-qt5/master:
  qtchooser: add new recipe
  qtvirtualkeyboard: add recipe
  qtdeclarative-render2d: add recipe
  qtdatavis3d: add recipe
  qtcharts: add recipe
  licenses: update technology preview license to match upstream
  cmake_qt5: prepend the Qt5 specific CMake variables to EXTRA_OECMAKE
  qtbase: add patch to make Qt5Config modules behave better with cmake builds
  qt5: Allow disabling SHA validation for branch
  qtbase: Reorder EGL libraries from pkgconfig and defaults:

Change-Id: If0804ddb8c506e6f0d1ec32251cca6620dd97abe

12 files changed, 280 insertions, 5 deletions

diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass
index 813ea0c9..4dc897bb 100644
--- a/classes/cmake_qt5.bbclass
+++ b/classes/cmake_qt5.bbclass
@@ -3,7 +3,7 @@ inherit qmake5_paths
 
 DEPENDS_prepend = "qtbase "
 
-EXTRA_OECMAKE += " \
+EXTRA_OECMAKE_prepend = " \
     -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \
     -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \
     -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \
diff --git a/licenses/The-Qt-Company-TPLA-2.4 b/licenses/The-Qt-Company-TPLA-2.4
index 0f96e738..1f59ab24 100644
--- a/licenses/The-Qt-Company-TPLA-2.4
+++ b/licenses/The-Qt-Company-TPLA-2.4
@@ -625,6 +625,3 @@ Licensed Software (including related documentation) is provided to U.S.
 Government End Users: (a) only as a commercial end item; and (b) only
 pursuant to this Agreement.
 
-
-
-
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 0bafab51..e1e25ba7 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -3,10 +3,11 @@
 
 QT_MODULE ?= "${BPN}"
 QT_MODULE_BRANCH ?= "5.7"
+QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
 
 # each module needs to define valid SRCREV
 SRC_URI = " \
-    ${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};branch=${QT_MODULE_BRANCH};protocol=${QT_GIT_PROTOCOL} \
+    ${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL} \
 "
 
 S = "${WORKDIR}/git"
diff --git a/recipes-qt/qt5/qtbase/0011-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0011-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
new file mode 100644
index 00000000..7a24459c
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0011-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
@@ -0,0 +1,67 @@
+From f5a949e17aa8b37491fbc414c38557c9920fa1e5 Mon Sep 17 00:00:00 2001
+From: Pascal Bach <pascal.bach@siemens.com>
+Date: Wed, 11 May 2016 15:20:41 +0200
+Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
+ isn't set
+
+This prevents errors like:
+
+|   The imported target "Qt5::Core" references the file
+|
+|      "/qmake"
+|
+|   but this file does not exist.  Possible reasons include:
+
+Which happen if CMake is used without setting OE_QMAKE_PATH_EXTERNAL_HOST_BINS.
+To achieve this a check for OE_QMAKE_PATH_EXTERNAL_HOST_BINS is added to each Qt5*Config.cmake
+file. And in the case where the variable is not set we just return which is basically
+equal to telling CMake that Qt5 wasn't found.
+
+Upstream-Status: Pending
+  The patch only makes sense in connection with other patches included here.
+  Specifically this are:
+    - 0003-Add-external-hostbindir-option.patch
+    - 0010-Add-external-hostbindir-option-for-native-sdk.patch
+
+Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
+
+---
+ mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 5 +++++
+ src/corelib/Qt5Config.cmake.in                      | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index d2358ca..feb73c0 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
+ endif()
+ !!ENDIF
+ 
++if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS)
++    message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined")
++    return()
++endif()
++
+ !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND)
+ !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
+ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\")
+diff --git a/src/corelib/Qt5Config.cmake.in b/src/corelib/Qt5Config.cmake.in
+index a872d0e..233d663 100644
+--- a/src/corelib/Qt5Config.cmake.in
++++ b/src/corelib/Qt5Config.cmake.in
+@@ -3,6 +3,11 @@ if (CMAKE_VERSION VERSION_LESS 2.8.9)
+     message(FATAL_ERROR \"Qt5 requires at least CMake version 2.8.9\")
+ endif()
+ 
++if(NOT DEFINED OE_QMAKE_PATH_EXTERNAL_HOST_BINS)
++    message(WARNING "Skipping because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is not defined")
++    return()
++endif()
++
+ if (NOT Qt5_FIND_COMPONENTS)
+     set(Qt5_NOT_FOUND_MESSAGE \"The Qt5 package requires at least one component\")
+     set(Qt5_FOUND False)
+-- 
+2.1.4
+
diff --git a/recipes-qt/qt5/qtbase/0011-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch b/recipes-qt/qt5/qtbase/0011-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch
new file mode 100644
index 00000000..3c0b9e61
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0011-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch
@@ -0,0 +1,98 @@
+From d623d2c2ed49c4dc57fb0dde1faab20976dfc3dc Mon Sep 17 00:00:00 2001
+From: Julien Gueytat <contact@jgueytat.fr>
+Date: Wed, 27 Apr 2016 19:24:39 +0200
+Subject: [PATCH] Reorder EGL libraries from pkgconfig and defaults:
+
+https://bugreports.qt.io/browse/QTBUG-50838
+https://bugreports.qt.io/browse/QTBUG-52739
+
+The modification is the less intrusive possible. It only swaps LIBS and QMAKE_LIBS_EGL.
+The reason behind that was that for the RaspberryPi:
+ *  -lEGL -GLESv2 can link
+ *  -lGLESv2 -lEGL can't
+
+Adding -lEGL -lGLESv2 and then -lEGL gives -lGLESv2 -lEGL ... the libraries swaped.
+
+Signed-off-by: Julien Gueytat <contact@jgueytat.fr>
+---
+ config.tests/qpa/egl/egl.pro               |  5 ++++-
+ config.tests/qpa/eglfs-brcm/eglfs-brcm.pro | 12 +++++++-----
+ configure                                  | 16 ++++++++++++++--
+ 3 files changed, 25 insertions(+), 8 deletions(-)
+
+diff --git a/config.tests/qpa/egl/egl.pro b/config.tests/qpa/egl/egl.pro
+index b5396da..828b674 100644
+--- a/config.tests/qpa/egl/egl.pro
++++ b/config.tests/qpa/egl/egl.pro
+@@ -5,6 +5,9 @@ for(p, QMAKE_LIBDIR_EGL) {
+ }
+ 
+ !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
+-!isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
++
++BACKUP_LIBS = $$LIBS
++!isEmpty(QMAKE_LIBS_EGL): LIBS = $$QMAKE_LIBS_EGL
++LIBS += $$BACKUP_LIBS
+ 
+ CONFIG -= qt
+diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
+index d8b1c3e..06f7241 100644
+--- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
++++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
+@@ -1,11 +1,13 @@
+ SOURCES = eglfs-brcm.cpp
+ 
+-CONFIG -= qt
+-
+-INCLUDEPATH += $$QMAKE_INCDIR_EGL
+-
+ for(p, QMAKE_LIBDIR_EGL) {
+     LIBS += -L$$p
+ }
+ 
+-LIBS += -lEGL -lGLESv2 -lbcm_host
++INCLUDEPATH += $$QMAKE_INCDIR_EGL
++
++BACKUP_LIBS = $$LIBS
++LIBS = -lEGL -lGLESv2 -lbcm_host
++LIBS += $$BACKUP_LIBS
++
++CONFIG -= qt
+diff --git a/configure b/configure
+index 2e99d39..072838b 100755
+--- a/configure
++++ b/configure
+@@ -5803,7 +5803,9 @@ if [ "$CFG_EGL" != "no" ]; then
+         QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL"
+         QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL"
+         QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`"
+-    fi       # detect EGL support
++    fi
++    
++    # detect EGL support
+     if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
+         CFG_EGL=yes
+         if compileTest qpa/egl-x11 "EGL-X11" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
+@@ -5826,8 +5828,18 @@ fi
+ if [ "$CFG_EGLFS" != "no" ]; then
+     if [ "$XPLATFORM_QNX" = "no" ] && [ "$CFG_OPENGL" != "no" ]; then
+         CFG_EGLFS="$CFG_EGL"
++
++        if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then
++            QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'`
++            QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null`
++            QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null`
++            QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL"
++            QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL"
++            QMakeVar set QMAKE_CFLAGS_EGL "`echo " $QMAKE_CFLAGS_EGL " | sed -e 's, -I[^ ]* , ,g;s,^ ,,;s, $,,'`"
++        fi
++
+         # Detect eglfs backends.
+-        if compileTest qpa/eglfs-brcm "eglfs-brcm"; then
++        if compileTest qpa/eglfs-brcm "eglfs-brcm" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
+             CFG_EGLFS_BRCM=yes
+         else
+             CFG_EGLFS_BRCM=no
+-- 
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 1f98eec0..d00a3a30 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -19,6 +19,8 @@ SRC_URI += "\
     file://0006-QOpenGLPaintDevice-sub-area-support.patch \
     file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
     file://0008-configure-paths-for-target-qmake-properly.patch \
+    file://0011-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \
+    file://0011-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
 "
 
 DEPENDS += "qtbase-native"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
new file mode 100644
index 00000000..5aaddc96
--- /dev/null
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -0,0 +1,11 @@
+require qt5.inc
+require qt5-git.inc
+
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+"
+
+DEPENDS += "qtbase qtdeclarative"
+
+SRCREV = "8a781841812a42ed728a76c0dcdcaa6196eac44e"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
new file mode 100644
index 00000000..ccdd1b3e
--- /dev/null
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -0,0 +1,11 @@
+require qt5.inc
+require qt5-git.inc
+
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+"
+
+DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
+
+SRCREV = "2f6074fde0ec050c77f881e0d2ce265fa93a0fcc"
diff --git a/recipes-qt/qt5/qtdeclarative-render2d_git.bb b/recipes-qt/qt5/qtdeclarative-render2d_git.bb
new file mode 100644
index 00000000..cb2ee8bb
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative-render2d_git.bb
@@ -0,0 +1,12 @@
+require qt5.inc
+require qt5-git.inc
+
+LICENSE = "GPL-3.0 | The-Qt-Company-TPLA-2.4"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.PREVIEW.COMMERCIAL;md5=c458c2ae1b463cca5219eaee54f6287e \
+"
+
+DEPENDS += "qtbase qtdeclarative"
+
+SRCREV = "13a6c51f26128015c0a3c335bdae676b46df6ed6"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
new file mode 100644
index 00000000..a8fcb9c3
--- /dev/null
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -0,0 +1,11 @@
+require qt5.inc
+require qt5-git.inc
+
+LICENSE = "GPL-3.0"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+"
+
+DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
+
+SRCREV = "42344a4b21b95bce913d60267d554ac17e120af1"
diff --git a/recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch b/recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch
new file mode 100644
index 00000000..8e8e1c69
--- /dev/null
+++ b/recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch
@@ -0,0 +1,35 @@
+From 3f142e100cc3dd69b816ce79152760c823cb86e9 Mon Sep 17 00:00:00 2001
+From: Li Xin <lixin.fnst@cn.fujitsu.com>
+Date: Fri, 29 Apr 2016 12:41:34 +0900
+Subject: [PATCH] Makefile: install the man dir
+
+upstream-status: backported
+
+Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
+---
+ Makefile | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 20b9100..1fd8cd3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,6 @@
+ prefix = /usr
+ bindir = $(prefix)/bin
++MKDIR  = mkdir -p
+ TOOLS = assistant \
+        designer \
+        lconvert \
+@@ -56,6 +57,8 @@ install:
+        case `uname -s` in Darwin) \
+            for tool in $(MACTOOLS); do ln -sf qtchooser "$(INSTALL_ROOT)$(bindir)/$$tool"; done \
+        ;; esac
++       $(MKDIR) $(INSTALL_ROOT)$(prefix)/share/man/man1
++       install -m 644 -p doc/qtchooser.1 $(INSTALL_ROOT)$(prefix)/share/man/man1
+ 
+ uninstall:
+        cd src/qtchooser && $(MAKE) uninstall
+-- 
+1.8.4.2
+
diff --git a/recipes-qt/qtchooser/qtchooser_git.bb b/recipes-qt/qtchooser/qtchooser_git.bb
new file mode 100644
index 00000000..68b1c808
--- /dev/null
+++ b/recipes-qt/qtchooser/qtchooser_git.bb
@@ -0,0 +1,30 @@
+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 \
+           file://0001-Makefile-install-the-man-dir.patch"
+
+LIC_FILES_CHKSUM = " \
+    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+    file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+"
+S = "${WORKDIR}/git"
+SRCREV = "4717841185d34bbe450e3b24445f2d35e3325a6a"
+PV = "39+git${SRCREV}"
+
+inherit pkgconfig
+
+do_compile() {
+    oe_runmake
+}
+
+do_install() {
+    oe_runmake install INSTALL_ROOT=${D}
+    #install configure file
+    install -d ${D}${sysconfdir}/xdg/qtchooser/
+    install -m 0644 ${S}/tests/auto/qtchooser/testdata/config2/qtchooser/*.conf \
+               ${D}${sysconfdir}/xdg/qtchooser/
+    install -m 0644 ${S}/tests/auto/qtchooser/testdata/default/qtchooser/default.conf \
+               ${D}${sysconfdir}/xdg/qtchooser/
+}