* [meta-qt5][PATCH 1/5] recipes-git: Upgrade from latest origin/release to latest origin/stable
@ 2014-06-04 9:56 Martin Jansa
2014-06-04 9:56 ` [meta-qt5][PATCH 2/5] qt5: upgrade from 5.2.1 to 5.3.0 Martin Jansa
` (4 more replies)
0 siblings, 5 replies; 16+ messages in thread
From: Martin Jansa @ 2014-06-04 9:56 UTC (permalink / raw)
To: openembedded-devel
* there wont be 5.2.2 release, so start preparation for 5.3.0
* probably latest 5.3.0-beta1 snapshot was released yesterday, so this
should be reasonably close
* probably wont be merged before creating new release branch for Yocto 1.6
* qtbase: Fix build with X.h included from egl.h
* nativesdk-qt*: Add git recipes
5.2.1 isn't compatible with qtbase-native from git
* qtbase: upgrade to latest stable revision
* 0006-configure-make-pulseaudio-alsa-freetype-a-configurab.patch
was upstreamed in:
0c3301f configure: make pulseaudio and alsa configurable options
* 0005-qt_module-Fix-pkgconfig-replacement.patch
is hopefully resolved in:
eaefbe3 snuff -L/-I with system paths when installing meta files
a33afed de-duplicate setup of libdir replacement in prl files
aa20e7f reshuffle code for clarity
ee86ce8 don't attempt to replace include paths in meta files
but this needs to be double checked
* recipes-git: Upgrade to latest origin/stable
* qt5-git.inc: update LICENSE.LGPL checksum
* only year was updated:
- The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
* qtbase: add 2 patches to fix build issues
* LIC_FILES_CHKSUM: update other git recipes
* qtlocation: bump SRCREV and add to qt5-versions
* qt5-versions.inc: Add line for qttools and fix it for nativesdk-qttools
* qtquick1: fix LIC_FILES_CHKSUM
* qttools: update LIC_FILES_CHKSUM and patches
* new qtdiag needs to be disabled as well because it depends on gui which isn't enabled
in qtbase-native, disable qtpaths as well
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
conf/distro/include/qt5-versions.inc | 4 +
recipes-qt/qt5/nativesdk-qtbase_git.bb | 32 ++
recipes-qt/qt5/nativesdk-qttools_git.bb | 13 +
recipes-qt/qt5/qt3d_git.bb | 9 +-
recipes-qt/qt5/qt5-git.inc | 4 +-
.../qtbase-git/0001-Add-linux-oe-g-platform.patch | 344 +++++++++++++++++++++
.../qtbase-git/0001-Fix-missing-plugin_types.patch | 30 ++
...lfs-Print-the-chosen-config-in-debug-mode.patch | 56 ++++
.../0002-Add-external-hostbindir-option.patch | 303 ++++++++++++++++++
...o-allow-to-set-qt.conf-from-the-outside-u.patch | 39 +++
...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 30 ++
...-build-it-in-configure-but-allow-to-build.patch | 50 +++
...gl-error-for-platforms-only-supporting-on.patch | 72 +++++
...mintegration-Undefine-CursorShape-from-X..patch | 30 ++
.../qt5/qtbase-git/0008-Always-build-uic.patch | 31 ++
...reserve-built-qmake-and-swap-with-native-.patch | 30 ++
...ump-path-length-from-256-to-512-character.patch | 29 ++
recipes-qt/qt5/qtbase-native_git.bb | 23 +-
recipes-qt/qt5/qtbase_git.bb | 25 +-
recipes-qt/qt5/qtconnectivity_git.bb | 4 +-
recipes-qt/qt5/qtdeclarative_git.bb | 10 +-
recipes-qt/qt5/qtgraphicaleffects_git.bb | 10 +-
recipes-qt/qt5/qtimageformats_git.bb | 10 +-
recipes-qt/qt5/qtlocation_git.bb | 10 +-
recipes-qt/qt5/qtmultimedia_git.bb | 10 +-
recipes-qt/qt5/qtquick1_git.bb | 10 +-
recipes-qt/qt5/qtquickcontrols_git.bb | 10 +-
recipes-qt/qt5/qtscript_git.bb | 10 +-
recipes-qt/qt5/qtsensors_git.bb | 10 +-
recipes-qt/qt5/qtserialport_git.bb | 4 +-
recipes-qt/qt5/qtsvg_git.bb | 10 +-
...w-to-build-only-lrelease-lupdate-lconvert.patch | 155 ++++++++++
...t-help-fix-linking-of-dependent-libraries.patch | 32 ++
recipes-qt/qt5/qttools-native_git.bb | 10 +-
recipes-qt/qt5/qttools_git.bb | 10 +-
recipes-qt/qt5/qtwayland-native_git.bb | 6 +
recipes-qt/qt5/qtwayland_git.bb | 6 +
recipes-qt/qt5/qtwebkit-examples_git.bb | 4 +-
recipes-qt/qt5/qtwebkit_git.bb | 4 +-
| 4 +-
recipes-qt/qt5/qtxmlpatterns_git.bb | 10 +-
41 files changed, 1433 insertions(+), 70 deletions(-)
create mode 100644 recipes-qt/qt5/nativesdk-qtbase_git.bb
create mode 100644 recipes-qt/qt5/nativesdk-qttools_git.bb
create mode 100644 recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
create mode 100644 recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch
create mode 100644 recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
create mode 100644 recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc
index b684a6b..a2cc1fc 100644
--- a/conf/distro/include/qt5-versions.inc
+++ b/conf/distro/include/qt5-versions.inc
@@ -5,11 +5,13 @@ QT5_VERSION ?= "5.2.1"
PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}"
PREFERRED_VERSION_qtbase = "${QT5_VERSION}"
+PREFERRED_VERSION_nativesdk-qtbase = "${QT5_VERSION}"
PREFERRED_VERSION_qtdeclarative = "${QT5_VERSION}"
PREFERRED_VERSION_qtjsbackend = "${QT5_VERSION}"
PREFERRED_VERSION_qtjsbackend-native = "${QT5_VERSION}"
PREFERRED_VERSION_qtgraphicaleffects = "${QT5_VERSION}"
PREFERRED_VERSION_qtimageformats = "${QT5_VERSION}"
+PREFERRED_VERSION_qtlocation = "${QT5_VERSION}"
PREFERRED_VERSION_qtmultimedia = "${QT5_VERSION}"
PREFERRED_VERSION_qtquick1 = "${QT5_VERSION}"
PREFERRED_VERSION_qtquickcontrols = "${QT5_VERSION}"
@@ -17,7 +19,9 @@ PREFERRED_VERSION_qtsensors = "${QT5_VERSION}"
PREFERRED_VERSION_qtserialport = "${QT5_VERSION}"
PREFERRED_VERSION_qtscript = "${QT5_VERSION}"
PREFERRED_VERSION_qtsvg = "${QT5_VERSION}"
+PREFERRED_VERSION_qttools = "${QT5_VERSION}"
PREFERRED_VERSION_qttools-native = "${QT5_VERSION}"
+PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}"
PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}"
PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}"
PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
new file mode 100644
index 0000000..cac16a0
--- /dev/null
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -0,0 +1,32 @@
+require qt5-git.inc
+require ${PN}.inc
+
+# prepend this again, because ${PN}.inc prepneds ${PN}
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
+
+SRC_URI = "\
+ git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+"
+
+# common with -native
+SRC_URI += "\
+ file://0001-Add-linux-oe-g-platform.patch \
+ file://0002-Add-external-hostbindir-option.patch \
+ file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+ file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
+ file://0001-Fix-missing-plugin_types.patch \
+ file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+"
+
+# common with native version
+SRC_URI += " \
+ file://0008-Always-build-uic.patch \
+"
+
+# specific for nativesdk version
+SRC_URI += " \
+ file://0009-configure-preserve-built-qmake-and-swap-with-native-.patch \
+ file://0010-configure-bump-path-length-from-256-to-512-character.patch \
+"
+
+SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb b/recipes-qt/qt5/nativesdk-qttools_git.bb
new file mode 100644
index 0000000..cbf1672
--- /dev/null
+++ b/recipes-qt/qt5/nativesdk-qttools_git.bb
@@ -0,0 +1,13 @@
+require qt5-git.inc
+require ${PN}.inc
+
+# prepend this again, because ${PN}.inc prepneds ${PN}
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
+
+SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index aaa9c04..0438dd9 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -4,11 +4,4 @@ require ${PN}.inc
QT_MODULE_BRANCH = "master"
# last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already
-SRCREV = "d3338a9f7fcac109d7bc7f600d5974ff333782ad"
-
-do_configure_prepend() {
- # Temporary hack to get qt3d build for Qt 5.1.0
- if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then
- echo "MODULE_VERSION = 5.3.0" >> ${S}/.qmake.conf
- fi
-}
+SRCREV = "36a829ad6fb44fd01f490c35e011f6fd2470ffdd"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index fa0c06e..25b7a62 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -10,14 +10,14 @@ SRC_URI += " \
S = "${WORKDIR}/git"
-PV = "5.2.1+git${SRCPV}"
+PV = "5.2.1+5.3.0-beta1+git${SRCPV}"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
DEFAULT_PREFERENCE = "-1"
LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=2abca611d56c23eb99943bde21c80a0d \
file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
new file mode 100644
index 0000000..828f5ea
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
@@ -0,0 +1,344 @@
+From 237a4b0143d91c0573ecf6f9ff5e37827a14a75d Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 15 Apr 2013 04:29:32 +0200
+Subject: [PATCH 01/10] Add linux-oe-g++ platform
+
+* This qmake.conf unlike other platforms reads most variables from
+ shell environment, because it's easier for qt recipes to export
+ *FLAGS or CC specific for given recipe
+
+* configure: add getQEvalMakeConf and getXQEvalMakeConf
+ Allow expansion of $(...) references from qmake.conf to generate
+ qmake environment from shell environment as exported by qmake5_base
+
+* configure: don't export SYSTEM_VARIABLES to .qmake.vars
+ linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
+ causing issues as we need g++ to be used as linker
+
+* configure.prf: Allow to add extra arguments to make
+ sometimes we would like to add -e or define some variable and respect it from both
+ Makefiles used in configure tests and also Makefiles to build the application
+
+* OE_QMAKE_CXX in order to allow compiler version check to succeed
+ which allows WebKit to be enabled.
+
+* Other variables in order to let config.tests to use our -platform
+ settings
+
+* Add setBootstrapEvalVariable to bootstrap qmake with our environment
+ too, this allows us to use -platform linux-oe-g++ also for native
+ recipe
+
+* disable gdb_dwarf_index
+ * qmake is trying to call native gdb and we don't depend on gdb-native
+ (or even provide gdb-native)
+ * fixes errors like this:
+ /bin/sh: gdb: command not found
+ /bin/sh: line 0: test: -gt: unary operator expected
+ which are not fatal, but still misleading in do_configure output
+
+Upstream-Status: Inappropriate [embedded specific]
+ too OE specific, probably cannot be upstreamed
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 60 +++++++++++++++------
+ mkspecs/features/configure.prf | 4 +-
+ mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++
+ mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
+ 4 files changed, 185 insertions(+), 19 deletions(-)
+ create mode 100644 mkspecs/linux-oe-g++/qmake.conf
+ create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
+
+diff --git a/configure b/configure
+index 55d68ef..bb24a9c 100755
+--- a/configure
++++ b/configure
+@@ -324,6 +324,16 @@ getQMakeConf()
+ getSingleQMakeVariable "$1" "$specvals"
+ }
+
++# OE qmake.conf is reading some variables from shell env
++# read them from qmake.conf, replace qmake () syntax with shell and eval
++getQEvalMakeConf()
++{
++ VAL=`getQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
++ EVAL=`eval "echo ${VAL}"`
++# echo "Running getQEvalMakeConf: var='$1', val='`getQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
++ eval "echo ${VAL}"
++}
++
+ getXQMakeConf()
+ {
+ if [ -z "$xspecvals" ]; then
+@@ -333,6 +343,16 @@ getXQMakeConf()
+ getSingleQMakeVariable "$1" "$xspecvals"
+ }
+
++# OE qmake.conf is reading some variables from shell env
++# read them from qmake.conf, replace qmake () syntax with shell and eval
++getXQEvalMakeConf()
++{
++ VAL=`getXQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
++ EVAL=`eval "echo ${VAL}"`
++# echo "Running getXQEvalMakeConf: var='$1', val='`getXQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
++ eval "echo ${VAL}"
++}
++
+ compilerSupportsFlag()
+ {
+ cat >conftest.cpp <<EOF
+@@ -548,21 +568,19 @@ fi
+ # initalize variables
+ #-------------------------------------------------------------------------------
+
+-SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
+-for varname in $SYSTEM_VARIABLES; do
++# Export all OE variables for qmake.conf from shell env to QMakeVars
++OE_VARIABLES="AR CC CFLAGS COMPILER CXX CXXFLAGS LDFLAGS LINK QT_CONFIG STRIP"
++for varname in $OE_VARIABLES; do
+ qmakevarname="${varname}"
+- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
+- if [ "${varname}" = "LDFLAGS" ]; then
+- qmakevarname="LFLAGS"
+- elif [ "${varname}" = "LD" ]; then
+- qmakevarname="LINK"
+- fi
+ cmd=`echo \
+-'if [ -n "\$'${varname}'" ]; then
+- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'"
++'if [ -n "\$OE_QMAKE_'${varname}'" ]; then
++ QMakeVar set OE_QMAKE_'${qmakevarname}' "\$OE_QMAKE_'${varname}'"
++# echo "Exporting OE_QMAKE_'${qmakevarname}' value=\"\$OE_QMAKE_'${varname}'\"" >&2
+ fi'`
+ eval "$cmd"
+ done
++
++SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
+ # Use CC/CXX to run config.tests
+ mkdir -p "$outpath/config.tests"
+ rm -f "$outpath/config.tests/.qmake.cache"
+@@ -3139,7 +3157,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
+ [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
+ fi
+
+-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
++QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX`
+
+ TEST_COMPILER=$QMAKE_CONF_COMPILER
+
+@@ -3174,7 +3192,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
+ exit 1
+ fi
+ fi
+-TEST_COMPILER_CXXFLAGS=`getXQMakeConf QMAKE_CXXFLAGS`
++TEST_COMPILER_CXXFLAGS=`getXQEvalMakeConf QMAKE_CXXFLAGS`
+
+ GCC_MACHINE_DUMP=
+ case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
+@@ -3632,6 +3650,14 @@ setBootstrapVariable()
+ getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
+ }
+
++# OE qmake.conf is reading some variables from shell env
++# read them from qmake.conf, replace qmake () syntax with shell and eval
++setBootstrapEvalVariable()
++{
++ getQEvalMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
++}
++
++
+ # build qmake
+ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+ echo "Creating qmake..."
+@@ -3670,11 +3696,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+ fi
+
+ [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
+- setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"
+- setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"
+- setBootstrapVariable QMAKE_CFLAGS
+- setBootstrapVariable QMAKE_CXXFLAGS
+- setBootstrapVariable QMAKE_LFLAGS
++ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM"
++ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM"
++ setBootstrapEvalVariable QMAKE_CFLAGS
++ setBootstrapEvalVariable QMAKE_CXXFLAGS
++ setBootstrapEvalVariable QMAKE_LFLAGS
+
+ if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
+ setBootstrapVariable QMAKE_CFLAGS_RELEASE
+diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
+index fe41c54..e2db923 100644
+--- a/mkspecs/features/configure.prf
++++ b/mkspecs/features/configure.prf
+@@ -60,12 +60,12 @@ defineTest(qtCompileTest) {
+ }
+
+ # Clean up after previous run
+- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean")
++ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean")
+
+ mkpath($$test_out_dir)|error("Aborting.")
+
+ qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") {
+- qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") {
++ qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") {
+ log("yes$$escape_expand(\\n)")
+ msg = "test $$1 succeeded"
+ write_file($$QMAKE_CONFIG_LOG, msg, append)
+diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
+new file mode 100644
+index 0000000..ca26b10
+--- /dev/null
++++ b/mkspecs/linux-oe-g++/qmake.conf
+@@ -0,0 +1,40 @@
++#
++# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
++#
++
++MAKEFILE_GENERATOR = UNIX
++CONFIG += incremental
++QMAKE_INCREMENTAL_STYLE = sublib
++
++include(../common/linux.conf)
++
++# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip
++QMAKE_AR = $(OE_QMAKE_AR) cqs
++QMAKE_STRIP = $(OE_QMAKE_STRIP)
++QMAKE_WAYLAND_SCANNER = $(OE_QMAKE_WAYLAND_SCANNER)
++
++include(../common/gcc-base-unix.conf)
++
++# *FLAGS from gcc-base.conf
++QMAKE_CFLAGS += $(OE_QMAKE_CFLAGS)
++QMAKE_CXXFLAGS += $(OE_QMAKE_CXXFLAGS)
++QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
++
++include(../common/g++-unix.conf)
++
++# tc settings from g++-base.conf
++QMAKE_COMPILER = $(OE_QMAKE_COMPILER)
++QMAKE_CC = $(OE_QMAKE_CC)
++QMAKE_CXX = $(OE_QMAKE_CXX)
++
++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
++
++QMAKE_LINK = $(OE_QMAKE_LINK)
++QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
++QMAKE_LINK_C = $(OE_QMAKE_LINK)
++QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
++
++# for the SDK
++isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
++
++load(qt_config)
+diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
+new file mode 100644
+index 0000000..dd12003
+--- /dev/null
++++ b/mkspecs/linux-oe-g++/qplatformdefs.h
+@@ -0,0 +1,100 @@
++/****************************************************************************
++**
++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the qmake spec of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia. For licensing terms and
++** conditions see http://qt.digia.com/licensing. For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file. Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights. These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file. Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#ifndef QPLATFORMDEFS_H
++#define QPLATFORMDEFS_H
++
++// Get Qt defines/settings
++
++#include "qglobal.h"
++
++// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
++
++// 1) need to reset default environment if _BSD_SOURCE is defined
++// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
++// 3) it seems older glibc need this to include the X/Open stuff
++#ifndef _GNU_SOURCE
++# define _GNU_SOURCE
++#endif
++
++#include <unistd.h>
++
++
++// We are hot - unistd.h should have turned on the specific APIs we requested
++
++#include <features.h>
++#include <pthread.h>
++#include <dirent.h>
++#include <fcntl.h>
++#include <grp.h>
++#include <pwd.h>
++#include <signal.h>
++
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <sys/ipc.h>
++#include <sys/time.h>
++#include <sys/shm.h>
++#include <sys/socket.h>
++#include <sys/stat.h>
++#include <sys/wait.h>
++#include <netinet/in.h>
++#ifndef QT_NO_IPV6IFNAME
++#include <net/if.h>
++#endif
++
++#define QT_USE_XOPEN_LFS_EXTENSIONS
++#include "../common/posix/qplatformdefs.h"
++
++#undef QT_SOCKLEN_T
++
++#if defined(__GLIBC__) && (__GLIBC__ >= 2)
++#define QT_SOCKLEN_T socklen_t
++#else
++#define QT_SOCKLEN_T int
++#endif
++
++#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
++#define QT_SNPRINTF ::snprintf
++#define QT_VSNPRINTF ::vsnprintf
++#endif
++
++#endif // QPLATFORMDEFS_H
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch b/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch
new file mode 100644
index 0000000..612cbdd
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch
@@ -0,0 +1,30 @@
+From f0e01b788e86f24352ba14ad17c3f337f934467d Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 21 Apr 2014 15:09:23 +0200
+Subject: [PATCH] Fix missing plugin_types
+
+* bearer/generic was failing with:
+ Project ERROR: No module claims plugin type 'bearer'
+
+Change-Id: I90848856a8b0a4df52e599983cf7dde0bc0e6623
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ mkspecs/features/qt_module_pris.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
+index f31bc38..415e780 100644
+--- a/mkspecs/features/qt_module_pris.prf
++++ b/mkspecs/features/qt_module_pris.prf
+@@ -177,7 +177,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
+ include($$mod_work_pfx/qt_lib_$${pri}.pri)
+ for(mod, mods_to_load) {
+ for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \
+- name depends module_config CONFIG DEFINES sources \
++ name depends module_config plugin_types CONFIG DEFINES sources \
+ includes bins libs libexecs plugins imports qml \
+ rpath_link \
+ )):defined(QT.$${mod}.$$var, var):cache(QT.$${mod}.$$var, transient)
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
new file mode 100644
index 0000000..65ebbd1
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
@@ -0,0 +1,56 @@
+From 91b185d1f4843d22d42461c0aee4cd0f5393bbc8 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 21 Apr 2014 19:22:04 +0200
+Subject: [PATCH] Revert "eglfs: Print the chosen config in debug mode"
+
+This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e.
+---
+ src/platformsupport/eglconvenience/qeglconvenience.cpp | 4 +++-
+ src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 -------
+ 2 files changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
+index e6624fb..3870f6c 100644
+--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
++++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
+@@ -437,9 +437,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
+ for (index = 0; attrs[index].attr != -1; ++index) {
+ EGLint value;
+ if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) {
+- qDebug("\t%s: %d", attrs[index].name, (int)value);
++ qWarning("\t%s: %d\n", attrs[index].name, (int)value);
+ }
+ }
++
++ qWarning("\n");
+ }
+
+ #ifdef Q_OS_LINUX
+diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+index eec6463..4a7c69b 100644
+--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
++++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+@@ -44,7 +44,6 @@
+ #include "qeglpbuffer_p.h"
+ #include <qpa/qplatformwindow.h>
+ #include <QOpenGLContext>
+-#include <QDebug>
+
+ QT_BEGIN_NAMESPACE
+
+@@ -192,12 +191,6 @@ void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLCont
+ return;
+ }
+
+- static const bool printConfig = qgetenv("QT_QPA_EGLFS_DEBUG").toInt();
+- if (printConfig) {
+- qDebug() << "Created context for format" << format << "with config:";
+- q_printEglConfig(m_eglDisplay, m_eglConfig);
+- }
+-
+ #ifndef QT_NO_OPENGL
+ // Make the context current to ensure the GL version query works. This needs a surface too.
+ const EGLint pbufferAttributes[] = {
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
new file mode 100644
index 0000000..5f9fd90
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
@@ -0,0 +1,303 @@
+From 00ad866f82f89ce938e9eaabfc50af3cde72ccfe Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sat, 6 Apr 2013 13:15:07 +0200
+Subject: [PATCH 02/10] Add -external-hostbindir option
+
+* when cross-compiling it's sometimes useful to use existing tools from machine
+ (or in OpenEmbedded built with separate native recipe) when building for target
+
+* this way we can skip bootstraping tools we already have
+
+* qt_functions: temporary remove isEmpty check
+* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
+* isEmpty works correctly only with qmake variables (e.g. $$FOO -
+ isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
+
+* cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries
+
+Upstream-Status: Pending
+ is a lot better for upstreaming (and it was already sort of approved by
+ Oswald) but in 5.2.0 I've noticed that he added something similar for
+ android builds
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+Signed-off-by: Simon Busch <morphis@gravedo.de>
+---
+ configure | 15 +++++++++++++++
+ mkspecs/features/qt_functions.prf | 9 ++++++++-
+ mkspecs/features/qt_tool.prf | 3 +--
+ qmake/property.cpp | 1 +
+ qtbase.pro | 12 +++++++++---
+ src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
+ src/corelib/global/qlibraryinfo.cpp | 3 ++-
+ src/corelib/global/qlibraryinfo.h | 1 +
+ src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
+ src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
+ tools/configure/configureapp.cpp | 8 ++++++++
+ 11 files changed, 51 insertions(+), 13 deletions(-)
+
+diff --git a/configure b/configure
+index bb24a9c..bf7c11e 100755
+--- a/configure
++++ b/configure
+@@ -777,6 +777,7 @@ QT_HOST_BINS=
+ QT_HOST_LIBS=
+ QT_HOST_DATA=
+ QT_EXT_PREFIX=
++QT_EXTERNAL_HOST_BINS=
+
+ #flags for SQL drivers
+ QT_CFLAGS_PSQL=
+@@ -898,6 +899,7 @@ while [ "$#" -gt 0 ]; do
+ -testsdir| \
+ -hostdatadir| \
+ -hostbindir| \
++ -external-hostbindir| \
+ -hostlibdir| \
+ -extprefix| \
+ -sysroot| \
+@@ -1112,6 +1114,9 @@ while [ "$#" -gt 0 ]; do
+ extprefix)
+ QT_EXT_PREFIX="$VAL"
+ ;;
++ external-hostbindir)
++ QT_EXTERNAL_HOST_BINS="$VAL"
++ ;;
+ pkg-config)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_PKGCONFIG="$VAL"
+@@ -2250,6 +2255,10 @@ Installation options:
+ -hostdatadir <dir> . Data used by qmake will be installed to <dir>
+ (default HOSTPREFIX)
+
++ -external-hostbindir <dir> Use external host executables instead of building them
++ (not used by defaut)
++
++
+ Configure options:
+
+ The defaults (*) are usually acceptable. A plus (+) denotes a default value
+@@ -2914,6 +2923,11 @@ fi
+ # command line and environment validation
+ #-------------------------------------------------------------------------------
+
++# default is empty, don't call makeabs if it is empty
++if [ ! -z "$QT_EXTERNAL_HOST_BINS" ]; then
++ QT_EXTERNAL_HOST_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_EXTERNAL_HOST_BINS"`
++fi
++
+ # update QT_CONFIG to show our current predefined configuration
+ CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
+ case "$CFG_QCONFIG" in
+@@ -3594,6 +3608,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
+ "qt_hbinpath=$QT_HOST_BINS",
+ "qt_hlibpath=$QT_HOST_LIBS",
+ "qt_hdatpath=$QT_HOST_DATA",
++ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS",
+ "qt_targspec=$shortxspec",
+ "qt_hostspec=$shortspec",
+ #endif
+diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
+index 1dacfed..7229845 100644
+--- a/mkspecs/features/qt_functions.prf
++++ b/mkspecs/features/qt_functions.prf
+@@ -193,7 +193,14 @@ defineTest(qtAddRpathLink) {
+ defineTest(qtPrepareTool) {
+ $$1 = $$eval(QT_TOOL.$${2}.binary)
+ isEmpty($$1) {
+- $$1 = $$[QT_HOST_BINS]/$$2
++ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
++ # for some reason isEmpty does not work here, FIXME before submitting upstream
++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
++ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
++ $$1 = $$[QT_HOST_BINS]/$$2
++ }
+ exists($$eval($$1).pl) {
+ $$1 = perl -w $$eval($$1).pl
+ } else: contains(QMAKE_HOST.os, Windows) {
+diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
+index f0864f9..50bfac8 100644
+--- a/mkspecs/features/qt_tool.prf
++++ b/mkspecs/features/qt_tool.prf
+@@ -15,8 +15,7 @@ CONFIG += console
+
+ # If we are doing a prefix build, create a "module" pri which enables
+ # qtPrepareTool() to work with the non-installed build.
+-# Non-bootstrapped tools always need this because of the environment setup.
+-!build_pass:if(!host_build|!force_bootstrap|force_independent) {
++!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
+ isEmpty(MODULE):MODULE = $$TARGET
+
+ !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private)
+diff --git a/qmake/property.cpp b/qmake/property.cpp
+index e50485c..71291ad 100644
+--- a/qmake/property.cpp
++++ b/qmake/property.cpp
+@@ -75,6 +75,7 @@ static const struct {
+ { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true },
+ { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true },
+ { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true },
++ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true },
+ { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true },
+ { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
+ };
+diff --git a/qtbase.pro b/qtbase.pro
+index ed6fc39..2421f41 100644
+--- a/qtbase.pro
++++ b/qtbase.pro
+@@ -71,16 +71,22 @@ CONFIG -= qt
+
+ #qmake
+ qmake.path = $$[QT_HOST_BINS]
++qmake.files = $$OUT_PWD/bin/qmake
++!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
++ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/qmake
++}
+ equals(QMAKE_HOST.os, Windows) {
+- qmake.files = $$OUT_PWD/bin/qmake.exe
+-} else {
+- qmake.files = $$OUT_PWD/bin/qmake
++ qmake.files = $${qmake.files}.exe
+ }
+ INSTALLS += qmake
+
+ #syncqt
+ syncqt.path = $$[QT_HOST_BINS]
+ syncqt.files = $$PWD/bin/syncqt.pl
++syncqt.files = $$PWD/bin/syncqt.pl
++!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
++ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl
++}
+ INSTALLS += syncqt
+
+ # If we are doing a prefix build, create a "module" pri which enables
+diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
+index 9bda70e..6e3605a 100644
+--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
+@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+ set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+ _qt5_Core_check_file_exists(${imported_location})
+
+@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc)
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+ set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+ _qt5_Core_check_file_exists(${imported_location})
+
+@@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc)
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+ set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+ _qt5_Core_check_file_exists(${imported_location})
+
+diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
+index 6d25325..3686b17 100644
+--- a/src/corelib/global/qlibraryinfo.cpp
++++ b/src/corelib/global/qlibraryinfo.cpp
+@@ -333,7 +333,7 @@ QLibraryInfo::isDebugBuild()
+ */
+
+ static const struct {
+- char key[19], value[13];
++ char key[21], value[13];
+ } qtConfEntries[] = {
+ { "Prefix", "." },
+ { "Documentation", "doc" }, // should be ${Data}/doc
+@@ -359,6 +359,7 @@ static const struct {
+ { "HostBinaries", "bin" },
+ { "HostLibraries", "lib" },
+ { "HostData", "." },
++ { "ExternalHostBinaries", "" },
+ { "TargetSpec", "" },
+ { "HostSpec", "" },
+ #endif
+diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
+index 0b573c2..b5535ee 100644
+--- a/src/corelib/global/qlibraryinfo.h
++++ b/src/corelib/global/qlibraryinfo.h
+@@ -88,6 +88,7 @@ public:
+ HostBinariesPath,
+ HostLibrariesPath,
+ HostDataPath,
++ ExternalHostBinariesPath,
+ TargetSpecPath,
+ HostSpecPath,
+ LastHostPath = HostSpecPath,
+diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
+index 1d94715..301af8f 100644
+--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
++++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
+@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+ set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+ _qt5_DBus_check_file_exists(${imported_location})
+
+@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+ set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+ _qt5_DBus_check_file_exists(${imported_location})
+
+diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+index 99d87e2..5621dc0 100644
+--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
++++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+ set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+- set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+ _qt5_Widgets_check_file_exists(${imported_location})
+
+diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
+index cff3f1b..540708b 100644
+--- a/tools/configure/configureapp.cpp
++++ b/tools/configure/configureapp.cpp
+@@ -1213,6 +1213,13 @@ void Configure::parseCmdLine()
+ dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i);
+ }
+
++ else if (configCmdLine.at(i) == "-external-hostbindir") {
++ ++i;
++ if (i == argCount)
++ break;
++ dictionary[ "QT_EXTERNAL_HOST_BINS" ] = configCmdLine.at(i);
++ }
++
+ else if (configCmdLine.at(i) == "-make-tool") {
+ ++i;
+ if (i == argCount)
+@@ -3986,6 +3993,7 @@ void Configure::generateQConfigCpp()
+ << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
+ << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
+ << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
++ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl
+ << " \"qt_targspec=" << targSpec << "\"," << endl
+ << " \"qt_hostspec=" << hostSpec << "\"," << endl
+ << "#endif" << endl
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
new file mode 100644
index 0000000..95c67a8
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -0,0 +1,39 @@
+From 53b152be24082a2cf2497d2e687f9ee73a39d6f4 Mon Sep 17 00:00:00 2001
+From: Holger Freyther <zecke@selfish.org>
+Date: Wed, 26 Sep 2012 17:22:30 +0200
+Subject: [PATCH 03/10] qlibraryinfo: allow to set qt.conf from the outside
+ using the environment
+
+Allow to set a qt.conf from the outside using the environment. This allows
+to inject new prefixes and other paths into qmake. This is needed when using
+the same qmake binary to build qt/x11 and qt/embedded
+
+Upstream-Status: Inappropriate [embedded specific]
+ again very OE specific to read everything from environment (reusing the same
+ qmake from sstate and replacing all configured paths in it with qt.conf from
+ environment).
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/corelib/global/qlibraryinfo.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
+index 3686b17..89e13cf 100644
+--- a/src/corelib/global/qlibraryinfo.cpp
++++ b/src/corelib/global/qlibraryinfo.cpp
+@@ -153,7 +153,10 @@ QLibrarySettings::QLibrarySettings()
+
+ QSettings *QLibraryInfoPrivate::findConfiguration()
+ {
+- QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
++ QByteArray config = getenv("QT_CONF_PATH");
++ QString qtconfig = QFile::decodeName(config);
++ if(!QFile::exists(qtconfig))
++ qtconfig = QStringLiteral(":/qt/etc/qt.conf");
+ #ifdef QT_BOOTSTRAPPED
+ if(!QFile::exists(qtconfig))
+ qtconfig = qt_libraryInfoFile();
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
new file mode 100644
index 0000000..c263d09
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -0,0 +1,30 @@
+From a39f5e64b7b5a31e7e5cd988b5f967ce6cf02990 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sat, 27 Apr 2013 22:33:33 +0200
+Subject: [PATCH 04/10] configureapp: Prefix default LIBDIRS and INCDIRS with
+ SYSROOT
+
+Upstream-Status: Pending
+ again a bit OE specific
+---
+ tools/configure/configureapp.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
+index 540708b..45f4a1e 100644
+--- a/tools/configure/configureapp.cpp
++++ b/tools/configure/configureapp.cpp
+@@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri()
+ configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl;
+ if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
+ // FIXME: add detection
+- configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
+- configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
++ configStream << " QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
++ configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
+ }
+ configStream << "}" << endl;
+ configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
new file mode 100644
index 0000000..395e84c
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
@@ -0,0 +1,50 @@
+From c0c4c468cc70a367e3bb2dd4a48c31e62b3b0fa4 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 29 Oct 2012 20:07:49 -0700
+Subject: [PATCH 05/10] qmake: don't build it in configure, but allow to build
+ it separately
+
+* it is already built in qtbase-native, so we don't need it in configure
+* allow building a separate qmake for the target
+
+Upstream-Status: Inappropriate [configuration]
+ OE specific for native/target builds
+
+Signed-off-by: Yu Ke <ke.yu@intel.com>
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 2 +-
+ qmake/qmake.pro | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index bf7c11e..5e93ce4 100755
+--- a/configure
++++ b/configure
+@@ -3674,7 +3674,7 @@ setBootstrapEvalVariable()
+
+
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+ echo "Creating qmake..."
+
+ mkdir -p "$outpath/qmake" || exit
+diff --git a/qmake/qmake.pro b/qmake/qmake.pro
+index 89d6ea5..7c605b9 100644
+--- a/qmake/qmake.pro
++++ b/qmake/qmake.pro
+@@ -8,6 +8,8 @@ CONFIG -= qt
+ DEFINES += \
+ QT_BUILD_QMAKE \
+ PROEVALUATOR_FULL
++DESTDIR = ../bin/
++TARGET = qmake
+
+ VPATH += \
+ ../src/corelib/global \
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
new file mode 100644
index 0000000..21821c3
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
@@ -0,0 +1,72 @@
+From 2cb0f75bb9ab1e6709fe867887f9e6014a140356 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 5 Feb 2014 18:35:08 +0100
+Subject: [PATCH 06/10] eglfs: fix egl error for platforms only supporting one
+ window/surface
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+running qmlscene -platform eglfs <filename>.qml
+
+caused
+
+EGL Error : Could not create the egl surface: error = 0x3003
+
+Rebased version of [1-2]
+
+Upstream-Status: unknown
+
+[1] http://repository.timesys.com/buildsources/q/qt-everywhere-opensource/qt-everywhere-opensource-5.1.1/qt-everywhere-opensource-5.1.1-qeglfswindow.cpp.patch
+[2] https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/qeglfswindow.cpp.patch
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/plugins/platforms/eglfs/qeglfswindow.cpp | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp
+index 2d36c0b..854531e 100644
+--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
++++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp
+@@ -74,6 +74,15 @@ void QEglFSWindow::create()
+
+ m_flags = Created;
+
++ static EGLSurface __singleWindowSurface;
++ if(QEglFSHooks::hooks() && ! QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows) && (__singleWindowSurface)) {
++ m_surface = __singleWindowSurface;
++#ifdef QEGL_EXTRA_DEBUG
++ qWarning("Surface recreate request, re-using %x\n", m_surface);
++#endif
++ return;
++ }
++
+ if (window()->type() == Qt::Desktop)
+ return;
+
+@@ -85,7 +94,7 @@ void QEglFSWindow::create()
+ if (isRaster() && screen->compositingWindow())
+ return;
+
+-#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK)
++#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) || defined(EGL_API_FB)
+ // We can have either a single OpenGL window or multiple raster windows.
+ // Other combinations cannot work.
+ qFatal("EGLFS: OpenGL windows cannot be mixed with others.");
+@@ -105,6 +114,11 @@ void QEglFSWindow::create()
+
+ resetSurface();
+
++ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows))
++ {
++ __singleWindowSurface = m_surface;
++ }
++
+ screen->setPrimarySurface(m_surface);
+
+ if (isRaster()) {
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
new file mode 100644
index 0000000..24ae7ea
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -0,0 +1,30 @@
+From 0923f72a444bcdc0675a24aec9782692b41d301c Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Wed, 19 Mar 2014 18:32:28 +0100
+Subject: [PATCH 07/10] qeglplatformintegration: Undefine CursorShape from X.h
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
+index f665455..9eb783c 100644
+--- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
++++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
+@@ -46,6 +46,12 @@
+ #include <qpa/qplatformnativeinterface.h>
+ #include <EGL/egl.h>
+
++// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/
++// /usr/include/X11/X.h:#define CursorShape 0 /* largest size that can be displayed */
++#ifdef CursorShape
++#undef CursorShape
++#endif
++
+ QT_BEGIN_NAMESPACE
+
+ class QEGLPlatformScreen;
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch
new file mode 100644
index 0000000..fd45516
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch
@@ -0,0 +1,31 @@
+From 4d5502114a3135f2c78eb9e63476918cbee00040 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sat, 16 Nov 2013 00:32:30 +0100
+Subject: [PATCH 08/10] Always build uic
+
+Even if we are not building gui or widgets. This tool is needed later
+as a native tool when compiling the target.
+
+Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
+Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/src.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index 6a805a6..90623a6 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -158,7 +158,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
+ }
+ }
+ }
+-SUBDIRS += src_plugins src_tools_qdoc
++SUBDIRS += src_plugins src_tools_qdoc src_tools_uic
+
+ nacl: SUBDIRS -= src_network src_testlib
+
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch
new file mode 100644
index 0000000..ddd7116
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch
@@ -0,0 +1,30 @@
+From 7117e71f5e1aac3ac6e5e87852c108bbc13dc364 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Mon, 11 Nov 2013 20:22:34 -0500
+Subject: [PATCH 09/10] configure: preserve built qmake and swap with native
+ one
+
+Let configure script build the real qmake, but right after it's built, swap
+it with a native qmake for further internal use, preserving the real one.
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure b/configure
+index 5e93ce4..01fca8f 100755
+--- a/configure
++++ b/configure
+@@ -3821,6 +3821,8 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+
+ (cd "$outpath/qmake"; "$MAKE") || exit 2
+ fi # Build qmake
++mv "$outpath/bin/qmake" "$outpath/bin/qmake-real"
++mv "$outpath/bin/qmake-native" "$outpath/bin/qmake"
+
+ echo "Running configuration tests..."
+
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch
new file mode 100644
index 0000000..02eef9b
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch
@@ -0,0 +1,29 @@
+From 6afe8d5d1daf94ac64478406b5b84b6879981446 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Mon, 11 Nov 2013 20:27:30 -0500
+Subject: [PATCH 10/10] configure: bump path length from 256 to 512 characters
+
+Increase the path length that gets hardcoded into generated config.cpp file
+from 256 to 512 characters, as nativesdk path can be quite long.
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 01fca8f..801c7c1 100755
+--- a/configure
++++ b/configure
+@@ -3572,7 +3572,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
+ static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`";
+
+ /* Installation Info */
+-static const char qt_configure_prefix_path_strs[][256 + 12] = {
++static const char qt_configure_prefix_path_strs[][512 + 12] = {
+ #ifndef QT_BUILD_QMAKE
+ "qt_prfxpath=$QT_SYSROOT_PREFIX",
+ "qt_docspath=$QT_SYSROOT_DOCS",
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 6f11bf3..bafe37b 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -1,12 +1,29 @@
require qt5-git.inc
require ${PN}.inc
+SRC_URI = "\
+ git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+"
+
+# common with -native
+SRC_URI += "\
+ file://0001-Add-linux-oe-g-platform.patch \
+ file://0002-Add-external-hostbindir-option.patch \
+ file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+ file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
+ file://0001-Fix-missing-plugin_types.patch \
+ file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+"
+
+# specific for native version
+SRC_URI += " \
+ file://0008-Always-build-uic.patch \
+"
+
do_install_append() {
# for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
# e.g. qt3d, qtwayland
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
}
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 168 commits
-SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f"
+SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 07dd936..9bcfa79 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -1,6 +1,25 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 172 commits
-SRCREV = "bf0336a02502b3ed4d399c1cf5b4a56b1e858d42"
+SRC_URI = "\
+ git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+"
+
+# common with -native
+SRC_URI += "\
+ file://0001-Add-linux-oe-g-platform.patch \
+ file://0002-Add-external-hostbindir-option.patch \
+ file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+ file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
+ file://0001-Fix-missing-plugin_types.patch \
+ file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+"
+
+# target specific
+SRC_URI += "\
+ file://0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
+ file://0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
+ file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
+"
+
+SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 35e54d3..c0fd15d 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -1,6 +1,4 @@
require qt5-git.inc
require ${BPN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 25 commits
-SRCREV = "9902dfdbc44934ce2e8072bc237ca8cdbfb3402b"
+SRCREV = "6d9ab3981a1ae9e224b3c6a8cf107049a0ee5095"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index e2d6ae5..2d733a3 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 81 commits
-SRCREV = "7ceefa60ab4f79d5f40e7051edf80c1a77ae7734"
+SRCREV = "aedcd57c84ac9d6b74816c13bdf3fde31e1132b5"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index b442069..9347e7b 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 3 commits
-SRCREV = "1fbbe87e6d5dc84bff70bd90b71d07f9982a8bc3"
+SRCREV = "9b1883d2e90dd6ef92374d21e490a3de1c8330ba"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index e40bd3f..b413a5f 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 1 commits
-SRCREV = "dde6daeccdf0a3f8d49fe1777b49046576b12218"
+SRCREV = "554d617762c86964dfa074074304993ccdfbe2c9"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index e498515..bab8275 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 13 commits
-SRCREV = "2ba9fd5550eb7766c20b3a61679e88ec4a6c8a54"
+SRCREV = "27c9ffe1d2eb2103e9b420c86c6fc3d10cb1ff76"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index e9fed1a..88ca59e 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 17 commits
-SRCREV = "db7f7cc5654ddec60297259bc9f86f5f777749cd"
+SRCREV = "b088962950dbc4c6f0219de30b0d9a8cf47a3376"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index d744aa8..7c64460 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 2 commits
-SRCREV = "07d8ce32b1112dcb590c793ee51cb713e514011b"
+SRCREV = "c56f5d8848ce03cc6667804f815de47d2d8221fb"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 69c3353..fd525f1 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 15 commits
-SRCREV = "1c54d411ad6e98c3779a412750aec8b93d587872"
+SRCREV = "ea9add905768a26ce86ab542615a193296642732"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 2b86650..2deaaff 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 1 commits
-SRCREV = "f89d64ca722acf4a1a38c5e136bb01eff2525978"
+SRCREV = "e4453c92ee41943a3a1d67a725804a44e747f64e"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index aedcc40..6e3bda6 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 2 commits
-SRCREV = "9a8319a39a06d6cf3163978301d650b8f3558c62"
+SRCREV = "eee2eee734b4aa735d35f6c53d79c06c1c76425a"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 3418259..4619227 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -1,6 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 28 commits
-SRCREV = "03546732fa696467d23b24224fad2822bc6a9043"
+SRCREV = "6e75610dff5fb96ebd72cfb40ba7cbfea4bd21b7"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index b6032b7..0aa79e1 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 1 commits
-SRCREV = "ae68091e0d6023410bc657cf54e7fa9b6c8bbcc2"
+SRCREV = "ad81f5720c4f4a1dac099cbe2f9d47ed3a9025b0"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
new file mode 100644
index 0000000..575616b
--- /dev/null
+++ b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
@@ -0,0 +1,155 @@
+From 90a2e92062fc67fa54be0f5596606ce2bc21f772 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.jansa@gmail.com>
+Date: Wed, 11 Sep 2013 18:30:08 +0200
+Subject: [PATCH 1/2] Allow to build only lrelease + lupdate + lconvert
+
+This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native
+is built without GUI support (no-png is set) and we still want to build
+native lrelease + lupdate + lconvert tools.
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.jansa@gmail.com>
+---
+ examples/examples.pro | 4 ++--
+ src/designer/src/src.pro | 16 +++++++++-------
+ src/linguist/linguist.pro | 2 +-
+ src/src.pro | 14 ++++++++------
+ tests/auto/auto.pro | 24 +++++++++++++-----------
+ 5 files changed, 33 insertions(+), 27 deletions(-)
+
+diff --git a/examples/examples.pro b/examples/examples.pro
+index 4955969..8e86419 100644
+--- a/examples/examples.pro
++++ b/examples/examples.pro
+@@ -1,3 +1,3 @@
+ TEMPLATE = subdirs
+-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant
+-
++!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant
++qtHaveModule(widgets): SUBDIRS += linguist uitools
+diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
+index e02ca8e..49527c5 100644
+--- a/src/designer/src/src.pro
++++ b/src/designer/src/src.pro
+@@ -1,18 +1,20 @@
+ TEMPLATE = subdirs
+
+-SUBDIRS = \
+- uitools \
+- lib \
+- components \
+- designer
++!linguistonly {
++ SUBDIRS = \
++ lib \
++ components \
++ designer
++}
++SUBDIRS += uitools
+
+-contains(QT_CONFIG, shared): SUBDIRS += plugins
++!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins
+
+ components.depends = lib
+ designer.depends = components
+ plugins.depends = lib
+
+-qtNomakeTools( \
++!linguistonly:qtNomakeTools( \
+ lib \
+ components \
+ designer \
+diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
+index 3a70580..a977878 100644
+--- a/src/linguist/linguist.pro
++++ b/src/linguist/linguist.pro
+@@ -3,7 +3,7 @@ SUBDIRS = \
+ lrelease \
+ lupdate \
+ lconvert
+-!no-png:qtHaveModule(widgets): SUBDIRS += linguist
++!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist
+
+ qtNomakeTools( \
+ linguist \
+diff --git a/src/src.pro b/src/src.pro
+index 861d06d..3438f9a 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -4,10 +4,12 @@ qtHaveModule(widgets) {
+ no-png {
+ message("Some graphics-related tools are unavailable without PNG support")
+ } else {
+- SUBDIRS = assistant \
++ !linguistonly {
++ SUBDIRS = assistant \
+ pixeltool \
+- qtestlib \
+- designer
++ qtestlib
++ }
++ SUBDIRS += designer
+ # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
+
+ linguist.depends = designer
+@@ -15,7 +17,7 @@ qtHaveModule(widgets) {
+ }
+
+ SUBDIRS += linguist
+-!android|android_app: SUBDIRS += qtpaths
++!linguistonly:!android|android_app: SUBDIRS += qtpaths
+
+ mac {
+ SUBDIRS += macdeployqt
+@@ -25,7 +27,7 @@ android {
+ SUBDIRS += androiddeployqt
+ }
+
+-qtHaveModule(dbus): SUBDIRS += qdbus
++!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus
+
+ win32|winrt:SUBDIRS += windeployqt
+ winrt:SUBDIRS += winrtrunner qtd3dservice
+@@ -36,4 +38,4 @@ qtNomakeTools( \
+ macdeployqt \
+ )
+
+-!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
++!linguistonly:!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
+diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
+index c3acfe3..b48e711 100644
+--- a/tests/auto/auto.pro
++++ b/tests/auto/auto.pro
+@@ -1,15 +1,17 @@
+ TEMPLATE=subdirs
+-SUBDIRS=\
+- linguist \
+- host.pro \
+- qhelpcontentmodel \
+- qhelpenginecore \
+- qhelpgenerator \
+- qhelpindexmodel \
+- qhelpprojectdata \
+- cmake \
+- installed_cmake \
+- qtdiag
++!linguistonly {
++ SUBDIRS=\
++ linguist \
++ host.pro \
++ qhelpcontentmodel \
++ qhelpenginecore \
++ qhelpgenerator \
++ qhelpindexmodel \
++ qhelpprojectdata \
++ cmake \
++ installed_cmake \
++ qtdiag
++}
+
+ installed_cmake.depends = cmake
+
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
new file mode 100644
index 0000000..1c40471
--- /dev/null
+++ b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
@@ -0,0 +1,32 @@
+From 509541ebd648414ee33f3aea3035d1e6382bfa3c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 17 Jan 2014 14:33:19 +0100
+Subject: [PATCH 2/2] assistant/help: fix linking of dependent libraries
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+else we get:
+| ...ld: warning: libQt5CLucene.so.5, needed by ...libQt5Help.so, not found (try using -rpath or -rpath-link)
+| ...undefined reference to `QCLucenePhraseQuery::getTerms() const'
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/assistant/help/help.pro | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
+index 168d23d..a9c3b59 100644
+--- a/src/assistant/help/help.pro
++++ b/src/assistant/help/help.pro
+@@ -59,3 +59,5 @@ HEADERS += qhelpenginecore.h \
+ # access to clucene
+ HEADERS += qhelpsearchindexwriter_clucene_p.h \
+ qhelpsearchindexreader_clucene_p.h
++
++LIBS += -lQt5CLucene
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb
index 200f427..49a1907 100644
--- a/recipes-qt/qt5/qttools-native_git.bb
+++ b/recipes-qt/qt5/qttools-native_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 13 commits
-SRCREV = "80c6a5ea7f827647cc58037e1d1cf4bbf30e1fb6"
+SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 200f427..49a1907 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 13 commits
-SRCREV = "80c6a5ea7f827647cc58037e1d1cf4bbf30e1fb6"
+SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index b820665..9fac8b2 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -10,3 +10,9 @@ SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e"
do_install_append() {
ln -sf ${D}${OE_QMAKE_PATH_QT_BINS}/qtwaylandscanner ${D}${bindir}/qtwaylandscanner
}
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index df7a562..3f18272 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -14,3 +14,9 @@ do_install_append() {
# do install files created by qtwaylandscanner
install ${B}/include/QtCompositor/5.3.0/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.3.0/QtCompositor/private
}
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 1f5df71..98fdc2f 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -1,6 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 1 commits
-SRCREV = "cb8ed9694b850a429a93490beaa6462d9f3b8ea6"
+SRCREV = "c9d13139b65818785f218cc96d136d33591ca2f5"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 047b37f..ec8b4f3 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -1,6 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 18 commits
-SRCREV = "a1b801fc98ccda988df41e08dc70fdbd50ecb513"
+SRCREV = "0546c8656a3728bf4375da39027e096beba4f111"
--git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index d0a2a8c..954545f 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -1,6 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 1 commits
-SRCREV = "dd7eec92e7a5f4383783cc161f638867572dc208"
+SRCREV = "947361a7dc8db093d0b8e1ec5ac953470a180259"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 28e45a4..b86a749 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 4 commits
-SRCREV = "eaf0a92dcb6fb12f3d65aa4fc806ccbfaa7f7db0"
+SRCREV = "d25091bb8b52455e415f8147a9100094c489a041"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-qt5][PATCH 2/5] qt5: upgrade from 5.2.1 to 5.3.0
2014-06-04 9:56 [meta-qt5][PATCH 1/5] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
@ 2014-06-04 9:56 ` Martin Jansa
2014-06-04 9:56 ` [meta-qt5][PATCH 3/5] qtenginio, qtwebsockets: Add 2 new modules and include them in packagegroup-qt5-toolchain-target Martin Jansa
` (3 subsequent siblings)
4 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2014-06-04 9:56 UTC (permalink / raw)
To: openembedded-devel
From: Jonathan Liu <net147@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes-qt/qt5/nativesdk-qtbase.inc | 3 +-
recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb | 5 --
recipes-qt/qt5/nativesdk-qtbase_5.3.0.bb | 5 ++
recipes-qt/qt5/nativesdk-qttools.inc | 6 +++
recipes-qt/qt5/nativesdk-qttools_5.2.1.bb | 5 --
recipes-qt/qt5/nativesdk-qttools_5.3.0.bb | 5 ++
recipes-qt/qt5/{qt5-5.2.1.inc => qt5-5.3.0.inc} | 4 +-
recipes-qt/qt5/qtbase-native.inc | 2 +
...base-native_5.2.1.bb => qtbase-native_5.3.0.bb} | 4 +-
recipes-qt/qt5/qtbase.inc | 5 +-
.../0005-qt_module-Fix-pkgconfig-replacement.patch | 12 ++---
...mintegration-Undefine-CursorShape-from-X..patch | 30 +++++++++++
recipes-qt/qt5/qtbase/0010-Always-build-uic.patch | 19 +++----
.../0013-QOpenGLPaintDevice-sub-area-support.patch | 44 ++++++++--------
.../0015-Fix-linuxfb-argument-mmsize-parsing.patch | 42 ---------------
.../qt5/qtbase/0015-Fix-missing-plugin_types.patch | 30 +++++++++++
...lfs-Print-the-chosen-config-in-debug-mode.patch | 56 ++++++++++++++++++++
.../qtbase/0016-eglfs-Fix-quad-coordinates.patch | 39 --------------
recipes-qt/qt5/qtbase_5.2.1.bb | 7 ---
recipes-qt/qt5/qtbase_5.3.0.bb | 5 ++
recipes-qt/qt5/qtconnectivity.inc | 6 +++
recipes-qt/qt5/qtconnectivity_5.2.1.bb | 5 --
recipes-qt/qt5/qtconnectivity_5.3.0.bb | 5 ++
recipes-qt/qt5/qtdeclarative.inc | 7 +++
...x-improper-antialiasing-property-behavior.patch | 60 ++++++++++++++++++++++
...g-calculation-of-viewPort-for-transitions.patch | 41 ---------------
recipes-qt/qt5/qtdeclarative_5.2.1.bb | 9 ----
recipes-qt/qt5/qtdeclarative_5.3.0.bb | 5 ++
recipes-qt/qt5/qtgraphicaleffects.inc | 6 +++
recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb | 5 --
recipes-qt/qt5/qtgraphicaleffects_5.3.0.bb | 5 ++
recipes-qt/qt5/qtimageformats.inc | 6 +++
recipes-qt/qt5/qtimageformats_5.2.1.bb | 5 --
recipes-qt/qt5/qtimageformats_5.3.0.bb | 5 ++
recipes-qt/qt5/qtlocation.inc | 6 +++
recipes-qt/qt5/qtlocation_5.2.1.bb | 5 --
recipes-qt/qt5/qtlocation_5.3.0.bb | 5 ++
recipes-qt/qt5/qtmultimedia.inc | 6 +++
recipes-qt/qt5/qtmultimedia_5.2.1.bb | 5 --
recipes-qt/qt5/qtmultimedia_5.3.0.bb | 5 ++
recipes-qt/qt5/qtquick1.inc | 6 +++
recipes-qt/qt5/qtquick1_5.2.1.bb | 5 --
recipes-qt/qt5/qtquick1_5.3.0.bb | 5 ++
recipes-qt/qt5/qtquickcontrols.inc | 6 +++
recipes-qt/qt5/qtquickcontrols_5.2.1.bb | 6 ---
recipes-qt/qt5/qtquickcontrols_5.3.0.bb | 5 ++
recipes-qt/qt5/qtscript.inc | 6 +++
recipes-qt/qt5/qtscript_5.2.1.bb | 5 --
recipes-qt/qt5/qtscript_5.3.0.bb | 5 ++
recipes-qt/qt5/qtsensors.inc | 6 +++
recipes-qt/qt5/qtsensors_5.2.1.bb | 5 --
recipes-qt/qt5/qtsensors_5.3.0.bb | 5 ++
recipes-qt/qt5/qtserialport_5.2.1.bb | 5 --
recipes-qt/qt5/qtserialport_5.3.0.bb | 5 ++
recipes-qt/qt5/qtsvg.inc | 6 +++
recipes-qt/qt5/qtsvg_5.2.1.bb | 6 ---
recipes-qt/qt5/qtsvg_5.3.0.bb | 5 ++
recipes-qt/qt5/qttools-native_5.2.1.bb | 5 --
recipes-qt/qt5/qttools-native_5.3.0.bb | 5 ++
recipes-qt/qt5/qttools.inc | 6 +++
...w-to-build-only-lrelease-lupdate-lconvert.patch | 39 ++++++++++----
recipes-qt/qt5/qttools_5.2.1.bb | 5 --
recipes-qt/qt5/qttools_5.3.0.bb | 5 ++
recipes-qt/qt5/qtwebkit-examples_5.2.1.bb | 5 --
recipes-qt/qt5/qtwebkit-examples_5.3.0.bb | 5 ++
recipes-qt/qt5/qtwebkit_5.2.1.bb | 5 --
recipes-qt/qt5/qtwebkit_5.3.0.bb | 5 ++
| 5 --
| 5 ++
recipes-qt/qt5/qtxmlpatterns.inc | 6 +++
recipes-qt/qt5/qtxmlpatterns_5.2.1.bb | 5 --
recipes-qt/qt5/qtxmlpatterns_5.3.0.bb | 5 ++
72 files changed, 438 insertions(+), 295 deletions(-)
delete mode 100644 recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb
create mode 100644 recipes-qt/qt5/nativesdk-qtbase_5.3.0.bb
delete mode 100644 recipes-qt/qt5/nativesdk-qttools_5.2.1.bb
create mode 100644 recipes-qt/qt5/nativesdk-qttools_5.3.0.bb
rename recipes-qt/qt5/{qt5-5.2.1.inc => qt5-5.3.0.inc} (86%)
rename recipes-qt/qt5/{qtbase-native_5.2.1.bb => qtbase-native_5.3.0.bb} (63%)
create mode 100644 recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
delete mode 100644 recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch
create mode 100644 recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch
create mode 100644 recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
delete mode 100644 recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch
delete mode 100644 recipes-qt/qt5/qtbase_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtbase_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtconnectivity_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtconnectivity_5.3.0.bb
create mode 100644 recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch
delete mode 100644 recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
delete mode 100644 recipes-qt/qt5/qtdeclarative_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtdeclarative_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtimageformats_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtimageformats_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtlocation_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtlocation_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtmultimedia_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtmultimedia_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtquick1_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtquick1_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtquickcontrols_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtquickcontrols_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtscript_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtscript_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtsensors_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtsensors_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtserialport_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtserialport_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtsvg_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtsvg_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qttools-native_5.2.1.bb
create mode 100644 recipes-qt/qt5/qttools-native_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qttools_5.2.1.bb
create mode 100644 recipes-qt/qt5/qttools_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtwebkit-examples_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtwebkit-examples_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtwebkit_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtwebkit_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtx11extras_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtx11extras_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtxmlpatterns_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtxmlpatterns_5.3.0.bb
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
index 884b1a6..62e841c 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -23,6 +23,8 @@ SRC_URI += "\
file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
+ file://0015-Fix-missing-plugin_types.patch \
+ file://0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
"
# common with -native
@@ -67,7 +69,6 @@ FILES_${PN}-tools = " \
DEBIAN_NOAUTONAME_${PN}-tools = "1"
QT_CONFIG_FLAGS += " \
- -reduce-relocations \
-shared \
-silent \
-no-pch \
diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb b/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb
deleted file mode 100644
index c106d22..0000000
--- a/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b"
-SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.3.0.bb b/recipes-qt/qt5/nativesdk-qtbase_5.3.0.bb
new file mode 100644
index 0000000..95d3af7
--- /dev/null
+++ b/recipes-qt/qt5/nativesdk-qtbase_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "4bc43a72e1b3d804171e5b52640e8d96"
+SRC_URI[sha256sum] = "07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab"
diff --git a/recipes-qt/qt5/nativesdk-qttools.inc b/recipes-qt/qt5/nativesdk-qttools.inc
index c67f9cd..6b8ba54 100644
--- a/recipes-qt/qt5/nativesdk-qttools.inc
+++ b/recipes-qt/qt5/nativesdk-qttools.inc
@@ -9,6 +9,12 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools:"
SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch"
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
+
PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
FILES_${PN}-dbg = " \
diff --git a/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb b/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb
deleted file mode 100644
index d186a21..0000000
--- a/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b"
-SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5"
diff --git a/recipes-qt/qt5/nativesdk-qttools_5.3.0.bb b/recipes-qt/qt5/nativesdk-qttools_5.3.0.bb
new file mode 100644
index 0000000..d3956a7
--- /dev/null
+++ b/recipes-qt/qt5/nativesdk-qttools_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "628a91ddfe34efc6622fdba8c6348855"
+SRC_URI[sha256sum] = "f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250"
diff --git a/recipes-qt/qt5/qt5-5.2.1.inc b/recipes-qt/qt5/qt5-5.3.0.inc
similarity index 86%
rename from recipes-qt/qt5/qt5-5.2.1.inc
rename to recipes-qt/qt5/qt5-5.3.0.inc
index 50e8a7a..21c1a22 100644
--- a/recipes-qt/qt5/qt5-5.2.1.inc
+++ b/recipes-qt/qt5/qt5-5.3.0.inc
@@ -4,7 +4,7 @@
QT_VERSION ?= "${PV}"
# it's different for RC versions
-QT_VERSION_DIR ?= "5.2"
+QT_VERSION_DIR ?= "5.3"
SRC_URI += " \
http://download.qt-project.org/official_releases/qt/${QT_VERSION_DIR}/${QT_VERSION}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
@@ -13,7 +13,7 @@ SRC_URI += " \
S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}"
LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=2abca611d56c23eb99943bde21c80a0d \
file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc
index 860bc29..dc04987 100644
--- a/recipes-qt/qt5/qtbase-native.inc
+++ b/recipes-qt/qt5/qtbase-native.inc
@@ -19,6 +19,8 @@ SRC_URI += "\
file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
+ file://0015-Fix-missing-plugin_types.patch \
+ file://0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
"
# specific for native version
diff --git a/recipes-qt/qt5/qtbase-native_5.2.1.bb b/recipes-qt/qt5/qtbase-native_5.3.0.bb
similarity index 63%
rename from recipes-qt/qt5/qtbase-native_5.2.1.bb
rename to recipes-qt/qt5/qtbase-native_5.3.0.bb
index 54adc48..8468b4f 100644
--- a/recipes-qt/qt5/qtbase-native_5.2.1.bb
+++ b/recipes-qt/qt5/qtbase-native_5.3.0.bb
@@ -7,5 +7,5 @@ do_install_append() {
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
}
-SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b"
-SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0"
+SRC_URI[md5sum] = "4bc43a72e1b3d804171e5b52640e8d96"
+SRC_URI[sha256sum] = "07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab"
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 3768871..726576c 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -11,6 +11,8 @@ SRC_URI += "\
file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
+ file://0015-Fix-missing-plugin_types.patch \
+ file://0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
"
SRC_URI += "\
@@ -18,7 +20,7 @@ SRC_URI += "\
file://0011-Allow-building-a-separate-qmake-for-the-target.patch \
file://0013-QOpenGLPaintDevice-sub-area-support.patch \
file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
- file://0016-eglfs-Fix-quad-coordinates.patch \
+ file://0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
"
DEPENDS += "qtbase-native"
@@ -126,7 +128,6 @@ PACKAGECONFIG[nis] = "-nis,-no-nis"
PACKAGECONFIG[widgets] = "-widgets,-no-widgets"
QT_CONFIG_FLAGS += " \
- -reduce-relocations \
-shared \
-silent \
-no-pch \
diff --git a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch
index b8768c8..e1135ce 100644
--- a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch
+++ b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch
@@ -1,4 +1,4 @@
-From 7999eeb3f2ab1150aa301ec26ae9bf0788d09c9e Mon Sep 17 00:00:00 2001
+From 4d690dbc278063648434b0f02bdb1b6f4623b285 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 27 Apr 2013 23:15:37 +0200
Subject: [PATCH 05/14] qt_module: Fix pkgconfig replacement
@@ -47,10 +47,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 11509ee..be9b929 100644
+index 2134077..a88b8cc 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
-@@ -135,30 +135,36 @@ load(qt_installs)
+@@ -170,30 +170,36 @@ load(qt_installs)
rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
else: \
rplbase = $$MODULE_BASE_OUTDIR
@@ -75,7 +75,7 @@ index 11509ee..be9b929 100644
+lafile_replace.CONFIG = path
+QMAKE_PRL_INSTALL_REPLACE += lib_replace lafile_replace
- unix|win32-g++* {
+ unix|mingw {
CONFIG += create_pc
QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace
- QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace
@@ -93,7 +93,7 @@ index 11509ee..be9b929 100644
+ QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace lafile_replace
}
- unix|win32-g++* {
+ unix|mingw {
--
-1.8.5.3
+1.9.3
diff --git a/recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
new file mode 100644
index 0000000..2f4d80c
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -0,0 +1,30 @@
+From 959b2fb8d8eb5e755e3d9d3d3031b996f96fb23b Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Wed, 19 Mar 2014 18:32:28 +0100
+Subject: [PATCH 8/8] qeglplatformintegration: Undefine CursorShape from X.h
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
+index f665455..9eb783c 100644
+--- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
++++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
+@@ -46,6 +46,12 @@
+ #include <qpa/qplatformnativeinterface.h>
+ #include <EGL/egl.h>
+
++// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/
++// /usr/include/X11/X.h:#define CursorShape 0 /* largest size that can be displayed */
++#ifdef CursorShape
++#undef CursorShape
++#endif
++
+ QT_BEGIN_NAMESPACE
+
+ class QEGLPlatformScreen;
+--
+2.0.0
+
diff --git a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
index 5681b58..c55bc54 100644
--- a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
@@ -1,4 +1,4 @@
-From 8a10c6d053fe438aec007e4a73b60ac59716ccd4 Mon Sep 17 00:00:00 2001
+From 745055eb0f56ec4d48ea2ce57bcf3d0011afcec0 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 16 Nov 2013 00:32:30 +0100
Subject: [PATCH 10/12] Always build uic
@@ -10,14 +10,14 @@ Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- src/src.pro | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ src/src.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/src.pro b/src/src.pro
-index b7887a6..8801544 100644
+index 6a805a6..90623a6 100644
--- a/src/src.pro
+++ b/src/src.pro
-@@ -145,7 +145,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
+@@ -158,7 +158,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
}
}
}
@@ -26,13 +26,6 @@ index b7887a6..8801544 100644
nacl: SUBDIRS -= src_network src_testlib
-@@ -156,4 +156,4 @@ TR_EXCLUDE = \
- src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
-
- sub-tools.depends = $$TOOLS
--QMAKE_EXTRA_TARGETS = sub-tools
-\ No newline at end of file
-+QMAKE_EXTRA_TARGETS = sub-tools
--
-1.8.5.3
+1.9.3
diff --git a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch
index c6ec67c..54039de 100644
--- a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,4 +1,4 @@
-From 2fad0a6fa3c06577995ac44ed0a2a12eaef819c2 Mon Sep 17 00:00:00 2001
+From 3c7bfc66e6c84fe06b16dfa0b76ee71701e8d5b5 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <jani.hautakangas@ixonos.com>
Date: Thu, 16 May 2013 09:52:07 +0300
Subject: [PATCH 13/14] QOpenGLPaintDevice sub-area support
@@ -14,13 +14,13 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++
src/gui/opengl/qopenglpaintdevice.h | 2 ++
- src/gui/opengl/qopenglpaintengine.cpp | 10 +++++++---
+ src/gui/opengl/qopenglpaintengine.cpp | 9 +++++++--
src/gui/opengl/qopenglpaintengine_p.h | 1 +
src/gui/opengl/qopengltextureglyphcache.cpp | 2 +-
- 5 files changed, 23 insertions(+), 4 deletions(-)
+ 5 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
-index fa392d1..5df1762 100644
+index 6750458..034630a 100644
--- a/src/gui/opengl/qopenglpaintdevice.cpp
+++ b/src/gui/opengl/qopenglpaintdevice.cpp
@@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate
@@ -76,7 +76,7 @@ index c05571c..01eb1bc 100644
void setSize(const QSize &size);
void setDevicePixelRatio(qreal devicePixelRatio);
diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
-index 0513551..f6aeb15 100644
+index 81a0d82..ce57261 100644
--- a/src/gui/opengl/qopenglpaintengine.cpp
+++ b/src/gui/opengl/qopenglpaintengine.cpp
@@ -1985,7 +1985,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
@@ -90,24 +90,24 @@ index 0513551..f6aeb15 100644
d->width = sz.width();
d->height = sz.height();
d->mode = BrushDrawingMode;
-@@ -2073,7 +2076,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
+@@ -2070,7 +2073,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
d->device->ensureActiveTarget();
d->transferMode(BrushDrawingMode);
-- glViewport(0, 0, d->width, d->height);
-+ glViewport(d->x, d->y, d->width, d->height);
+- d->funcs.glViewport(0, 0, d->width, d->height);
++ d->funcs.glViewport(d->x, d->y, d->width, d->height);
d->needsSync = false;
d->lastMaskTextureUsed = 0;
d->shaderManager->setDirty();
-@@ -2116,6 +2119,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
+@@ -2113,6 +2116,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
if (bounds == QRect(0, 0, width, height)) {
- glDisable(GL_SCISSOR_TEST);
+ funcs.glDisable(GL_SCISSOR_TEST);
} else {
+ bounds = QRect(bounds.x(), bounds.y(), bounds.width(), bounds.height());
- glEnable(GL_SCISSOR_TEST);
+ funcs.glEnable(GL_SCISSOR_TEST);
setScissor(bounds);
}
-@@ -2124,14 +2128,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
+@@ -2121,12 +2125,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect)
{
@@ -120,12 +120,10 @@ index 0513551..f6aeb15 100644
}
+ bottom += y;
const int height = rect.height();
--
- glScissor(left, bottom, width, height);
- }
+ funcs.glScissor(left, bottom, width, height);
diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
-index d51f0e5..0d4b38d 100644
+index 4f0e2e5..f211de1 100644
--- a/src/gui/opengl/qopenglpaintengine_p.h
+++ b/src/gui/opengl/qopenglpaintengine_p.h
@@ -264,6 +264,7 @@ public:
@@ -137,18 +135,18 @@ index d51f0e5..0d4b38d 100644
QOpenGLContext *ctx;
EngineMode mode;
diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
-index 3b62d1d..a5d1f7e 100644
+index ac88d9d..6c77f10 100644
--- a/src/gui/opengl/qopengltextureglyphcache.cpp
+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
-@@ -273,7 +273,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
- funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
+@@ -315,7 +315,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
+ funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
if (pex != 0) {
-- glViewport(0, 0, pex->width, pex->height);
-+ glViewport(pex->x, pex->y, pex->width, pex->height);
+- funcs->glViewport(0, 0, pex->width, pex->height);
++ funcs->glViewport(pex->x, pex->y, pex->width, pex->height);
pex->updateClipScissorTest();
} else {
- m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
+ if (m_vao.isCreated()) {
--
-1.8.5.3
+1.9.3
diff --git a/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch b/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch
deleted file mode 100644
index a31301e..0000000
--- a/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 99979159a404df09495c8ddd6a052837f66b8739 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
-Date: Fri, 7 Feb 2014 13:12:37 +0100
-Subject: [PATCH] Fix linuxfb argument 'mmsize' parsing
-
-Parse first for 'mmsize' because the regex for 'size' also fits to 'mmsize'.
-
-Upstream-Status: Backport
-
-Task-number: QTBUG-29133
-Change-Id: Idc4950270818e496d5d94a97a172b7c780f069b1
-Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
-Signed-off-by: Jonathan Liu <net147@gmail.com>
----
- src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-index 735a43d..33a9523 100644
---- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-+++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-@@ -333,6 +333,8 @@ bool QLinuxFbScreen::initialize()
- foreach (const QString &arg, mArgs) {
- if (arg == QLatin1String("nographicsmodeswitch"))
- doSwitchToGraphicsMode = false;
-+ else if (mmSizeRx.indexIn(arg) != -1)
-+ userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt());
- else if (sizeRx.indexIn(arg) != -1)
- userGeometry.setSize(QSize(sizeRx.cap(1).toInt(), sizeRx.cap(2).toInt()));
- else if (offsetRx.indexIn(arg) != -1)
-@@ -341,8 +343,6 @@ bool QLinuxFbScreen::initialize()
- ttyDevice = ttyRx.cap(1);
- else if (fbRx.indexIn(arg) != -1)
- fbDevice = fbRx.cap(1);
-- else if (mmSizeRx.indexIn(arg) != -1)
-- userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt());
- }
-
- if (fbDevice.isEmpty()) {
---
-1.7.1
-
diff --git a/recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch b/recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch
new file mode 100644
index 0000000..612cbdd
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch
@@ -0,0 +1,30 @@
+From f0e01b788e86f24352ba14ad17c3f337f934467d Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 21 Apr 2014 15:09:23 +0200
+Subject: [PATCH] Fix missing plugin_types
+
+* bearer/generic was failing with:
+ Project ERROR: No module claims plugin type 'bearer'
+
+Change-Id: I90848856a8b0a4df52e599983cf7dde0bc0e6623
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ mkspecs/features/qt_module_pris.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
+index f31bc38..415e780 100644
+--- a/mkspecs/features/qt_module_pris.prf
++++ b/mkspecs/features/qt_module_pris.prf
+@@ -177,7 +177,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
+ include($$mod_work_pfx/qt_lib_$${pri}.pri)
+ for(mod, mods_to_load) {
+ for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \
+- name depends module_config CONFIG DEFINES sources \
++ name depends module_config plugin_types CONFIG DEFINES sources \
+ includes bins libs libexecs plugins imports qml \
+ rpath_link \
+ )):defined(QT.$${mod}.$$var, var):cache(QT.$${mod}.$$var, transient)
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
new file mode 100644
index 0000000..65ebbd1
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
@@ -0,0 +1,56 @@
+From 91b185d1f4843d22d42461c0aee4cd0f5393bbc8 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 21 Apr 2014 19:22:04 +0200
+Subject: [PATCH] Revert "eglfs: Print the chosen config in debug mode"
+
+This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e.
+---
+ src/platformsupport/eglconvenience/qeglconvenience.cpp | 4 +++-
+ src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 -------
+ 2 files changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
+index e6624fb..3870f6c 100644
+--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
++++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
+@@ -437,9 +437,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
+ for (index = 0; attrs[index].attr != -1; ++index) {
+ EGLint value;
+ if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) {
+- qDebug("\t%s: %d", attrs[index].name, (int)value);
++ qWarning("\t%s: %d\n", attrs[index].name, (int)value);
+ }
+ }
++
++ qWarning("\n");
+ }
+
+ #ifdef Q_OS_LINUX
+diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+index eec6463..4a7c69b 100644
+--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
++++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+@@ -44,7 +44,6 @@
+ #include "qeglpbuffer_p.h"
+ #include <qpa/qplatformwindow.h>
+ #include <QOpenGLContext>
+-#include <QDebug>
+
+ QT_BEGIN_NAMESPACE
+
+@@ -192,12 +191,6 @@ void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLCont
+ return;
+ }
+
+- static const bool printConfig = qgetenv("QT_QPA_EGLFS_DEBUG").toInt();
+- if (printConfig) {
+- qDebug() << "Created context for format" << format << "with config:";
+- q_printEglConfig(m_eglDisplay, m_eglConfig);
+- }
+-
+ #ifndef QT_NO_OPENGL
+ // Make the context current to ensure the GL version query works. This needs a surface too.
+ const EGLint pbufferAttributes[] = {
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch b/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch
deleted file mode 100644
index 92785e4..0000000
--- a/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 84756d94c73885803ad8044099ab47c0c49b5076 Mon Sep 17 00:00:00 2001
-From: Laszlo Agocs <laszlo.agocs@digia.com>
-Date: Thu, 23 Jan 2014 11:45:22 +0100
-Subject: [PATCH] eglfs: Fix quad coordinates
-
-Prevent artifacts on raster windows by properly mapping
-the coordinates to [-1,1].
-
-Upstream-Status: Backport
-
-Task-number: QTBUG-36370
-Change-Id: I95d0d03952f597ef4ce6a950c6533a3af2df964a
-Reviewed-by: Andy Nichols <andy.nichols@digia.com>
-Signed-off-by: Jonathan Liu <net147@gmail.com>
----
- src/plugins/platforms/eglfs/qeglfscompositor.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/platforms/eglfs/qeglfscompositor.cpp b/src/plugins/platforms/eglfs/qeglfscompositor.cpp
-index 845bb5b..1efc4f7 100644
---- a/src/plugins/platforms/eglfs/qeglfscompositor.cpp
-+++ b/src/plugins/platforms/eglfs/qeglfscompositor.cpp
-@@ -153,10 +153,11 @@ void QEglFSCompositor::render(QEglFSWindow *window, uint texture, bool raster)
- QPoint tl = r.topLeft();
- QPoint br = r.bottomRight();
-
-+ // Map to [-1,1]
- GLfloat x1 = (tl.x() / sr.width()) * 2 - 1;
-- GLfloat x2 = (br.x() / sr.width()) * 2 - 1;
- GLfloat y1 = ((sr.height() - tl.y()) / sr.height()) * 2 - 1;
-- GLfloat y2 = ((sr.height() - br.y()) / sr.height()) * 2 - 1;
-+ GLfloat x2 = ((br.x() + 1) / sr.width()) * 2 - 1;
-+ GLfloat y2 = ((sr.height() - (br.y() + 1)) / sr.height()) * 2 - 1;
-
- if (!raster)
- qSwap(y1, y2);
---
-1.7.1
-
diff --git a/recipes-qt/qt5/qtbase_5.2.1.bb b/recipes-qt/qt5/qtbase_5.2.1.bb
deleted file mode 100644
index 4257367..0000000
--- a/recipes-qt/qt5/qtbase_5.2.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI += "file://0015-Fix-linuxfb-argument-mmsize-parsing.patch"
-
-SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b"
-SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0"
diff --git a/recipes-qt/qt5/qtbase_5.3.0.bb b/recipes-qt/qt5/qtbase_5.3.0.bb
new file mode 100644
index 0000000..95d3af7
--- /dev/null
+++ b/recipes-qt/qt5/qtbase_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "4bc43a72e1b3d804171e5b52640e8d96"
+SRC_URI[sha256sum] = "07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab"
diff --git a/recipes-qt/qt5/qtconnectivity.inc b/recipes-qt/qt5/qtconnectivity.inc
index c0a5147..a5fbb0c 100644
--- a/recipes-qt/qt5/qtconnectivity.inc
+++ b/recipes-qt/qt5/qtconnectivity.inc
@@ -11,3 +11,9 @@ do_configure_prepend() {
}
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'bluez4', 'CONFIG+=OE_BLUEZ_ENABLED', '', d)}"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtconnectivity_5.2.1.bb b/recipes-qt/qt5/qtconnectivity_5.2.1.bb
deleted file mode 100644
index 6fd0c7b..0000000
--- a/recipes-qt/qt5/qtconnectivity_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "cb2ef624b28b6ba61d6a467b8b3c314a"
-SRC_URI[sha256sum] = "ec31e1c3cd5aea4d7dff946802a7fde2599bb8a1931d4bb49cb0854371cf1223"
diff --git a/recipes-qt/qt5/qtconnectivity_5.3.0.bb b/recipes-qt/qt5/qtconnectivity_5.3.0.bb
new file mode 100644
index 0000000..2fb3f09
--- /dev/null
+++ b/recipes-qt/qt5/qtconnectivity_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "46e4e8df94b4da4415aa5f5076b8bc45"
+SRC_URI[sha256sum] = "d83555be4fc805afe9ef307cf8633d9c0cebc678042e384b24e0aa61d7bc1d02"
diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc
index 4a186fd..bdb1de9 100644
--- a/recipes-qt/qt5/qtdeclarative.inc
+++ b/recipes-qt/qt5/qtdeclarative.inc
@@ -2,8 +2,15 @@ require qt5.inc
SRC_URI += " \
file://0001-qmltestexample-fix-link.patch \
+ file://0002-Fix-improper-antialiasing-property-behavior.patch \
"
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
+
DEPENDS += "qtbase"
PACKAGECONFIG ??= "qtxmlpatterns"
diff --git a/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch b/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch
new file mode 100644
index 0000000..821149f
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch
@@ -0,0 +1,60 @@
+From 009ad875f89d7d7bc4447e18c2fbbd485a75e0b5 Mon Sep 17 00:00:00 2001
+From: Oleg Shparber <trollixx@gmail.com>
+Date: Mon, 19 May 2014 00:53:39 -0700
+Subject: [PATCH] Fix improper antialiasing property behavior
+
+For components antialiased by default the property was returned
+as false if default true value was set to true again.
+
+Upstream-Status: Backport
+
+Task-number: QTBUG-39047
+Change-Id: I16960a12b6d38a0d9e487fc6612610c39c4949d4
+Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
+Signed-off-by: Jonathan Liu <net147@gmail.com>
+---
+ src/quick/items/qquickitem.cpp | 8 +++++---
+ tests/auto/quick/qquicktext/tst_qquicktext.cpp | 7 +++++++
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
+index 3f0dae8..ef2eac4 100644
+--- a/src/quick/items/qquickitem.cpp
++++ b/src/quick/items/qquickitem.cpp
+@@ -5691,10 +5691,12 @@ void QQuickItem::setAntialiasing(bool aa)
+ {
+ Q_D(QQuickItem);
+
+- bool changed = (aa != antialiasing());
+- d->antialiasingValid = true;
++ if (!d->antialiasingValid) {
++ d->antialiasingValid = true;
++ d->antialiasing = d->implicitAntialiasing;
++ }
+
+- if (!changed)
++ if (aa == d->antialiasing)
+ return;
+
+ d->antialiasing = aa;
+diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+index 0b69981..d36c55d 100644
+--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
++++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+@@ -1334,6 +1334,13 @@ void tst_qquicktext::antialiasing()
+ text->resetAntialiasing();
+ QCOMPARE(text->antialiasing(), true);
+ QCOMPARE(spy.count(), 2);
++
++ // QTBUG-39047
++ component.setData("import QtQuick 2.0\n Text { antialiasing: true }", QUrl());
++ object.reset(component.create());
++ text = qobject_cast<QQuickText *>(object.data());
++ QVERIFY(text);
++ QCOMPARE(text->antialiasing(), true);
+ }
+
+ void tst_qquicktext::weight()
+--
+1.9.3
+
diff --git a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
deleted file mode 100644
index 5643634..0000000
--- a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a13535b21b8406d65c8f139306d8324bda05443b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com>
-Date: Wed, 5 Jun 2013 19:23:32 +0200
-Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions
-
-Viewport is calculated wrong for horizontal layout in a second instance
-
-Task-number: QTBUG-29944
-Task-Number: QTBUG-31546
-
-Upstream-Status: Pending
-
-Looks like backport of https://codereview.qt-project.org/49226 but this
-one was applied in previous patch, this change looks the same but is
-in different part of qquickitemview.cpp and ISN'T applied yet in dev
-branch.
-
-Signed-off-by: Florian Haenel <florian.haenel@lge.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
-Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe
----
- src/quick/items/qquickitemview.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
-index d7b9847..a54d282 100644
---- a/src/quick/items/qquickitemview.cpp
-+++ b/src/quick/items/qquickitemview.cpp
-@@ -1835,7 +1835,7 @@ void QQuickItemViewPrivate::layout()
-
- prepareVisibleItemTransitions();
-
-- QRectF viewBounds(0, position(), q->width(), q->height());
-+ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height());
- for (QList<FxViewItem*>::Iterator it = releasePendingTransition.begin();
- it != releasePendingTransition.end(); ) {
- FxViewItem *item = *it;
---
-1.8.5.3
-
diff --git a/recipes-qt/qt5/qtdeclarative_5.2.1.bb b/recipes-qt/qt5/qtdeclarative_5.2.1.bb
deleted file mode 100644
index eaa90ba..0000000
--- a/recipes-qt/qt5/qtdeclarative_5.2.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI += " \
- file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
-"
-
-SRC_URI[md5sum] = "a23fba03a4b48f36fe8b51d326d08acc"
-SRC_URI[sha256sum] = "7e32b8d6e1d64ca4bdfa92d15f9b4217a1b24239ef40e8826eeccbe918866690"
diff --git a/recipes-qt/qt5/qtdeclarative_5.3.0.bb b/recipes-qt/qt5/qtdeclarative_5.3.0.bb
new file mode 100644
index 0000000..6725b57
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "9e29d2b481c771ce5c798a3319835673"
+SRC_URI[sha256sum] = "fab07eb4f4b2091e1d88b27b84ac49d7e8daaa1eb72fd62e602ee9ac3ed7f42f"
diff --git a/recipes-qt/qt5/qtgraphicaleffects.inc b/recipes-qt/qt5/qtgraphicaleffects.inc
index 2ced3c2..8610c34 100644
--- a/recipes-qt/qt5/qtgraphicaleffects.inc
+++ b/recipes-qt/qt5/qtgraphicaleffects.inc
@@ -3,3 +3,9 @@ require qt5.inc
DEPENDS += "qtdeclarative"
RDEPENDS_${PN}-dev = ""
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb b/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb
deleted file mode 100644
index 4d5673b..0000000
--- a/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "8dde8593750e33a79f49c5a2f03caf0c"
-SRC_URI[sha256sum] = "5abb17ee60d68cf49c4f8f0b69c3f1e4d0a2f7b32cda8d6901d9c35447cc3482"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.3.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.3.0.bb
new file mode 100644
index 0000000..f63e05a
--- /dev/null
+++ b/recipes-qt/qt5/qtgraphicaleffects_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "a4170d057978794c2c3c477e841a0e08"
+SRC_URI[sha256sum] = "3f95fb603fb3c7fbb54587b3dfe423491e058fd61af2d7371b1f12881cff20c1"
diff --git a/recipes-qt/qt5/qtimageformats.inc b/recipes-qt/qt5/qtimageformats.inc
index f90e58a..b5edf1b 100644
--- a/recipes-qt/qt5/qtimageformats.inc
+++ b/recipes-qt/qt5/qtimageformats.inc
@@ -2,3 +2,9 @@ require qt5.inc
DEPENDS += "qtbase tiff"
ALLOW_EMPTY_${PN} = "1"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtimageformats_5.2.1.bb b/recipes-qt/qt5/qtimageformats_5.2.1.bb
deleted file mode 100644
index 2d24ce7..0000000
--- a/recipes-qt/qt5/qtimageformats_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "9b88aa6f3888c7c7f5253c147ae4bf8f"
-SRC_URI[sha256sum] = "a6a0454769566fec1757fb09b1f33c9fc70d4016acbb04ebc6e493ddedfef124"
diff --git a/recipes-qt/qt5/qtimageformats_5.3.0.bb b/recipes-qt/qt5/qtimageformats_5.3.0.bb
new file mode 100644
index 0000000..509d815
--- /dev/null
+++ b/recipes-qt/qt5/qtimageformats_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "90c751ffe23c005eb411d1f081bf116d"
+SRC_URI[sha256sum] = "f3b895847d27eaa98979ad146e6c0f46f38e23471a87ef496b8b777c578db2dc"
diff --git a/recipes-qt/qt5/qtlocation.inc b/recipes-qt/qt5/qtlocation.inc
index 41f2d19..a35b0fa 100644
--- a/recipes-qt/qt5/qtlocation.inc
+++ b/recipes-qt/qt5/qtlocation.inc
@@ -18,3 +18,9 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtlocation_5.2.1.bb b/recipes-qt/qt5/qtlocation_5.2.1.bb
deleted file mode 100644
index f920e2c..0000000
--- a/recipes-qt/qt5/qtlocation_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "4de8ca8ac1a3e5db20a903286fb78840"
-SRC_URI[sha256sum] = "9543fcdcab5cf02be60e395e8145e1ec87d03a3d1f129a0dde92102283a9b536"
diff --git a/recipes-qt/qt5/qtlocation_5.3.0.bb b/recipes-qt/qt5/qtlocation_5.3.0.bb
new file mode 100644
index 0000000..4af556f
--- /dev/null
+++ b/recipes-qt/qt5/qtlocation_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "bfc7678bfe7d78f12fb20a54ac54e610"
+SRC_URI[sha256sum] = "ca34224a8aa5e6f81c04cbeb05ecc440b82cf27ac24f7c2b1d297a3497110414"
diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc
index 3b7e568..119d61a 100644
--- a/recipes-qt/qt5/qtmultimedia.inc
+++ b/recipes-qt/qt5/qtmultimedia.inc
@@ -15,3 +15,9 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtmultimedia_5.2.1.bb b/recipes-qt/qt5/qtmultimedia_5.2.1.bb
deleted file mode 100644
index fc823a6..0000000
--- a/recipes-qt/qt5/qtmultimedia_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "26dc22c59fbbad9fdf0699d5f887166a"
-SRC_URI[sha256sum] = "62688cb7d8daa4d7050353fe39536c5edd97228a10185b9662a29b8c8cff1fa2"
diff --git a/recipes-qt/qt5/qtmultimedia_5.3.0.bb b/recipes-qt/qt5/qtmultimedia_5.3.0.bb
new file mode 100644
index 0000000..4d72587
--- /dev/null
+++ b/recipes-qt/qt5/qtmultimedia_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "921f4596ca39b78851663369db0bbcee"
+SRC_URI[sha256sum] = "9f30b9f0f758c44db4743d2de409cfa0aef297bc6b81c929b1875dfb638d517b"
diff --git a/recipes-qt/qt5/qtquick1.inc b/recipes-qt/qt5/qtquick1.inc
index a9ec211..0c690b2 100644
--- a/recipes-qt/qt5/qtquick1.inc
+++ b/recipes-qt/qt5/qtquick1.inc
@@ -2,3 +2,9 @@ require qt5.inc
DEPENDS += "qtscript qtsvg qtxmlpatterns qtwebkit"
# qttools
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtquick1_5.2.1.bb b/recipes-qt/qt5/qtquick1_5.2.1.bb
deleted file mode 100644
index 7563bc6..0000000
--- a/recipes-qt/qt5/qtquick1_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "6abbf131adffdf3cba63704d5d35f921"
-SRC_URI[sha256sum] = "8b2bb3250b9e09a4c568069bc4c7cfeddbdcda50b24f0bfecc7f85df3120ff65"
diff --git a/recipes-qt/qt5/qtquick1_5.3.0.bb b/recipes-qt/qt5/qtquick1_5.3.0.bb
new file mode 100644
index 0000000..bf6e8df
--- /dev/null
+++ b/recipes-qt/qt5/qtquick1_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "cd6ffd4a29f7050f71670e7afec09e5d"
+SRC_URI[sha256sum] = "74b03938df58e7825b0e46efb8266ac8d53741fff1c467b5b1fbfe2f3b840b68"
diff --git a/recipes-qt/qt5/qtquickcontrols.inc b/recipes-qt/qt5/qtquickcontrols.inc
index 2ced3c2..8610c34 100644
--- a/recipes-qt/qt5/qtquickcontrols.inc
+++ b/recipes-qt/qt5/qtquickcontrols.inc
@@ -3,3 +3,9 @@ require qt5.inc
DEPENDS += "qtdeclarative"
RDEPENDS_${PN}-dev = ""
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtquickcontrols_5.2.1.bb b/recipes-qt/qt5/qtquickcontrols_5.2.1.bb
deleted file mode 100644
index 2c09e44..0000000
--- a/recipes-qt/qt5/qtquickcontrols_5.2.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "027bc7d05fe740b21284dc909c9f11ac"
-SRC_URI[sha256sum] = "eb03a69402576984d588923e994c3cb672d8479ac9b68ed90da15d0c2fd82aac"
-
diff --git a/recipes-qt/qt5/qtquickcontrols_5.3.0.bb b/recipes-qt/qt5/qtquickcontrols_5.3.0.bb
new file mode 100644
index 0000000..365d511
--- /dev/null
+++ b/recipes-qt/qt5/qtquickcontrols_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "808b5a28f152f1af19dad30a10e5dbf1"
+SRC_URI[sha256sum] = "b8df0d64b69e765971fd6c71d8f0c4f7aabec73343a98225a4655a0b8b82df1c"
diff --git a/recipes-qt/qt5/qtscript.inc b/recipes-qt/qt5/qtscript.inc
index bbb05a6..73f5898 100644
--- a/recipes-qt/qt5/qtscript.inc
+++ b/recipes-qt/qt5/qtscript.inc
@@ -1,3 +1,9 @@
require qt5.inc
DEPENDS += "qtbase"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtscript_5.2.1.bb b/recipes-qt/qt5/qtscript_5.2.1.bb
deleted file mode 100644
index 4617c09..0000000
--- a/recipes-qt/qt5/qtscript_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "b8af09bb297d4c62e64df5418fe99dc9"
-SRC_URI[sha256sum] = "6621350d5eff65cb6f9853247246f30a2d4cdb465c14923ff7ccbd8c3a9cdefa"
diff --git a/recipes-qt/qt5/qtscript_5.3.0.bb b/recipes-qt/qt5/qtscript_5.3.0.bb
new file mode 100644
index 0000000..6065e6b
--- /dev/null
+++ b/recipes-qt/qt5/qtscript_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "4f755c8810946246adcfbaa74fafae62"
+SRC_URI[sha256sum] = "a86067103ffb4c307619aeaef68fbe25e7219ffd34b369e445cdd4deb4108390"
diff --git a/recipes-qt/qt5/qtsensors.inc b/recipes-qt/qt5/qtsensors.inc
index b2147f1..550398e 100644
--- a/recipes-qt/qt5/qtsensors.inc
+++ b/recipes-qt/qt5/qtsensors.inc
@@ -1,3 +1,9 @@
require qt5.inc
DEPENDS += "qtbase qtdeclarative"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtsensors_5.2.1.bb b/recipes-qt/qt5/qtsensors_5.2.1.bb
deleted file mode 100644
index 1f340d0..0000000
--- a/recipes-qt/qt5/qtsensors_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "045f98acba9fba0358a6a50356be0841"
-SRC_URI[sha256sum] = "09403e7e088f30da828e452559a6904d7c43420d423a429d6529285f99b1e407"
diff --git a/recipes-qt/qt5/qtsensors_5.3.0.bb b/recipes-qt/qt5/qtsensors_5.3.0.bb
new file mode 100644
index 0000000..03df1fc
--- /dev/null
+++ b/recipes-qt/qt5/qtsensors_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "3f8c7e7ed87785d8c1fbab4fec6f458d"
+SRC_URI[sha256sum] = "dde4d55635e616406adaf8e100dc468ccdd296c6589eff1208f0dce0ffc597c1"
diff --git a/recipes-qt/qt5/qtserialport_5.2.1.bb b/recipes-qt/qt5/qtserialport_5.2.1.bb
deleted file mode 100644
index 806e7ee..0000000
--- a/recipes-qt/qt5/qtserialport_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "2993ad7e92a0b6b41e3cb0e0e345d251"
-SRC_URI[sha256sum] = "f5754e4ba61843b7dfdf946a91b7d857a5cb470608b840f92452e72f24c67347"
diff --git a/recipes-qt/qt5/qtserialport_5.3.0.bb b/recipes-qt/qt5/qtserialport_5.3.0.bb
new file mode 100644
index 0000000..0df68e4
--- /dev/null
+++ b/recipes-qt/qt5/qtserialport_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "393a352f82f1f0000157834751a29578"
+SRC_URI[sha256sum] = "772d230019c52452dc661e864debf1fd520460bddce8d8abda70a4dcc00e8d5f"
diff --git a/recipes-qt/qt5/qtsvg.inc b/recipes-qt/qt5/qtsvg.inc
index bbb05a6..73f5898 100644
--- a/recipes-qt/qt5/qtsvg.inc
+++ b/recipes-qt/qt5/qtsvg.inc
@@ -1,3 +1,9 @@
require qt5.inc
DEPENDS += "qtbase"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtsvg_5.2.1.bb b/recipes-qt/qt5/qtsvg_5.2.1.bb
deleted file mode 100644
index d12bd83..0000000
--- a/recipes-qt/qt5/qtsvg_5.2.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "3f5487fe2bd5024f18f63a8d0eb4294d"
-SRC_URI[sha256sum] = "788f69557ff6d28073d6ef2b3300b42b987fba1d122f7884ba0269023cab44ef"
-
diff --git a/recipes-qt/qt5/qtsvg_5.3.0.bb b/recipes-qt/qt5/qtsvg_5.3.0.bb
new file mode 100644
index 0000000..77b591b
--- /dev/null
+++ b/recipes-qt/qt5/qtsvg_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "a35e2df8ff2d6b99e4b33443165359f4"
+SRC_URI[sha256sum] = "8006ca1cb13844772ac2926e662ab7a0eb16cb26157954cd415e0f6d641b4ed0"
diff --git a/recipes-qt/qt5/qttools-native_5.2.1.bb b/recipes-qt/qt5/qttools-native_5.2.1.bb
deleted file mode 100644
index d186a21..0000000
--- a/recipes-qt/qt5/qttools-native_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b"
-SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5"
diff --git a/recipes-qt/qt5/qttools-native_5.3.0.bb b/recipes-qt/qt5/qttools-native_5.3.0.bb
new file mode 100644
index 0000000..d3956a7
--- /dev/null
+++ b/recipes-qt/qt5/qttools-native_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "628a91ddfe34efc6622fdba8c6348855"
+SRC_URI[sha256sum] = "f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250"
diff --git a/recipes-qt/qt5/qttools.inc b/recipes-qt/qt5/qttools.inc
index 0192f22..d4d8017 100644
--- a/recipes-qt/qt5/qttools.inc
+++ b/recipes-qt/qt5/qttools.inc
@@ -6,4 +6,10 @@ SRC_URI += " \
file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \
"
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
+
FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples"
diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
index 49f296d..0479bec 100644
--- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
@@ -1,4 +1,4 @@
-From a5150c9701d5b2e6c77e521544034ea732d2266b Mon Sep 17 00:00:00 2001
+From 5eb3dd427bca8bbc13b7554e8e21993b2fc708e7 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.jansa@gmail.com>
Date: Wed, 11 Sep 2013 18:30:08 +0200
Subject: [PATCH 1/2] Allow to build only lrelease + lupdate + lconvert
@@ -14,9 +14,9 @@ Signed-off-by: Martin Jansa <Martin.jansa@gmail.com>
examples/examples.pro | 4 ++--
src/designer/src/src.pro | 16 +++++++++-------
src/linguist/linguist.pro | 2 +-
- src/src.pro | 10 ++++++----
- tests/auto/auto.pro | 22 ++++++++++++----------
- 5 files changed, 30 insertions(+), 24 deletions(-)
+ src/src.pro | 14 ++++++++------
+ tests/auto/auto.pro | 24 +++++++++++++-----------
+ 5 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/examples/examples.pro b/examples/examples.pro
index 4955969..8e86419 100644
@@ -61,7 +61,7 @@ index e02ca8e..49527c5 100644
components \
designer \
diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
-index 2979a23..663bdd5 100644
+index 3a70580..a977878 100644
--- a/src/linguist/linguist.pro
+++ b/src/linguist/linguist.pro
@@ -3,7 +3,7 @@ SUBDIRS = \
@@ -74,7 +74,7 @@ index 2979a23..663bdd5 100644
qtNomakeTools( \
linguist \
diff --git a/src/src.pro b/src/src.pro
-index 866a199..ec08874 100644
+index a07a3bb..4c6b463 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -4,10 +4,12 @@ qtHaveModule(widgets) {
@@ -82,7 +82,7 @@ index 866a199..ec08874 100644
message("Some graphics-related tools are unavailable without PNG support")
} else {
- SUBDIRS = assistant \
-+ !linguistonly {
++ !linguistonly {
+ SUBDIRS = assistant \
pixeltool \
- qtestlib \
@@ -93,6 +93,15 @@ index 866a199..ec08874 100644
# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
linguist.depends = designer
+@@ -15,7 +17,7 @@ qtHaveModule(widgets) {
+ }
+
+ SUBDIRS += linguist
+-if(!android|android_app):!ios: SUBDIRS += qtpaths
++!linguistonly:if(!android|android_app):!ios: SUBDIRS += qtpaths
+
+ mac {
+ SUBDIRS += macdeployqt
@@ -25,7 +27,7 @@ android {
SUBDIRS += androiddeployqt
}
@@ -101,12 +110,18 @@ index 866a199..ec08874 100644
+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus
win32|winrt:SUBDIRS += windeployqt
+ winrt:SUBDIRS += winrtrunner qtd3dservice
+@@ -36,4 +38,4 @@ qtNomakeTools( \
+ macdeployqt \
+ )
+-!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
++!linguistonly:!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
-index eaf440b..1778ad1 100644
+index c3acfe3..f2f88f7 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
-@@ -1,14 +1,16 @@
+@@ -1,15 +1,17 @@
TEMPLATE=subdirs
-SUBDIRS=\
- linguist \
@@ -117,7 +132,8 @@ index eaf440b..1778ad1 100644
- qhelpindexmodel \
- qhelpprojectdata \
- cmake \
-- installed_cmake
+- installed_cmake \
+- qtdiag
+!linguistonly {
+ SUBDIRS=\
+ linguist \
@@ -129,10 +145,11 @@ index eaf440b..1778ad1 100644
+ qhelpprojectdata \
+ cmake \
+ installed_cmake
++ qtdiag
+}
installed_cmake.depends = cmake
--
-1.8.5.3
+1.9.3
diff --git a/recipes-qt/qt5/qttools_5.2.1.bb b/recipes-qt/qt5/qttools_5.2.1.bb
deleted file mode 100644
index d186a21..0000000
--- a/recipes-qt/qt5/qttools_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b"
-SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5"
diff --git a/recipes-qt/qt5/qttools_5.3.0.bb b/recipes-qt/qt5/qttools_5.3.0.bb
new file mode 100644
index 0000000..d3956a7
--- /dev/null
+++ b/recipes-qt/qt5/qttools_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "628a91ddfe34efc6622fdba8c6348855"
+SRC_URI[sha256sum] = "f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250"
diff --git a/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb b/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb
deleted file mode 100644
index c16f91c..0000000
--- a/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "ddad7d00ebd201a750242bd67b20ecf3"
-SRC_URI[sha256sum] = "d5ecff99b4d35bc5f184503cabc394a554be48c368aba140f95019501645a7f5"
diff --git a/recipes-qt/qt5/qtwebkit-examples_5.3.0.bb b/recipes-qt/qt5/qtwebkit-examples_5.3.0.bb
new file mode 100644
index 0000000..d1400fd
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit-examples_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "4ab24c0bf04f21207a48f261ce0d7943"
+SRC_URI[sha256sum] = "7e491050000c9608bf36f78bb3db5938b92e0dce89d686d903c85dc8fdadef38"
diff --git a/recipes-qt/qt5/qtwebkit_5.2.1.bb b/recipes-qt/qt5/qtwebkit_5.2.1.bb
deleted file mode 100644
index ef166f2..0000000
--- a/recipes-qt/qt5/qtwebkit_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "a20d99a1c2afbd6a7c6f54e615f1bd63"
-SRC_URI[sha256sum] = "ac089723489ee9146020bd8fc715358249d8cea7f2a2e92a692e2a5595a46b5c"
diff --git a/recipes-qt/qt5/qtwebkit_5.3.0.bb b/recipes-qt/qt5/qtwebkit_5.3.0.bb
new file mode 100644
index 0000000..6e4b001
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "cc9197eaef9e7950e907635f9bde1e98"
+SRC_URI[sha256sum] = "ceb1aeeede1febddbc10c5c23e6bcb18a90a5eb4d162d6f0b5075ff4ff3ba335"
diff --git a/recipes-qt/qt5/qtx11extras_5.2.1.bb b/recipes-qt/qt5/qtx11extras_5.2.1.bb
deleted file mode 100644
index b619a4d..0000000
--- a/recipes-qt/qt5/qtx11extras_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "ad94a2f14afc3f2dfe9743027860c28a"
-SRC_URI[sha256sum] = "4f62647772d37d27921a77caf6e02c51fb207c5a1d604b0b3047a92d0163d4b9"
--git a/recipes-qt/qt5/qtx11extras_5.3.0.bb b/recipes-qt/qt5/qtx11extras_5.3.0.bb
new file mode 100644
index 0000000..61b5814
--- /dev/null
+++ b/recipes-qt/qt5/qtx11extras_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "83fc516c7f6ab82599b3f6e46744cb85"
+SRC_URI[sha256sum] = "92d1c051294d92a250a405c120673721865b37d8f5db4eaac4b3f7fe46707719"
diff --git a/recipes-qt/qt5/qtxmlpatterns.inc b/recipes-qt/qt5/qtxmlpatterns.inc
index bbb05a6..73f5898 100644
--- a/recipes-qt/qt5/qtxmlpatterns.inc
+++ b/recipes-qt/qt5/qtxmlpatterns.inc
@@ -1,3 +1,9 @@
require qt5.inc
DEPENDS += "qtbase"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb b/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb
deleted file mode 100644
index ab5570c..0000000
--- a/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "d01c6b837db4a6dee69a3f0352b37e18"
-SRC_URI[sha256sum] = "bed7b5edd8efc3d5b45c60b5ed949aec6a4daadb5f3bd9029467e90c4ef566d2"
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.3.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.3.0.bb
new file mode 100644
index 0000000..754350f
--- /dev/null
+++ b/recipes-qt/qt5/qtxmlpatterns_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "68c6e1311ecf8727368961739243d3b2"
+SRC_URI[sha256sum] = "ac66c182f28a3909dc939a111d2bf701056f6c68cecde54074c9c34637cdc988"
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-qt5][PATCH 3/5] qtenginio, qtwebsockets: Add 2 new modules and include them in packagegroup-qt5-toolchain-target
2014-06-04 9:56 [meta-qt5][PATCH 1/5] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
2014-06-04 9:56 ` [meta-qt5][PATCH 2/5] qt5: upgrade from 5.2.1 to 5.3.0 Martin Jansa
@ 2014-06-04 9:56 ` Martin Jansa
2014-06-04 23:45 ` Otavio Salvador
2014-06-04 9:56 ` [meta-qt5][PATCH 4/5] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
` (2 subsequent siblings)
4 siblings, 1 reply; 16+ messages in thread
From: Martin Jansa @ 2014-06-04 9:56 UTC (permalink / raw)
To: openembedded-devel
From: Jonathan Liu <net147@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 6 ++++++
recipes-qt/qt5/qtenginio.inc | 8 ++++++++
recipes-qt/qt5/qtenginio_1.0.4.bb | 7 +++++++
recipes-qt/qt5/qtenginio_git.bb | 6 ++++++
recipes-qt/qt5/qtwebsockets.inc | 6 ++++++
recipes-qt/qt5/qtwebsockets_5.3.0.bb | 5 +++++
recipes-qt/qt5/qtwebsockets_git.bb | 6 ++++++
7 files changed, 44 insertions(+)
create mode 100644 recipes-qt/qt5/qtenginio.inc
create mode 100644 recipes-qt/qt5/qtenginio_1.0.4.bb
create mode 100644 recipes-qt/qt5/qtenginio_git.bb
create mode 100644 recipes-qt/qt5/qtwebsockets.inc
create mode 100644 recipes-qt/qt5/qtwebsockets_5.3.0.bb
create mode 100644 recipes-qt/qt5/qtwebsockets_git.bb
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index b2c5474..18ecb4d 100644
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -56,6 +56,9 @@ RDEPENDS_${PN} += " \
qtdeclarative-plugins \
qtdeclarative-qmlplugins \
qtdeclarative-staticdev \
+ qtenginio-dev \
+ qtenginio-mkspecs \
+ qtenginio-qmlplugins \
qtgraphicaleffects-qmlplugins \
qtimageformats-dev \
qtimageformats-plugins \
@@ -84,6 +87,9 @@ RDEPENDS_${PN} += " \
${@base_contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \
${@base_contains('BBFILE_COLLECTIONS', 'ruby-layer', '${USE_RUBY}', '', d)} \
${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \
+ qtwebsockets-dev \
+ qtwebsockets-mkspecs \
+ qtwebsockets-qmlplugins \
qtxmlpatterns-dev \
qtxmlpatterns-mkspecs \
"
diff --git a/recipes-qt/qt5/qtenginio.inc b/recipes-qt/qt5/qtenginio.inc
new file mode 100644
index 0000000..5b74a35
--- /dev/null
+++ b/recipes-qt/qt5/qtenginio.inc
@@ -0,0 +1,8 @@
+require qt5.inc
+
+DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
+
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=66c98a57685a93d9adf4815b0d11827a \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6"
+LICENSE = "LGPL-2.1 | GPL-3.0"
diff --git a/recipes-qt/qt5/qtenginio_1.0.4.bb b/recipes-qt/qt5/qtenginio_1.0.4.bb
new file mode 100644
index 0000000..af059da
--- /dev/null
+++ b/recipes-qt/qt5/qtenginio_1.0.4.bb
@@ -0,0 +1,7 @@
+QT_VERSION = "5.3.0"
+
+require qt5-${QT_VERSION}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "5870a3c01bbe175ed577f0c3f51f3f33"
+SRC_URI[sha256sum] = "090f6f7a22a197fd5cd9acdb3f79fa0361d1662abed1c450fc9db67c089745d4"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
new file mode 100644
index 0000000..3960bd2
--- /dev/null
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -0,0 +1,6 @@
+require qt5-git.inc
+require ${PN}.inc
+
+QT_MODULE_BRANCH = "release"
+# v1.0.4
+SRCREV = "bb55ab0eed452704e4ce52faf8e5337674c3b668"
diff --git a/recipes-qt/qt5/qtwebsockets.inc b/recipes-qt/qt5/qtwebsockets.inc
new file mode 100644
index 0000000..eb442a6
--- /dev/null
+++ b/recipes-qt/qt5/qtwebsockets.inc
@@ -0,0 +1,6 @@
+require qt5.inc
+
+DEPENDS += "qtbase qtdeclarative"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"
+LICENSE = "LGPL-2.1"
diff --git a/recipes-qt/qt5/qtwebsockets_5.3.0.bb b/recipes-qt/qt5/qtwebsockets_5.3.0.bb
new file mode 100644
index 0000000..2437060
--- /dev/null
+++ b/recipes-qt/qt5/qtwebsockets_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "0ced83d5555e969f05e1ea89607ad584"
+SRC_URI[sha256sum] = "715f2e5196a29176bdb9980bf99334e5c8aefe5f4aac961d7de3c53b0a432ce6"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
new file mode 100644
index 0000000..3528ae7
--- /dev/null
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -0,0 +1,6 @@
+require qt5-git.inc
+require ${PN}.inc
+
+QT_MODULE_BRANCH = "release"
+# v5.3.0
+SRCREV = "c6dfdcdacfdd8c8190301b930caf67ad50ac09bb"
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-qt5][PATCH 4/5] recipes-git: Upgrade from latest origin/release to latest origin/stable
2014-06-04 9:56 [meta-qt5][PATCH 1/5] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
2014-06-04 9:56 ` [meta-qt5][PATCH 2/5] qt5: upgrade from 5.2.1 to 5.3.0 Martin Jansa
2014-06-04 9:56 ` [meta-qt5][PATCH 3/5] qtenginio, qtwebsockets: Add 2 new modules and include them in packagegroup-qt5-toolchain-target Martin Jansa
@ 2014-06-04 9:56 ` Martin Jansa
2014-06-04 9:56 ` [meta-qt5][PATCH 5/5] recipes-git: Use LIC_FILES_CHKSUM from .inc files Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 01/10] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
4 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2014-06-04 9:56 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
conf/distro/include/qt5-versions.inc | 9 +++-
recipes-qt/qt5/nativesdk-qtbase_git.bb | 11 ++---
recipes-qt/qt5/nativesdk-qttools_git.bb | 2 +-
recipes-qt/qt5/qt3d_git.bb | 2 +-
recipes-qt/qt5/qt5-git.inc | 2 +-
.../qtbase-git/0001-Add-linux-oe-g-platform.patch | 26 +++++++----
.../qtbase-git/0001-Fix-missing-plugin_types.patch | 30 ------------
.../0002-Add-external-hostbindir-option.patch | 53 ++++++++++------------
...o-allow-to-set-qt.conf-from-the-outside-u.patch | 8 ++--
...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 8 ++--
...fs-Print-the-chosen-config-in-debug-mode.patch} | 10 ++--
...build-uic.patch => 0006-Always-build-uic.patch} | 6 +--
...build-it-in-configure-but-allow-to-build.patch} | 12 ++---
...eserve-built-qmake-and-swap-with-native-.patch} | 11 ++---
...l-error-for-platforms-only-supporting-on.patch} | 6 +--
...mp-path-length-from-256-to-512-character.patch} | 10 ++--
...integration-Undefine-CursorShape-from-X..patch} | 6 +--
recipes-qt/qt5/qtbase-native_git.bb | 7 ++-
recipes-qt/qt5/qtbase_git.bb | 11 ++---
recipes-qt/qt5/qtconnectivity_git.bb | 2 +-
recipes-qt/qt5/qtdeclarative_git.bb | 2 +-
recipes-qt/qt5/qtenginio_git.bb | 4 +-
recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +-
recipes-qt/qt5/qtimageformats_git.bb | 2 +-
recipes-qt/qt5/qtlocation_git.bb | 2 +-
recipes-qt/qt5/qtmultimedia_git.bb | 2 +-
recipes-qt/qt5/qtquick1_git.bb | 2 +-
recipes-qt/qt5/qtquickcontrols_git.bb | 2 +-
recipes-qt/qt5/qtscript_git.bb | 2 +-
recipes-qt/qt5/qtsensors_git.bb | 2 +-
recipes-qt/qt5/qtserialport_git.bb | 2 +-
recipes-qt/qt5/qtsvg_git.bb | 2 +-
...w-to-build-only-lrelease-lupdate-lconvert.patch | 21 ++++-----
...t-help-fix-linking-of-dependent-libraries.patch | 4 +-
recipes-qt/qt5/qttools-native_git.bb | 2 +-
recipes-qt/qt5/qttools_git.bb | 2 +-
recipes-qt/qt5/qtwayland-native_git.bb | 2 +-
recipes-qt/qt5/qtwayland_git.bb | 2 +-
recipes-qt/qt5/qtwebkit-examples_git.bb | 2 +-
recipes-qt/qt5/qtwebkit_git.bb | 2 +-
recipes-qt/qt5/qtwebsockets_git.bb | 4 +-
| 2 +-
recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +-
43 files changed, 134 insertions(+), 169 deletions(-)
delete mode 100644 recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch
rename recipes-qt/qt5/qtbase-git/{0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch => 0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch} (89%)
rename recipes-qt/qt5/qtbase-git/{0008-Always-build-uic.patch => 0006-Always-build-uic.patch} (87%)
rename recipes-qt/qt5/qtbase-git/{0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch => 0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch} (82%)
rename recipes-qt/qt5/qtbase-git/{0009-configure-preserve-built-qmake-and-swap-with-native-.patch => 0007-configure-preserve-built-qmake-and-swap-with-native-.patch} (71%)
rename recipes-qt/qt5/qtbase-git/{0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch => 0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch} (94%)
rename recipes-qt/qt5/qtbase-git/{0010-configure-bump-path-length-from-256-to-512-character.patch => 0008-configure-bump-path-length-from-256-to-512-character.patch} (77%)
rename recipes-qt/qt5/qtbase-git/{0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch => 0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch} (86%)
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc
index a2cc1fc..94b0462 100644
--- a/conf/distro/include/qt5-versions.inc
+++ b/conf/distro/include/qt5-versions.inc
@@ -1,7 +1,7 @@
# Select which version you prefer by defining QT5_VERSION and including this file
-# possible values now "5.2.1", "5.2.1+git%"
+# possible values now "5.3.0", "5.3.0+git%"
-QT5_VERSION ?= "5.2.1"
+QT5_VERSION ?= "5.3.0"
PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}"
PREFERRED_VERSION_qtbase = "${QT5_VERSION}"
@@ -24,4 +24,9 @@ PREFERRED_VERSION_qttools-native = "${QT5_VERSION}"
PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}"
PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}"
PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}"
+PREFERRED_VERSION_qtwebsockets = "${QT5_VERSION}"
PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}"
+
+# qtenginio doesn't follow qt5 versioning, see https://bugreports.qt-project.org/browse/QTBUG-37791
+QT5_VERSION_QTENGINIO = "${@base_contains('QT5_VERSION', '5.3.0+git%', '${QT5_VERSION}', '1.0.4%', d)}"
+PREFERRED_VERSION_qtenginio = "${QT5_VERSION_QTENGINIO}"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index cac16a0..fb90dba 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -14,19 +14,18 @@ SRC_URI += "\
file://0002-Add-external-hostbindir-option.patch \
file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
- file://0001-Fix-missing-plugin_types.patch \
- file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
"
# common with native version
SRC_URI += " \
- file://0008-Always-build-uic.patch \
+ file://0006-Always-build-uic.patch \
"
# specific for nativesdk version
SRC_URI += " \
- file://0009-configure-preserve-built-qmake-and-swap-with-native-.patch \
- file://0010-configure-bump-path-length-from-256-to-512-character.patch \
+ file://0007-configure-preserve-built-qmake-and-swap-with-native-.patch \
+ file://0008-configure-bump-path-length-from-256-to-512-character.patch \
"
-SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
+SRCREV = "267ba8b63e0fbf02cde4d2709397ed0e12f34ee2"
diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb b/recipes-qt/qt5/nativesdk-qttools_git.bb
index cbf1672..933119c 100644
--- a/recipes-qt/qt5/nativesdk-qttools_git.bb
+++ b/recipes-qt/qt5/nativesdk-qttools_git.bb
@@ -4,7 +4,7 @@ require ${PN}.inc
# prepend this again, because ${PN}.inc prepneds ${PN}
FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
-SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
+SRCREV = "eaf069902111533f0e675ab32279bb57a5916169"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 0438dd9..2e32549 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -4,4 +4,4 @@ require ${PN}.inc
QT_MODULE_BRANCH = "master"
# last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already
-SRCREV = "36a829ad6fb44fd01f490c35e011f6fd2470ffdd"
+SRCREV = "bdb98baf8253c69949a8c259369203da9ffb269c"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 25b7a62..3e714e0 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -10,7 +10,7 @@ SRC_URI += " \
S = "${WORKDIR}/git"
-PV = "5.2.1+5.3.0-beta1+git${SRCPV}"
+PV = "5.3.0+git${SRCPV}"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
index 828f5ea..95841ce 100644
--- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
-From 237a4b0143d91c0573ecf6f9ff5e37827a14a75d Mon Sep 17 00:00:00 2001
+From e70bd40730582e5e5531fca51a1574cb306c40d3 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 15 Apr 2013 04:29:32 +0200
-Subject: [PATCH 01/10] Add linux-oe-g++ platform
+Subject: [PATCH 1/8] Add linux-oe-g++ platform
* This qmake.conf unlike other platforms reads most variables from
shell environment, because it's easier for qt recipes to export
@@ -42,16 +42,16 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- configure | 60 +++++++++++++++------
+ configure | 66 ++++++++++++++++-------
mkspecs/features/configure.prf | 4 +-
mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++
mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
- 4 files changed, 185 insertions(+), 19 deletions(-)
+ 4 files changed, 188 insertions(+), 22 deletions(-)
create mode 100644 mkspecs/linux-oe-g++/qmake.conf
create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
diff --git a/configure b/configure
-index 55d68ef..bb24a9c 100755
+index d5c2b08..4eae0d3 100755
--- a/configure
+++ b/configure
@@ -324,6 +324,16 @@ getQMakeConf()
@@ -118,7 +118,7 @@ index 55d68ef..bb24a9c 100755
# Use CC/CXX to run config.tests
mkdir -p "$outpath/config.tests"
rm -f "$outpath/config.tests/.qmake.cache"
-@@ -3139,7 +3157,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
+@@ -3140,7 +3158,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
[ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
fi
@@ -127,7 +127,7 @@ index 55d68ef..bb24a9c 100755
TEST_COMPILER=$QMAKE_CONF_COMPILER
-@@ -3174,7 +3192,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
+@@ -3175,7 +3193,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
exit 1
fi
fi
@@ -136,7 +136,7 @@ index 55d68ef..bb24a9c 100755
GCC_MACHINE_DUMP=
case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
-@@ -3632,6 +3650,14 @@ setBootstrapVariable()
+@@ -3633,6 +3651,14 @@ setBootstrapVariable()
getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
}
@@ -151,20 +151,26 @@ index 55d68ef..bb24a9c 100755
# build qmake
if true; then ###[ '!' -f "$outpath/bin/qmake" ];
echo "Creating qmake..."
-@@ -3670,11 +3696,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -3671,14 +3697,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
fi
[ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
- setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"
- setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"
- setBootstrapVariable QMAKE_CFLAGS
+- setBootstrapVariable QMAKE_CFLAGS_SPLIT_SECTIONS
- setBootstrapVariable QMAKE_CXXFLAGS
+- setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS
- setBootstrapVariable QMAKE_LFLAGS
+- setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS
+ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM"
+ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM"
+ setBootstrapEvalVariable QMAKE_CFLAGS
++ setBootstrapEvalVariable QMAKE_CFLAGS_SPLIT_SECTIONS
+ setBootstrapEvalVariable QMAKE_CXXFLAGS
++ setBootstrapEvalVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS
+ setBootstrapEvalVariable QMAKE_LFLAGS
++ setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS
if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
setBootstrapVariable QMAKE_CFLAGS_RELEASE
@@ -340,5 +346,5 @@ index 0000000..dd12003
+
+#endif // QPLATFORMDEFS_H
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch b/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch
deleted file mode 100644
index 612cbdd..0000000
--- a/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f0e01b788e86f24352ba14ad17c3f337f934467d Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Mon, 21 Apr 2014 15:09:23 +0200
-Subject: [PATCH] Fix missing plugin_types
-
-* bearer/generic was failing with:
- Project ERROR: No module claims plugin type 'bearer'
-
-Change-Id: I90848856a8b0a4df52e599983cf7dde0bc0e6623
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- mkspecs/features/qt_module_pris.prf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
-index f31bc38..415e780 100644
---- a/mkspecs/features/qt_module_pris.prf
-+++ b/mkspecs/features/qt_module_pris.prf
-@@ -177,7 +177,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
- include($$mod_work_pfx/qt_lib_$${pri}.pri)
- for(mod, mods_to_load) {
- for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \
-- name depends module_config CONFIG DEFINES sources \
-+ name depends module_config plugin_types CONFIG DEFINES sources \
- includes bins libs libexecs plugins imports qml \
- rpath_link \
- )):defined(QT.$${mod}.$$var, var):cache(QT.$${mod}.$$var, transient)
---
-1.9.1
-
diff --git a/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
index 5f9fd90..81f1867 100644
--- a/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
@@ -1,7 +1,7 @@
-From 00ad866f82f89ce938e9eaabfc50af3cde72ccfe Mon Sep 17 00:00:00 2001
+From eaa4a4c13e65e29e2214a01b69b77b9c6f2ada05 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 6 Apr 2013 13:15:07 +0200
-Subject: [PATCH 02/10] Add -external-hostbindir option
+Subject: [PATCH 2/8] Add -external-hostbindir option
* when cross-compiling it's sometimes useful to use existing tools from machine
(or in OpenEmbedded built with separate native recipe) when building for target
@@ -24,7 +24,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Simon Busch <morphis@gravedo.de>
---
configure | 15 +++++++++++++++
- mkspecs/features/qt_functions.prf | 9 ++++++++-
+ mkspecs/features/qt_functions.prf | 2 +-
mkspecs/features/qt_tool.prf | 3 +--
qmake/property.cpp | 1 +
qtbase.pro | 12 +++++++++---
@@ -34,10 +34,10 @@ Signed-off-by: Simon Busch <morphis@gravedo.de>
src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
tools/configure/configureapp.cpp | 8 ++++++++
- 11 files changed, 51 insertions(+), 13 deletions(-)
+ 11 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
-index bb24a9c..bf7c11e 100755
+index 4eae0d3..48d5119 100755
--- a/configure
+++ b/configure
@@ -777,6 +777,7 @@ QT_HOST_BINS=
@@ -48,7 +48,7 @@ index bb24a9c..bf7c11e 100755
#flags for SQL drivers
QT_CFLAGS_PSQL=
-@@ -898,6 +899,7 @@ while [ "$#" -gt 0 ]; do
+@@ -896,6 +897,7 @@ while [ "$#" -gt 0 ]; do
-testsdir| \
-hostdatadir| \
-hostbindir| \
@@ -56,7 +56,7 @@ index bb24a9c..bf7c11e 100755
-hostlibdir| \
-extprefix| \
-sysroot| \
-@@ -1112,6 +1114,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1110,6 +1112,9 @@ while [ "$#" -gt 0 ]; do
extprefix)
QT_EXT_PREFIX="$VAL"
;;
@@ -66,7 +66,7 @@ index bb24a9c..bf7c11e 100755
pkg-config)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_PKGCONFIG="$VAL"
-@@ -2250,6 +2255,10 @@ Installation options:
+@@ -2248,6 +2253,10 @@ Installation options:
-hostdatadir <dir> . Data used by qmake will be installed to <dir>
(default HOSTPREFIX)
@@ -77,7 +77,7 @@ index bb24a9c..bf7c11e 100755
Configure options:
The defaults (*) are usually acceptable. A plus (+) denotes a default value
-@@ -2914,6 +2923,11 @@ fi
+@@ -2915,6 +2924,11 @@ fi
# command line and environment validation
#-------------------------------------------------------------------------------
@@ -89,7 +89,7 @@ index bb24a9c..bf7c11e 100755
# update QT_CONFIG to show our current predefined configuration
CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
case "$CFG_QCONFIG" in
-@@ -3594,6 +3608,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
+@@ -3595,6 +3609,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
"qt_hbinpath=$QT_HOST_BINS",
"qt_hlibpath=$QT_HOST_LIBS",
"qt_hdatpath=$QT_HOST_DATA",
@@ -98,27 +98,20 @@ index bb24a9c..bf7c11e 100755
"qt_hostspec=$shortspec",
#endif
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 1dacfed..7229845 100644
+index d41fe3b..050a4a7 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
-@@ -193,7 +193,14 @@ defineTest(qtAddRpathLink) {
+@@ -193,7 +193,7 @@ defineTest(qtAddRpathLink) {
defineTest(qtPrepareTool) {
- $$1 = $$eval(QT_TOOL.$${2}.binary)
- isEmpty($$1) {
-- $$1 = $$[QT_HOST_BINS]/$$2
-+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
-+ # for some reason isEmpty does not work here, FIXME before submitting upstream
-+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
-+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
-+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
-+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
-+ $$1 = $$[QT_HOST_BINS]/$$2
-+ }
- exists($$eval($$1).pl) {
- $$1 = perl -w $$eval($$1).pl
+ cmd = $$eval(QT_TOOL.$${2}.binary)
+ isEmpty(cmd) {
+- cmd = $$[QT_HOST_BINS]/$$2
++ cmd = $$[QT_EXTERNAL_HOST_BINS]/$$2
+ exists($${cmd}.pl) {
+ cmd = perl -w $$system_path($${cmd}.pl)
} else: contains(QMAKE_HOST.os, Windows) {
diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
-index f0864f9..50bfac8 100644
+index 1d3e88c..bd44754 100644
--- a/mkspecs/features/qt_tool.prf
+++ b/mkspecs/features/qt_tool.prf
@@ -15,8 +15,7 @@ CONFIG += console
@@ -144,7 +137,7 @@ index e50485c..71291ad 100644
{ "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
};
diff --git a/qtbase.pro b/qtbase.pro
-index ed6fc39..2421f41 100644
+index d6861cf..92e6a83 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -71,16 +71,22 @@ CONFIG -= qt
@@ -273,7 +266,7 @@ index 99d87e2..5621dc0 100644
_qt5_Widgets_check_file_exists(${imported_location})
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
-index cff3f1b..540708b 100644
+index b756509..7e61845 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1213,6 +1213,13 @@ void Configure::parseCmdLine()
@@ -290,7 +283,7 @@ index cff3f1b..540708b 100644
else if (configCmdLine.at(i) == "-make-tool") {
++i;
if (i == argCount)
-@@ -3986,6 +3993,7 @@ void Configure::generateQConfigCpp()
+@@ -3983,6 +3990,7 @@ void Configure::generateQConfigCpp()
<< " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
<< " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
<< " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
@@ -299,5 +292,5 @@ index cff3f1b..540708b 100644
<< " \"qt_hostspec=" << hostSpec << "\"," << endl
<< "#endif" << endl
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index 95c67a8..4b4e47c 100644
--- a/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,8 +1,8 @@
-From 53b152be24082a2cf2497d2e687f9ee73a39d6f4 Mon Sep 17 00:00:00 2001
+From b76b34a03c3051cda5330c8ae9f5e2a26c5c4da6 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Wed, 26 Sep 2012 17:22:30 +0200
-Subject: [PATCH 03/10] qlibraryinfo: allow to set qt.conf from the outside
- using the environment
+Subject: [PATCH 3/8] qlibraryinfo: allow to set qt.conf from the outside using
+ the environment
Allow to set a qt.conf from the outside using the environment. This allows
to inject new prefixes and other paths into qmake. This is needed when using
@@ -35,5 +35,5 @@ index 3686b17..89e13cf 100644
if(!QFile::exists(qtconfig))
qtconfig = qt_libraryInfoFile();
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
index c263d09..1e5ffac 100644
--- a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -1,7 +1,7 @@
-From a39f5e64b7b5a31e7e5cd988b5f967ce6cf02990 Mon Sep 17 00:00:00 2001
+From 83205b1344e57e2cb0292cf1d276e40c7f45ca32 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 27 Apr 2013 22:33:33 +0200
-Subject: [PATCH 04/10] configureapp: Prefix default LIBDIRS and INCDIRS with
+Subject: [PATCH 4/8] configureapp: Prefix default LIBDIRS and INCDIRS with
SYSROOT
Upstream-Status: Pending
@@ -11,7 +11,7 @@ Upstream-Status: Pending
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
-index 540708b..45f4a1e 100644
+index 7e61845..29c6358 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri()
@@ -26,5 +26,5 @@ index 540708b..45f4a1e 100644
configStream << "}" << endl;
configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
similarity index 89%
rename from recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
rename to recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
index 65ebbd1..213a9c3 100644
--- a/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
+++ b/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
@@ -1,7 +1,7 @@
-From 91b185d1f4843d22d42461c0aee4cd0f5393bbc8 Mon Sep 17 00:00:00 2001
+From 22775e5f0b1097964062fbcf1805a841f971de34 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 21 Apr 2014 19:22:04 +0200
-Subject: [PATCH] Revert "eglfs: Print the chosen config in debug mode"
+Subject: [PATCH 5/8] Revert "eglfs: Print the chosen config in debug mode"
This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e.
---
@@ -10,10 +10,10 @@ This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e.
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
-index e6624fb..3870f6c 100644
+index 5eed470..39c7c1f 100644
--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
-@@ -437,9 +437,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
+@@ -451,9 +451,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
for (index = 0; attrs[index].attr != -1; ++index) {
EGLint value;
if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) {
@@ -52,5 +52,5 @@ index eec6463..4a7c69b 100644
// Make the context current to ensure the GL version query works. This needs a surface too.
const EGLint pbufferAttributes[] = {
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch
similarity index 87%
rename from recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch
rename to recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch
index fd45516..f425c3e 100644
--- a/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch
@@ -1,7 +1,7 @@
-From 4d5502114a3135f2c78eb9e63476918cbee00040 Mon Sep 17 00:00:00 2001
+From dd679f743291a924bed500a866eb05fab71c9978 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 16 Nov 2013 00:32:30 +0100
-Subject: [PATCH 08/10] Always build uic
+Subject: [PATCH 6/8] Always build uic
Even if we are not building gui or widgets. This tool is needed later
as a native tool when compiling the target.
@@ -27,5 +27,5 @@ index 6a805a6..90623a6 100644
nacl: SUBDIRS -= src_network src_testlib
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
similarity index 82%
rename from recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
rename to recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
index 395e84c..6d79acb 100644
--- a/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
+++ b/recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
@@ -1,8 +1,8 @@
-From c0c4c468cc70a367e3bb2dd4a48c31e62b3b0fa4 Mon Sep 17 00:00:00 2001
+From d8e725cb2c25a443d888fe2652f9039e79ae75ac Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Mon, 29 Oct 2012 20:07:49 -0700
-Subject: [PATCH 05/10] qmake: don't build it in configure, but allow to build
- it separately
+Subject: [PATCH 6/8] qmake: don't build it in configure, but allow to build it
+ separately
* it is already built in qtbase-native, so we don't need it in configure
* allow building a separate qmake for the target
@@ -20,10 +20,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
-index bf7c11e..5e93ce4 100755
+index 48d5119..2a42c08 100755
--- a/configure
+++ b/configure
-@@ -3674,7 +3674,7 @@ setBootstrapEvalVariable()
+@@ -3675,7 +3675,7 @@ setBootstrapEvalVariable()
# build qmake
@@ -46,5 +46,5 @@ index 89d6ea5..7c605b9 100644
VPATH += \
../src/corelib/global \
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch
similarity index 71%
rename from recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch
rename to recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch
index ddd7116..79ac5e8 100644
--- a/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch
+++ b/recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch
@@ -1,8 +1,7 @@
-From 7117e71f5e1aac3ac6e5e87852c108bbc13dc364 Mon Sep 17 00:00:00 2001
+From 3db5991e607a82403272b0ea821fc84e3c8b6d2a Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Mon, 11 Nov 2013 20:22:34 -0500
-Subject: [PATCH 09/10] configure: preserve built qmake and swap with native
- one
+Subject: [PATCH 7/8] configure: preserve built qmake and swap with native one
Let configure script build the real qmake, but right after it's built, swap
it with a native qmake for further internal use, preserving the real one.
@@ -13,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
1 file changed, 2 insertions(+)
diff --git a/configure b/configure
-index 5e93ce4..01fca8f 100755
+index 48d5119..b7aac15 100755
--- a/configure
+++ b/configure
-@@ -3821,6 +3821,8 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -3825,6 +3825,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
(cd "$outpath/qmake"; "$MAKE") || exit 2
fi # Build qmake
@@ -26,5 +25,5 @@ index 5e93ce4..01fca8f 100755
echo "Running configuration tests..."
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase-git/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
similarity index 94%
rename from recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
rename to recipes-qt/qt5/qtbase-git/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
index 21821c3..f8a789c 100644
--- a/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
+++ b/recipes-qt/qt5/qtbase-git/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
@@ -1,7 +1,7 @@
-From 2cb0f75bb9ab1e6709fe867887f9e6014a140356 Mon Sep 17 00:00:00 2001
+From cc8bd33740ee16b29e0801dbc2228314ef3cef2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 5 Feb 2014 18:35:08 +0100
-Subject: [PATCH 06/10] eglfs: fix egl error for platforms only supporting one
+Subject: [PATCH 7/8] eglfs: fix egl error for platforms only supporting one
window/surface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -68,5 +68,5 @@ index 2d36c0b..854531e 100644
if (isRaster()) {
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch
similarity index 77%
rename from recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch
rename to recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch
index 02eef9b..e5a3890 100644
--- a/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,7 +1,7 @@
-From 6afe8d5d1daf94ac64478406b5b84b6879981446 Mon Sep 17 00:00:00 2001
+From 3eabdee39cad37a4ce451486fce20680f169a0f1 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Mon, 11 Nov 2013 20:27:30 -0500
-Subject: [PATCH 10/10] configure: bump path length from 256 to 512 characters
+Subject: [PATCH 8/8] configure: bump path length from 256 to 512 characters
Increase the path length that gets hardcoded into generated config.cpp file
from 256 to 512 characters, as nativesdk path can be quite long.
@@ -12,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
-index 01fca8f..801c7c1 100755
+index b7aac15..c51f785 100755
--- a/configure
+++ b/configure
-@@ -3572,7 +3572,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
+@@ -3573,7 +3573,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`";
/* Installation Info */
@@ -25,5 +25,5 @@ index 01fca8f..801c7c1 100755
"qt_prfxpath=$QT_SYSROOT_PREFIX",
"qt_docspath=$QT_SYSROOT_DOCS",
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
similarity index 86%
rename from recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
rename to recipes-qt/qt5/qtbase-git/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
index 24ae7ea..2f4d80c 100644
--- a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
+++ b/recipes-qt/qt5/qtbase-git/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -1,7 +1,7 @@
-From 0923f72a444bcdc0675a24aec9782692b41d301c Mon Sep 17 00:00:00 2001
+From 959b2fb8d8eb5e755e3d9d3d3031b996f96fb23b Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 19 Mar 2014 18:32:28 +0100
-Subject: [PATCH 07/10] qeglplatformintegration: Undefine CursorShape from X.h
+Subject: [PATCH 8/8] qeglplatformintegration: Undefine CursorShape from X.h
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
@@ -26,5 +26,5 @@ index f665455..9eb783c 100644
class QEGLPlatformScreen;
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index bafe37b..2bb92d1 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -11,13 +11,12 @@ SRC_URI += "\
file://0002-Add-external-hostbindir-option.patch \
file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
- file://0001-Fix-missing-plugin_types.patch \
- file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
"
# specific for native version
SRC_URI += " \
- file://0008-Always-build-uic.patch \
+ file://0006-Always-build-uic.patch \
"
do_install_append() {
@@ -26,4 +25,4 @@ do_install_append() {
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
}
-SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
+SRCREV = "267ba8b63e0fbf02cde4d2709397ed0e12f34ee2"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 9bcfa79..5c3d2da 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -11,15 +11,14 @@ SRC_URI += "\
file://0002-Add-external-hostbindir-option.patch \
file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
- file://0001-Fix-missing-plugin_types.patch \
- file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
"
# target specific
SRC_URI += "\
- file://0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
- file://0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
- file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
+ file://0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
+ file://0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
+ file://0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
"
-SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
+SRCREV = "267ba8b63e0fbf02cde4d2709397ed0e12f34ee2"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index c0fd15d..52f2a2d 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -1,4 +1,4 @@
require qt5-git.inc
require ${BPN}.inc
-SRCREV = "6d9ab3981a1ae9e224b3c6a8cf107049a0ee5095"
+SRCREV = "19f10aae3d333ef6486ea1390998f0674fd4d89e"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 2d733a3..318ba44 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "aedcd57c84ac9d6b74816c13bdf3fde31e1132b5"
+SRCREV = "67a101af142355a0ca7cdc234b7ee1716a25d87c"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index 3960bd2..b7f2f79 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -1,6 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v1.0.4
-SRCREV = "bb55ab0eed452704e4ce52faf8e5337674c3b668"
+SRCREV = "07885f25ed57b98a695f28337fc4b91e611991aa"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 9347e7b..a1e9009 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "9b1883d2e90dd6ef92374d21e490a3de1c8330ba"
+SRCREV = "82abf6975b6737259ee656564e5ec7f8ad1d0508"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index b413a5f..3e04c40 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "554d617762c86964dfa074074304993ccdfbe2c9"
+SRCREV = "bcc7909dfe9d89f793919bc96abdfd6b704c4c0e"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index bab8275..fcb6993 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "27c9ffe1d2eb2103e9b420c86c6fc3d10cb1ff76"
+SRCREV = "749cdff5289412780f0bb8e351cb140ba64d85ce"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 88ca59e..f0ce24e 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "b088962950dbc4c6f0219de30b0d9a8cf47a3376"
+SRCREV = "7e668fe58fc9546eb91bbf39992566f709b5e6c2"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 7c64460..3400f47 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "c56f5d8848ce03cc6667804f815de47d2d8221fb"
+SRCREV = "26e713cddcc8a62e49ce7a3352d3b5f13ffd7d52"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index fd525f1..bab6854 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "ea9add905768a26ce86ab542615a193296642732"
+SRCREV = "82a0a8244a2edf27c196f6c8cc3e2c36a3f4a8c5"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 2deaaff..6d8fd31 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "e4453c92ee41943a3a1d67a725804a44e747f64e"
+SRCREV = "161e1fd31537f41992b3024c32b525b64be080ed"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 6e3bda6..c2ab063 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "eee2eee734b4aa735d35f6c53d79c06c1c76425a"
+SRCREV = "9efc5bea41e7acbce55c37b49b167092b71114a9"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 4619227..0755f45 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "6e75610dff5fb96ebd72cfb40ba7cbfea4bd21b7"
+SRCREV = "04a3308346190a70509a759423993f6bcc365328"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 0aa79e1..6fc617d 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "ad81f5720c4f4a1dac099cbe2f9d47ed3a9025b0"
+SRCREV = "35a2f0880831d38c60d2b4820dac808f48f6f3a8"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
index 575616b..9a31c13 100644
--- a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
@@ -1,4 +1,4 @@
-From 90a2e92062fc67fa54be0f5596606ce2bc21f772 Mon Sep 17 00:00:00 2001
+From 50fdb63c074138f783a448bc2db97b6f0ccfefea Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.jansa@gmail.com>
Date: Wed, 11 Sep 2013 18:30:08 +0200
Subject: [PATCH 1/2] Allow to build only lrelease + lupdate + lconvert
@@ -74,7 +74,7 @@ index 3a70580..a977878 100644
qtNomakeTools( \
linguist \
diff --git a/src/src.pro b/src/src.pro
-index 861d06d..3438f9a 100644
+index a486d65..393eac2 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -4,10 +4,12 @@ qtHaveModule(widgets) {
@@ -97,12 +97,12 @@ index 861d06d..3438f9a 100644
}
SUBDIRS += linguist
--!android|android_app: SUBDIRS += qtpaths
-+!linguistonly:!android|android_app: SUBDIRS += qtpaths
+-if(!android|android_app):!ios: SUBDIRS += qtpaths
++if(!android|android_app):!linguistonly:!ios: SUBDIRS += qtpaths
mac {
SUBDIRS += macdeployqt
-@@ -25,7 +27,7 @@ android {
+@@ -25,11 +27,11 @@ android {
SUBDIRS += androiddeployqt
}
@@ -111,12 +111,11 @@ index 861d06d..3438f9a 100644
win32|winrt:SUBDIRS += windeployqt
winrt:SUBDIRS += winrtrunner qtd3dservice
-@@ -36,4 +38,4 @@ qtNomakeTools( \
- macdeployqt \
- )
+-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
++!linguistonly:qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
--!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
-+!linguistonly:!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
+ qtNomakeTools( \
+ pixeltool \
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index c3acfe3..b48e711 100644
--- a/tests/auto/auto.pro
@@ -151,5 +150,5 @@ index c3acfe3..b48e711 100644
installed_cmake.depends = cmake
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
index 1c40471..eaf4694 100644
--- a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
+++ b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
@@ -1,4 +1,4 @@
-From 509541ebd648414ee33f3aea3035d1e6382bfa3c Mon Sep 17 00:00:00 2001
+From f375385c4795e3cd7df7aca2a4c769597164aaa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 17 Jan 2014 14:33:19 +0100
Subject: [PATCH 2/2] assistant/help: fix linking of dependent libraries
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644
+
+LIBS += -lQt5CLucene
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb
index 49a1907..b37e0ed 100644
--- a/recipes-qt/qt5/qttools-native_git.bb
+++ b/recipes-qt/qt5/qttools-native_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
+SRCREV = "eaf069902111533f0e675ab32279bb57a5916169"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 49a1907..b37e0ed 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
+SRCREV = "eaf069902111533f0e675ab32279bb57a5916169"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index 9fac8b2..9089f0f 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -4,7 +4,7 @@ require ${PN}.inc
# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1
-SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e"
+SRCREV = "98dca3b54f52f08117c1e0d3a1b4826ed12ef23f"
# wayland-scanner and qtwaylandscanner must be in same path to work properly
do_install_append() {
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 3f18272..ca068da 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -4,7 +4,7 @@ require ${PN}.inc
# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1
-SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
+SRCREV = "98dca3b54f52f08117c1e0d3a1b4826ed12ef23f"
SRC_URI += " \
file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 98fdc2f..f0ceb5d 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "c9d13139b65818785f218cc96d136d33591ca2f5"
+SRCREV = "bce5056b9e16a943357e362455a46685d3f22093"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index ec8b4f3..829dc77 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "0546c8656a3728bf4375da39027e096beba4f111"
+SRCREV = "a7ef31b64324fa43623e768a0798175884bd6e79"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 3528ae7..ff13986 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -1,6 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.3.0
-SRCREV = "c6dfdcdacfdd8c8190301b930caf67ad50ac09bb"
+SRCREV = "eb16b1970293dfeb5918751afbdf1fb7f62028e1"
--git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 954545f..fdb8094 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "947361a7dc8db093d0b8e1ec5ac953470a180259"
+SRCREV = "2d84caf5ef1b5dace0d678df4581db3c955be6ee"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index b86a749..fb1846c 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "d25091bb8b52455e415f8147a9100094c489a041"
+SRCREV = "e13d30be68228ccda3b6310ac44a84981b17f03b"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-qt5][PATCH 5/5] recipes-git: Use LIC_FILES_CHKSUM from .inc files
2014-06-04 9:56 [meta-qt5][PATCH 1/5] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
` (2 preceding siblings ...)
2014-06-04 9:56 ` [meta-qt5][PATCH 4/5] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
@ 2014-06-04 9:56 ` Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 01/10] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
4 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2014-06-04 9:56 UTC (permalink / raw)
To: openembedded-devel
* the old checksum was introduced in .inc files in upgrade of
tarball recipes to 5.3.0, use that until it's updated in
git recipes and then we'll have to move old checksum from .inc
to release recipe only.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes-qt/qt5/nativesdk-qttools_git.bb | 6 ------
recipes-qt/qt5/qtdeclarative_git.bb | 6 ------
recipes-qt/qt5/qtgraphicaleffects_git.bb | 6 ------
recipes-qt/qt5/qtimageformats_git.bb | 6 ------
recipes-qt/qt5/qtlocation_git.bb | 6 ------
recipes-qt/qt5/qtmultimedia_git.bb | 6 ------
recipes-qt/qt5/qtquick1_git.bb | 6 ------
recipes-qt/qt5/qtquickcontrols_git.bb | 6 ------
recipes-qt/qt5/qtscript_git.bb | 6 ------
recipes-qt/qt5/qtsensors_git.bb | 6 ------
recipes-qt/qt5/qtsvg_git.bb | 6 ------
recipes-qt/qt5/qttools-native_git.bb | 6 ------
recipes-qt/qt5/qttools_git.bb | 6 ------
recipes-qt/qt5/qtwayland-native_git.bb | 6 ------
recipes-qt/qt5/qtwayland.inc | 6 ++++++
recipes-qt/qt5/qtwayland_git.bb | 6 ------
recipes-qt/qt5/qtxmlpatterns_git.bb | 6 ------
17 files changed, 6 insertions(+), 96 deletions(-)
diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb b/recipes-qt/qt5/nativesdk-qttools_git.bb
index 933119c..a9a6114 100644
--- a/recipes-qt/qt5/nativesdk-qttools_git.bb
+++ b/recipes-qt/qt5/nativesdk-qttools_git.bb
@@ -5,9 +5,3 @@ require ${PN}.inc
FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
SRCREV = "eaf069902111533f0e675ab32279bb57a5916169"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 318ba44..97223fc 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "67a101af142355a0ca7cdc234b7ee1716a25d87c"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index a1e9009..ef9cf50 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "82abf6975b6737259ee656564e5ec7f8ad1d0508"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 3e04c40..3c154a4 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "bcc7909dfe9d89f793919bc96abdfd6b704c4c0e"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index fcb6993..6157633 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "749cdff5289412780f0bb8e351cb140ba64d85ce"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index f0ce24e..906709c 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "7e668fe58fc9546eb91bbf39992566f709b5e6c2"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 3400f47..7cb29a6 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "26e713cddcc8a62e49ce7a3352d3b5f13ffd7d52"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index bab6854..9dd7730 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "82a0a8244a2edf27c196f6c8cc3e2c36a3f4a8c5"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 6d8fd31..54fd7ec 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "161e1fd31537f41992b3024c32b525b64be080ed"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index c2ab063..6cd22b3 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "9efc5bea41e7acbce55c37b49b167092b71114a9"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 6fc617d..9420ff8 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "35a2f0880831d38c60d2b4820dac808f48f6f3a8"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb
index b37e0ed..4f5a7cf 100644
--- a/recipes-qt/qt5/qttools-native_git.bb
+++ b/recipes-qt/qt5/qttools-native_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "eaf069902111533f0e675ab32279bb57a5916169"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index b37e0ed..4f5a7cf 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "eaf069902111533f0e675ab32279bb57a5916169"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index 9089f0f..3179c98 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -10,9 +10,3 @@ SRCREV = "98dca3b54f52f08117c1e0d3a1b4826ed12ef23f"
do_install_append() {
ln -sf ${D}${OE_QMAKE_PATH_QT_BINS}/qtwaylandscanner ${D}${bindir}/qtwaylandscanner
}
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc
index abeb15f..bb52f0d 100644
--- a/recipes-qt/qt5/qtwayland.inc
+++ b/recipes-qt/qt5/qtwayland.inc
@@ -22,3 +22,9 @@ FILES_${PN}-plugins += " \
FILES_${PN}-plugins-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \
"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index ca068da..f586605 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -14,9 +14,3 @@ do_install_append() {
# do install files created by qtwaylandscanner
install ${B}/include/QtCompositor/5.3.0/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.3.0/QtCompositor/private
}
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index fb1846c..5d63a6b 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "e13d30be68228ccda3b6310ac44a84981b17f03b"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [meta-qt5][PATCH 3/5] qtenginio, qtwebsockets: Add 2 new modules and include them in packagegroup-qt5-toolchain-target
2014-06-04 9:56 ` [meta-qt5][PATCH 3/5] qtenginio, qtwebsockets: Add 2 new modules and include them in packagegroup-qt5-toolchain-target Martin Jansa
@ 2014-06-04 23:45 ` Otavio Salvador
0 siblings, 0 replies; 16+ messages in thread
From: Otavio Salvador @ 2014-06-04 23:45 UTC (permalink / raw)
To: OpenEmbedded Devel List
On Wed, Jun 4, 2014 at 6:56 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> From: Jonathan Liu <net147@gmail.com>
>
> Signed-off-by: Jonathan Liu <net147@gmail.com>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Please split the patches.
One for each module, than another for the packagegroup.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 16+ messages in thread
* [meta-qt5][PATCHv2 01/10] recipes-git: Upgrade from latest origin/release to latest origin/stable
2014-06-04 9:56 [meta-qt5][PATCH 1/5] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
` (3 preceding siblings ...)
2014-06-04 9:56 ` [meta-qt5][PATCH 5/5] recipes-git: Use LIC_FILES_CHKSUM from .inc files Martin Jansa
@ 2014-06-05 22:08 ` Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 02/10] qt5: upgrade from 5.2.1 to 5.3.0 Martin Jansa
` (8 more replies)
4 siblings, 9 replies; 16+ messages in thread
From: Martin Jansa @ 2014-06-05 22:08 UTC (permalink / raw)
To: openembedded-devel
* there wont be 5.2.2 release, so start preparation for 5.3.0
* probably latest 5.3.0-beta1 snapshot was released yesterday, so this
should be reasonably close
* probably wont be merged before creating new release branch for Yocto 1.6
* qtbase: Fix build with X.h included from egl.h
* nativesdk-qt*: Add git recipes
5.2.1 isn't compatible with qtbase-native from git
* qtbase: upgrade to latest stable revision
* 0006-configure-make-pulseaudio-alsa-freetype-a-configurab.patch
was upstreamed in:
0c3301f configure: make pulseaudio and alsa configurable options
* 0005-qt_module-Fix-pkgconfig-replacement.patch
is hopefully resolved in:
eaefbe3 snuff -L/-I with system paths when installing meta files
a33afed de-duplicate setup of libdir replacement in prl files
aa20e7f reshuffle code for clarity
ee86ce8 don't attempt to replace include paths in meta files
but this needs to be double checked
* recipes-git: Upgrade to latest origin/stable
* qt5-git.inc: update LICENSE.LGPL checksum
* only year was updated:
- The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
* qtbase: add 2 patches to fix build issues
* LIC_FILES_CHKSUM: update other git recipes
* qtlocation: bump SRCREV and add to qt5-versions
* qt5-versions.inc: Add line for qttools and fix it for nativesdk-qttools
* qtquick1: fix LIC_FILES_CHKSUM
* qttools: update LIC_FILES_CHKSUM and patches
* new qtdiag needs to be disabled as well because it depends on gui which isn't enabled
in qtbase-native, disable qtpaths as well
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
conf/distro/include/qt5-versions.inc | 4 +
recipes-qt/qt5/nativesdk-qtbase_git.bb | 32 ++
recipes-qt/qt5/nativesdk-qttools_git.bb | 13 +
recipes-qt/qt5/qt3d_git.bb | 9 +-
recipes-qt/qt5/qt5-git.inc | 4 +-
.../qtbase-git/0001-Add-linux-oe-g-platform.patch | 344 +++++++++++++++++++++
.../qtbase-git/0001-Fix-missing-plugin_types.patch | 30 ++
...lfs-Print-the-chosen-config-in-debug-mode.patch | 56 ++++
.../0002-Add-external-hostbindir-option.patch | 303 ++++++++++++++++++
...o-allow-to-set-qt.conf-from-the-outside-u.patch | 39 +++
...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 30 ++
...-build-it-in-configure-but-allow-to-build.patch | 50 +++
...gl-error-for-platforms-only-supporting-on.patch | 72 +++++
...mintegration-Undefine-CursorShape-from-X..patch | 30 ++
.../qt5/qtbase-git/0008-Always-build-uic.patch | 31 ++
...reserve-built-qmake-and-swap-with-native-.patch | 30 ++
...ump-path-length-from-256-to-512-character.patch | 29 ++
recipes-qt/qt5/qtbase-native_git.bb | 23 +-
recipes-qt/qt5/qtbase_git.bb | 25 +-
recipes-qt/qt5/qtconnectivity_git.bb | 4 +-
recipes-qt/qt5/qtdeclarative_git.bb | 10 +-
recipes-qt/qt5/qtgraphicaleffects_git.bb | 10 +-
recipes-qt/qt5/qtimageformats_git.bb | 10 +-
recipes-qt/qt5/qtlocation_git.bb | 10 +-
recipes-qt/qt5/qtmultimedia_git.bb | 10 +-
recipes-qt/qt5/qtquick1_git.bb | 10 +-
recipes-qt/qt5/qtquickcontrols_git.bb | 10 +-
recipes-qt/qt5/qtscript_git.bb | 10 +-
recipes-qt/qt5/qtsensors_git.bb | 10 +-
recipes-qt/qt5/qtserialport_git.bb | 4 +-
recipes-qt/qt5/qtsvg_git.bb | 10 +-
...w-to-build-only-lrelease-lupdate-lconvert.patch | 155 ++++++++++
...t-help-fix-linking-of-dependent-libraries.patch | 32 ++
recipes-qt/qt5/qttools-native_git.bb | 10 +-
recipes-qt/qt5/qttools_git.bb | 10 +-
recipes-qt/qt5/qtwayland-native_git.bb | 6 +
recipes-qt/qt5/qtwayland_git.bb | 6 +
recipes-qt/qt5/qtwebkit-examples_git.bb | 4 +-
recipes-qt/qt5/qtwebkit_git.bb | 4 +-
| 4 +-
recipes-qt/qt5/qtxmlpatterns_git.bb | 10 +-
41 files changed, 1433 insertions(+), 70 deletions(-)
create mode 100644 recipes-qt/qt5/nativesdk-qtbase_git.bb
create mode 100644 recipes-qt/qt5/nativesdk-qttools_git.bb
create mode 100644 recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
create mode 100644 recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch
create mode 100644 recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
create mode 100644 recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc
index b684a6b..a2cc1fc 100644
--- a/conf/distro/include/qt5-versions.inc
+++ b/conf/distro/include/qt5-versions.inc
@@ -5,11 +5,13 @@ QT5_VERSION ?= "5.2.1"
PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}"
PREFERRED_VERSION_qtbase = "${QT5_VERSION}"
+PREFERRED_VERSION_nativesdk-qtbase = "${QT5_VERSION}"
PREFERRED_VERSION_qtdeclarative = "${QT5_VERSION}"
PREFERRED_VERSION_qtjsbackend = "${QT5_VERSION}"
PREFERRED_VERSION_qtjsbackend-native = "${QT5_VERSION}"
PREFERRED_VERSION_qtgraphicaleffects = "${QT5_VERSION}"
PREFERRED_VERSION_qtimageformats = "${QT5_VERSION}"
+PREFERRED_VERSION_qtlocation = "${QT5_VERSION}"
PREFERRED_VERSION_qtmultimedia = "${QT5_VERSION}"
PREFERRED_VERSION_qtquick1 = "${QT5_VERSION}"
PREFERRED_VERSION_qtquickcontrols = "${QT5_VERSION}"
@@ -17,7 +19,9 @@ PREFERRED_VERSION_qtsensors = "${QT5_VERSION}"
PREFERRED_VERSION_qtserialport = "${QT5_VERSION}"
PREFERRED_VERSION_qtscript = "${QT5_VERSION}"
PREFERRED_VERSION_qtsvg = "${QT5_VERSION}"
+PREFERRED_VERSION_qttools = "${QT5_VERSION}"
PREFERRED_VERSION_qttools-native = "${QT5_VERSION}"
+PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}"
PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}"
PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}"
PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
new file mode 100644
index 0000000..cac16a0
--- /dev/null
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -0,0 +1,32 @@
+require qt5-git.inc
+require ${PN}.inc
+
+# prepend this again, because ${PN}.inc prepneds ${PN}
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
+
+SRC_URI = "\
+ git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+"
+
+# common with -native
+SRC_URI += "\
+ file://0001-Add-linux-oe-g-platform.patch \
+ file://0002-Add-external-hostbindir-option.patch \
+ file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+ file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
+ file://0001-Fix-missing-plugin_types.patch \
+ file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+"
+
+# common with native version
+SRC_URI += " \
+ file://0008-Always-build-uic.patch \
+"
+
+# specific for nativesdk version
+SRC_URI += " \
+ file://0009-configure-preserve-built-qmake-and-swap-with-native-.patch \
+ file://0010-configure-bump-path-length-from-256-to-512-character.patch \
+"
+
+SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb b/recipes-qt/qt5/nativesdk-qttools_git.bb
new file mode 100644
index 0000000..cbf1672
--- /dev/null
+++ b/recipes-qt/qt5/nativesdk-qttools_git.bb
@@ -0,0 +1,13 @@
+require qt5-git.inc
+require ${PN}.inc
+
+# prepend this again, because ${PN}.inc prepneds ${PN}
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
+
+SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index aaa9c04..0438dd9 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -4,11 +4,4 @@ require ${PN}.inc
QT_MODULE_BRANCH = "master"
# last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already
-SRCREV = "d3338a9f7fcac109d7bc7f600d5974ff333782ad"
-
-do_configure_prepend() {
- # Temporary hack to get qt3d build for Qt 5.1.0
- if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then
- echo "MODULE_VERSION = 5.3.0" >> ${S}/.qmake.conf
- fi
-}
+SRCREV = "36a829ad6fb44fd01f490c35e011f6fd2470ffdd"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index fa0c06e..25b7a62 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -10,14 +10,14 @@ SRC_URI += " \
S = "${WORKDIR}/git"
-PV = "5.2.1+git${SRCPV}"
+PV = "5.2.1+5.3.0-beta1+git${SRCPV}"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
DEFAULT_PREFERENCE = "-1"
LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=2abca611d56c23eb99943bde21c80a0d \
file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
new file mode 100644
index 0000000..828f5ea
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
@@ -0,0 +1,344 @@
+From 237a4b0143d91c0573ecf6f9ff5e37827a14a75d Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 15 Apr 2013 04:29:32 +0200
+Subject: [PATCH 01/10] Add linux-oe-g++ platform
+
+* This qmake.conf unlike other platforms reads most variables from
+ shell environment, because it's easier for qt recipes to export
+ *FLAGS or CC specific for given recipe
+
+* configure: add getQEvalMakeConf and getXQEvalMakeConf
+ Allow expansion of $(...) references from qmake.conf to generate
+ qmake environment from shell environment as exported by qmake5_base
+
+* configure: don't export SYSTEM_VARIABLES to .qmake.vars
+ linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
+ causing issues as we need g++ to be used as linker
+
+* configure.prf: Allow to add extra arguments to make
+ sometimes we would like to add -e or define some variable and respect it from both
+ Makefiles used in configure tests and also Makefiles to build the application
+
+* OE_QMAKE_CXX in order to allow compiler version check to succeed
+ which allows WebKit to be enabled.
+
+* Other variables in order to let config.tests to use our -platform
+ settings
+
+* Add setBootstrapEvalVariable to bootstrap qmake with our environment
+ too, this allows us to use -platform linux-oe-g++ also for native
+ recipe
+
+* disable gdb_dwarf_index
+ * qmake is trying to call native gdb and we don't depend on gdb-native
+ (or even provide gdb-native)
+ * fixes errors like this:
+ /bin/sh: gdb: command not found
+ /bin/sh: line 0: test: -gt: unary operator expected
+ which are not fatal, but still misleading in do_configure output
+
+Upstream-Status: Inappropriate [embedded specific]
+ too OE specific, probably cannot be upstreamed
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 60 +++++++++++++++------
+ mkspecs/features/configure.prf | 4 +-
+ mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++
+ mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
+ 4 files changed, 185 insertions(+), 19 deletions(-)
+ create mode 100644 mkspecs/linux-oe-g++/qmake.conf
+ create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
+
+diff --git a/configure b/configure
+index 55d68ef..bb24a9c 100755
+--- a/configure
++++ b/configure
+@@ -324,6 +324,16 @@ getQMakeConf()
+ getSingleQMakeVariable "$1" "$specvals"
+ }
+
++# OE qmake.conf is reading some variables from shell env
++# read them from qmake.conf, replace qmake () syntax with shell and eval
++getQEvalMakeConf()
++{
++ VAL=`getQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
++ EVAL=`eval "echo ${VAL}"`
++# echo "Running getQEvalMakeConf: var='$1', val='`getQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
++ eval "echo ${VAL}"
++}
++
+ getXQMakeConf()
+ {
+ if [ -z "$xspecvals" ]; then
+@@ -333,6 +343,16 @@ getXQMakeConf()
+ getSingleQMakeVariable "$1" "$xspecvals"
+ }
+
++# OE qmake.conf is reading some variables from shell env
++# read them from qmake.conf, replace qmake () syntax with shell and eval
++getXQEvalMakeConf()
++{
++ VAL=`getXQMakeConf "$1" | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'`
++ EVAL=`eval "echo ${VAL}"`
++# echo "Running getXQEvalMakeConf: var='$1', val='`getXQMakeConf \"$1\"`, val-sed='$VAL', eval='$EVAL'" >&2
++ eval "echo ${VAL}"
++}
++
+ compilerSupportsFlag()
+ {
+ cat >conftest.cpp <<EOF
+@@ -548,21 +568,19 @@ fi
+ # initalize variables
+ #-------------------------------------------------------------------------------
+
+-SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
+-for varname in $SYSTEM_VARIABLES; do
++# Export all OE variables for qmake.conf from shell env to QMakeVars
++OE_VARIABLES="AR CC CFLAGS COMPILER CXX CXXFLAGS LDFLAGS LINK QT_CONFIG STRIP"
++for varname in $OE_VARIABLES; do
+ qmakevarname="${varname}"
+- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
+- if [ "${varname}" = "LDFLAGS" ]; then
+- qmakevarname="LFLAGS"
+- elif [ "${varname}" = "LD" ]; then
+- qmakevarname="LINK"
+- fi
+ cmd=`echo \
+-'if [ -n "\$'${varname}'" ]; then
+- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'"
++'if [ -n "\$OE_QMAKE_'${varname}'" ]; then
++ QMakeVar set OE_QMAKE_'${qmakevarname}' "\$OE_QMAKE_'${varname}'"
++# echo "Exporting OE_QMAKE_'${qmakevarname}' value=\"\$OE_QMAKE_'${varname}'\"" >&2
+ fi'`
+ eval "$cmd"
+ done
++
++SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
+ # Use CC/CXX to run config.tests
+ mkdir -p "$outpath/config.tests"
+ rm -f "$outpath/config.tests/.qmake.cache"
+@@ -3139,7 +3157,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
+ [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
+ fi
+
+-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
++QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX`
+
+ TEST_COMPILER=$QMAKE_CONF_COMPILER
+
+@@ -3174,7 +3192,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
+ exit 1
+ fi
+ fi
+-TEST_COMPILER_CXXFLAGS=`getXQMakeConf QMAKE_CXXFLAGS`
++TEST_COMPILER_CXXFLAGS=`getXQEvalMakeConf QMAKE_CXXFLAGS`
+
+ GCC_MACHINE_DUMP=
+ case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
+@@ -3632,6 +3650,14 @@ setBootstrapVariable()
+ getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
+ }
+
++# OE qmake.conf is reading some variables from shell env
++# read them from qmake.conf, replace qmake () syntax with shell and eval
++setBootstrapEvalVariable()
++{
++ getQEvalMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
++}
++
++
+ # build qmake
+ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+ echo "Creating qmake..."
+@@ -3670,11 +3696,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+ fi
+
+ [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
+- setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"
+- setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"
+- setBootstrapVariable QMAKE_CFLAGS
+- setBootstrapVariable QMAKE_CXXFLAGS
+- setBootstrapVariable QMAKE_LFLAGS
++ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM"
++ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM"
++ setBootstrapEvalVariable QMAKE_CFLAGS
++ setBootstrapEvalVariable QMAKE_CXXFLAGS
++ setBootstrapEvalVariable QMAKE_LFLAGS
+
+ if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
+ setBootstrapVariable QMAKE_CFLAGS_RELEASE
+diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
+index fe41c54..e2db923 100644
+--- a/mkspecs/features/configure.prf
++++ b/mkspecs/features/configure.prf
+@@ -60,12 +60,12 @@ defineTest(qtCompileTest) {
+ }
+
+ # Clean up after previous run
+- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean")
++ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean")
+
+ mkpath($$test_out_dir)|error("Aborting.")
+
+ qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") {
+- qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") {
++ qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") {
+ log("yes$$escape_expand(\\n)")
+ msg = "test $$1 succeeded"
+ write_file($$QMAKE_CONFIG_LOG, msg, append)
+diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
+new file mode 100644
+index 0000000..ca26b10
+--- /dev/null
++++ b/mkspecs/linux-oe-g++/qmake.conf
+@@ -0,0 +1,40 @@
++#
++# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
++#
++
++MAKEFILE_GENERATOR = UNIX
++CONFIG += incremental
++QMAKE_INCREMENTAL_STYLE = sublib
++
++include(../common/linux.conf)
++
++# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip
++QMAKE_AR = $(OE_QMAKE_AR) cqs
++QMAKE_STRIP = $(OE_QMAKE_STRIP)
++QMAKE_WAYLAND_SCANNER = $(OE_QMAKE_WAYLAND_SCANNER)
++
++include(../common/gcc-base-unix.conf)
++
++# *FLAGS from gcc-base.conf
++QMAKE_CFLAGS += $(OE_QMAKE_CFLAGS)
++QMAKE_CXXFLAGS += $(OE_QMAKE_CXXFLAGS)
++QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
++
++include(../common/g++-unix.conf)
++
++# tc settings from g++-base.conf
++QMAKE_COMPILER = $(OE_QMAKE_COMPILER)
++QMAKE_CC = $(OE_QMAKE_CC)
++QMAKE_CXX = $(OE_QMAKE_CXX)
++
++QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
++
++QMAKE_LINK = $(OE_QMAKE_LINK)
++QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
++QMAKE_LINK_C = $(OE_QMAKE_LINK)
++QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
++
++# for the SDK
++isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
++
++load(qt_config)
+diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
+new file mode 100644
+index 0000000..dd12003
+--- /dev/null
++++ b/mkspecs/linux-oe-g++/qplatformdefs.h
+@@ -0,0 +1,100 @@
++/****************************************************************************
++**
++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Contact: http://www.qt-project.org/legal
++**
++** This file is part of the qmake spec of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Digia. For licensing terms and
++** conditions see http://qt.digia.com/licensing. For further information
++** use the contact form at http://qt.digia.com/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file. Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Digia gives you certain additional
++** rights. These rights are described in the Digia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file. Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#ifndef QPLATFORMDEFS_H
++#define QPLATFORMDEFS_H
++
++// Get Qt defines/settings
++
++#include "qglobal.h"
++
++// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
++
++// 1) need to reset default environment if _BSD_SOURCE is defined
++// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
++// 3) it seems older glibc need this to include the X/Open stuff
++#ifndef _GNU_SOURCE
++# define _GNU_SOURCE
++#endif
++
++#include <unistd.h>
++
++
++// We are hot - unistd.h should have turned on the specific APIs we requested
++
++#include <features.h>
++#include <pthread.h>
++#include <dirent.h>
++#include <fcntl.h>
++#include <grp.h>
++#include <pwd.h>
++#include <signal.h>
++
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <sys/ipc.h>
++#include <sys/time.h>
++#include <sys/shm.h>
++#include <sys/socket.h>
++#include <sys/stat.h>
++#include <sys/wait.h>
++#include <netinet/in.h>
++#ifndef QT_NO_IPV6IFNAME
++#include <net/if.h>
++#endif
++
++#define QT_USE_XOPEN_LFS_EXTENSIONS
++#include "../common/posix/qplatformdefs.h"
++
++#undef QT_SOCKLEN_T
++
++#if defined(__GLIBC__) && (__GLIBC__ >= 2)
++#define QT_SOCKLEN_T socklen_t
++#else
++#define QT_SOCKLEN_T int
++#endif
++
++#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
++#define QT_SNPRINTF ::snprintf
++#define QT_VSNPRINTF ::vsnprintf
++#endif
++
++#endif // QPLATFORMDEFS_H
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch b/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch
new file mode 100644
index 0000000..612cbdd
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch
@@ -0,0 +1,30 @@
+From f0e01b788e86f24352ba14ad17c3f337f934467d Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 21 Apr 2014 15:09:23 +0200
+Subject: [PATCH] Fix missing plugin_types
+
+* bearer/generic was failing with:
+ Project ERROR: No module claims plugin type 'bearer'
+
+Change-Id: I90848856a8b0a4df52e599983cf7dde0bc0e6623
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ mkspecs/features/qt_module_pris.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
+index f31bc38..415e780 100644
+--- a/mkspecs/features/qt_module_pris.prf
++++ b/mkspecs/features/qt_module_pris.prf
+@@ -177,7 +177,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
+ include($$mod_work_pfx/qt_lib_$${pri}.pri)
+ for(mod, mods_to_load) {
+ for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \
+- name depends module_config CONFIG DEFINES sources \
++ name depends module_config plugin_types CONFIG DEFINES sources \
+ includes bins libs libexecs plugins imports qml \
+ rpath_link \
+ )):defined(QT.$${mod}.$$var, var):cache(QT.$${mod}.$$var, transient)
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
new file mode 100644
index 0000000..65ebbd1
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
@@ -0,0 +1,56 @@
+From 91b185d1f4843d22d42461c0aee4cd0f5393bbc8 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 21 Apr 2014 19:22:04 +0200
+Subject: [PATCH] Revert "eglfs: Print the chosen config in debug mode"
+
+This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e.
+---
+ src/platformsupport/eglconvenience/qeglconvenience.cpp | 4 +++-
+ src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 -------
+ 2 files changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
+index e6624fb..3870f6c 100644
+--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
++++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
+@@ -437,9 +437,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
+ for (index = 0; attrs[index].attr != -1; ++index) {
+ EGLint value;
+ if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) {
+- qDebug("\t%s: %d", attrs[index].name, (int)value);
++ qWarning("\t%s: %d\n", attrs[index].name, (int)value);
+ }
+ }
++
++ qWarning("\n");
+ }
+
+ #ifdef Q_OS_LINUX
+diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+index eec6463..4a7c69b 100644
+--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
++++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+@@ -44,7 +44,6 @@
+ #include "qeglpbuffer_p.h"
+ #include <qpa/qplatformwindow.h>
+ #include <QOpenGLContext>
+-#include <QDebug>
+
+ QT_BEGIN_NAMESPACE
+
+@@ -192,12 +191,6 @@ void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLCont
+ return;
+ }
+
+- static const bool printConfig = qgetenv("QT_QPA_EGLFS_DEBUG").toInt();
+- if (printConfig) {
+- qDebug() << "Created context for format" << format << "with config:";
+- q_printEglConfig(m_eglDisplay, m_eglConfig);
+- }
+-
+ #ifndef QT_NO_OPENGL
+ // Make the context current to ensure the GL version query works. This needs a surface too.
+ const EGLint pbufferAttributes[] = {
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
new file mode 100644
index 0000000..5f9fd90
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
@@ -0,0 +1,303 @@
+From 00ad866f82f89ce938e9eaabfc50af3cde72ccfe Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sat, 6 Apr 2013 13:15:07 +0200
+Subject: [PATCH 02/10] Add -external-hostbindir option
+
+* when cross-compiling it's sometimes useful to use existing tools from machine
+ (or in OpenEmbedded built with separate native recipe) when building for target
+
+* this way we can skip bootstraping tools we already have
+
+* qt_functions: temporary remove isEmpty check
+* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
+* isEmpty works correctly only with qmake variables (e.g. $$FOO -
+ isEmpty(FOO)), but doesn't work with system properties like $$[FOO].
+
+* cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries
+
+Upstream-Status: Pending
+ is a lot better for upstreaming (and it was already sort of approved by
+ Oswald) but in 5.2.0 I've noticed that he added something similar for
+ android builds
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+Signed-off-by: Simon Busch <morphis@gravedo.de>
+---
+ configure | 15 +++++++++++++++
+ mkspecs/features/qt_functions.prf | 9 ++++++++-
+ mkspecs/features/qt_tool.prf | 3 +--
+ qmake/property.cpp | 1 +
+ qtbase.pro | 12 +++++++++---
+ src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
+ src/corelib/global/qlibraryinfo.cpp | 3 ++-
+ src/corelib/global/qlibraryinfo.h | 1 +
+ src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
+ src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
+ tools/configure/configureapp.cpp | 8 ++++++++
+ 11 files changed, 51 insertions(+), 13 deletions(-)
+
+diff --git a/configure b/configure
+index bb24a9c..bf7c11e 100755
+--- a/configure
++++ b/configure
+@@ -777,6 +777,7 @@ QT_HOST_BINS=
+ QT_HOST_LIBS=
+ QT_HOST_DATA=
+ QT_EXT_PREFIX=
++QT_EXTERNAL_HOST_BINS=
+
+ #flags for SQL drivers
+ QT_CFLAGS_PSQL=
+@@ -898,6 +899,7 @@ while [ "$#" -gt 0 ]; do
+ -testsdir| \
+ -hostdatadir| \
+ -hostbindir| \
++ -external-hostbindir| \
+ -hostlibdir| \
+ -extprefix| \
+ -sysroot| \
+@@ -1112,6 +1114,9 @@ while [ "$#" -gt 0 ]; do
+ extprefix)
+ QT_EXT_PREFIX="$VAL"
+ ;;
++ external-hostbindir)
++ QT_EXTERNAL_HOST_BINS="$VAL"
++ ;;
+ pkg-config)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_PKGCONFIG="$VAL"
+@@ -2250,6 +2255,10 @@ Installation options:
+ -hostdatadir <dir> . Data used by qmake will be installed to <dir>
+ (default HOSTPREFIX)
+
++ -external-hostbindir <dir> Use external host executables instead of building them
++ (not used by defaut)
++
++
+ Configure options:
+
+ The defaults (*) are usually acceptable. A plus (+) denotes a default value
+@@ -2914,6 +2923,11 @@ fi
+ # command line and environment validation
+ #-------------------------------------------------------------------------------
+
++# default is empty, don't call makeabs if it is empty
++if [ ! -z "$QT_EXTERNAL_HOST_BINS" ]; then
++ QT_EXTERNAL_HOST_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_EXTERNAL_HOST_BINS"`
++fi
++
+ # update QT_CONFIG to show our current predefined configuration
+ CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
+ case "$CFG_QCONFIG" in
+@@ -3594,6 +3608,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
+ "qt_hbinpath=$QT_HOST_BINS",
+ "qt_hlibpath=$QT_HOST_LIBS",
+ "qt_hdatpath=$QT_HOST_DATA",
++ "qt_ebinpath=$QT_EXTERNAL_HOST_BINS",
+ "qt_targspec=$shortxspec",
+ "qt_hostspec=$shortspec",
+ #endif
+diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
+index 1dacfed..7229845 100644
+--- a/mkspecs/features/qt_functions.prf
++++ b/mkspecs/features/qt_functions.prf
+@@ -193,7 +193,14 @@ defineTest(qtAddRpathLink) {
+ defineTest(qtPrepareTool) {
+ $$1 = $$eval(QT_TOOL.$${2}.binary)
+ isEmpty($$1) {
+- $$1 = $$[QT_HOST_BINS]/$$2
++ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
++ # for some reason isEmpty does not work here, FIXME before submitting upstream
++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
++ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
++ $$1 = $$[QT_HOST_BINS]/$$2
++ }
+ exists($$eval($$1).pl) {
+ $$1 = perl -w $$eval($$1).pl
+ } else: contains(QMAKE_HOST.os, Windows) {
+diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
+index f0864f9..50bfac8 100644
+--- a/mkspecs/features/qt_tool.prf
++++ b/mkspecs/features/qt_tool.prf
+@@ -15,8 +15,7 @@ CONFIG += console
+
+ # If we are doing a prefix build, create a "module" pri which enables
+ # qtPrepareTool() to work with the non-installed build.
+-# Non-bootstrapped tools always need this because of the environment setup.
+-!build_pass:if(!host_build|!force_bootstrap|force_independent) {
++!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) {
+ isEmpty(MODULE):MODULE = $$TARGET
+
+ !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private)
+diff --git a/qmake/property.cpp b/qmake/property.cpp
+index e50485c..71291ad 100644
+--- a/qmake/property.cpp
++++ b/qmake/property.cpp
+@@ -75,6 +75,7 @@ static const struct {
+ { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true },
+ { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true },
+ { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true },
++ { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true },
+ { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true },
+ { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
+ };
+diff --git a/qtbase.pro b/qtbase.pro
+index ed6fc39..2421f41 100644
+--- a/qtbase.pro
++++ b/qtbase.pro
+@@ -71,16 +71,22 @@ CONFIG -= qt
+
+ #qmake
+ qmake.path = $$[QT_HOST_BINS]
++qmake.files = $$OUT_PWD/bin/qmake
++!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
++ qmake.files = $$[QT_EXTERNAL_HOST_BINS]/bin/qmake
++}
+ equals(QMAKE_HOST.os, Windows) {
+- qmake.files = $$OUT_PWD/bin/qmake.exe
+-} else {
+- qmake.files = $$OUT_PWD/bin/qmake
++ qmake.files = $${qmake.files}.exe
+ }
+ INSTALLS += qmake
+
+ #syncqt
+ syncqt.path = $$[QT_HOST_BINS]
+ syncqt.files = $$PWD/bin/syncqt.pl
++syncqt.files = $$PWD/bin/syncqt.pl
++!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
++ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt.pl
++}
+ INSTALLS += syncqt
+
+ # If we are doing a prefix build, create a "module" pri which enables
+diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
+index 9bda70e..6e3605a 100644
+--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
+@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+ set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+- set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+ _qt5_Core_check_file_exists(${imported_location})
+
+@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::moc)
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+ set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+- set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+ _qt5_Core_check_file_exists(${imported_location})
+
+@@ -37,7 +37,7 @@ if (NOT TARGET Qt5::rcc)
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+ set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+- set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/rcc$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+ _qt5_Core_check_file_exists(${imported_location})
+
+diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
+index 6d25325..3686b17 100644
+--- a/src/corelib/global/qlibraryinfo.cpp
++++ b/src/corelib/global/qlibraryinfo.cpp
+@@ -333,7 +333,7 @@ QLibraryInfo::isDebugBuild()
+ */
+
+ static const struct {
+- char key[19], value[13];
++ char key[21], value[13];
+ } qtConfEntries[] = {
+ { "Prefix", "." },
+ { "Documentation", "doc" }, // should be ${Data}/doc
+@@ -359,6 +359,7 @@ static const struct {
+ { "HostBinaries", "bin" },
+ { "HostLibraries", "lib" },
+ { "HostData", "." },
++ { "ExternalHostBinaries", "" },
+ { "TargetSpec", "" },
+ { "HostSpec", "" },
+ #endif
+diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
+index 0b573c2..b5535ee 100644
+--- a/src/corelib/global/qlibraryinfo.h
++++ b/src/corelib/global/qlibraryinfo.h
+@@ -88,6 +88,7 @@ public:
+ HostBinariesPath,
+ HostLibrariesPath,
+ HostDataPath,
++ ExternalHostBinariesPath,
+ TargetSpecPath,
+ HostSpecPath,
+ LastHostPath = HostSpecPath,
+diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
+index 1d94715..301af8f 100644
+--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
++++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
+@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+ set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+ _qt5_DBus_check_file_exists(${imported_location})
+
+@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+ set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+ _qt5_DBus_check_file_exists(${imported_location})
+
+diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+index 99d87e2..5621dc0 100644
+--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
++++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)
+ !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
+ set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
+ !!ELSE
+- set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
++ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\")
+ !!ENDIF
+ _qt5_Widgets_check_file_exists(${imported_location})
+
+diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
+index cff3f1b..540708b 100644
+--- a/tools/configure/configureapp.cpp
++++ b/tools/configure/configureapp.cpp
+@@ -1213,6 +1213,13 @@ void Configure::parseCmdLine()
+ dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i);
+ }
+
++ else if (configCmdLine.at(i) == "-external-hostbindir") {
++ ++i;
++ if (i == argCount)
++ break;
++ dictionary[ "QT_EXTERNAL_HOST_BINS" ] = configCmdLine.at(i);
++ }
++
+ else if (configCmdLine.at(i) == "-make-tool") {
+ ++i;
+ if (i == argCount)
+@@ -3986,6 +3993,7 @@ void Configure::generateQConfigCpp()
+ << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
+ << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
+ << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
++ << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl
+ << " \"qt_targspec=" << targSpec << "\"," << endl
+ << " \"qt_hostspec=" << hostSpec << "\"," << endl
+ << "#endif" << endl
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
new file mode 100644
index 0000000..95c67a8
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -0,0 +1,39 @@
+From 53b152be24082a2cf2497d2e687f9ee73a39d6f4 Mon Sep 17 00:00:00 2001
+From: Holger Freyther <zecke@selfish.org>
+Date: Wed, 26 Sep 2012 17:22:30 +0200
+Subject: [PATCH 03/10] qlibraryinfo: allow to set qt.conf from the outside
+ using the environment
+
+Allow to set a qt.conf from the outside using the environment. This allows
+to inject new prefixes and other paths into qmake. This is needed when using
+the same qmake binary to build qt/x11 and qt/embedded
+
+Upstream-Status: Inappropriate [embedded specific]
+ again very OE specific to read everything from environment (reusing the same
+ qmake from sstate and replacing all configured paths in it with qt.conf from
+ environment).
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/corelib/global/qlibraryinfo.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
+index 3686b17..89e13cf 100644
+--- a/src/corelib/global/qlibraryinfo.cpp
++++ b/src/corelib/global/qlibraryinfo.cpp
+@@ -153,7 +153,10 @@ QLibrarySettings::QLibrarySettings()
+
+ QSettings *QLibraryInfoPrivate::findConfiguration()
+ {
+- QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
++ QByteArray config = getenv("QT_CONF_PATH");
++ QString qtconfig = QFile::decodeName(config);
++ if(!QFile::exists(qtconfig))
++ qtconfig = QStringLiteral(":/qt/etc/qt.conf");
+ #ifdef QT_BOOTSTRAPPED
+ if(!QFile::exists(qtconfig))
+ qtconfig = qt_libraryInfoFile();
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
new file mode 100644
index 0000000..c263d09
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -0,0 +1,30 @@
+From a39f5e64b7b5a31e7e5cd988b5f967ce6cf02990 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sat, 27 Apr 2013 22:33:33 +0200
+Subject: [PATCH 04/10] configureapp: Prefix default LIBDIRS and INCDIRS with
+ SYSROOT
+
+Upstream-Status: Pending
+ again a bit OE specific
+---
+ tools/configure/configureapp.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
+index 540708b..45f4a1e 100644
+--- a/tools/configure/configureapp.cpp
++++ b/tools/configure/configureapp.cpp
+@@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri()
+ configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl;
+ if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
+ // FIXME: add detection
+- configStream << " QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
+- configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
++ configStream << " QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
++ configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
+ }
+ configStream << "}" << endl;
+ configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
new file mode 100644
index 0000000..395e84c
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
@@ -0,0 +1,50 @@
+From c0c4c468cc70a367e3bb2dd4a48c31e62b3b0fa4 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 29 Oct 2012 20:07:49 -0700
+Subject: [PATCH 05/10] qmake: don't build it in configure, but allow to build
+ it separately
+
+* it is already built in qtbase-native, so we don't need it in configure
+* allow building a separate qmake for the target
+
+Upstream-Status: Inappropriate [configuration]
+ OE specific for native/target builds
+
+Signed-off-by: Yu Ke <ke.yu@intel.com>
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ configure | 2 +-
+ qmake/qmake.pro | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index bf7c11e..5e93ce4 100755
+--- a/configure
++++ b/configure
+@@ -3674,7 +3674,7 @@ setBootstrapEvalVariable()
+
+
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+ echo "Creating qmake..."
+
+ mkdir -p "$outpath/qmake" || exit
+diff --git a/qmake/qmake.pro b/qmake/qmake.pro
+index 89d6ea5..7c605b9 100644
+--- a/qmake/qmake.pro
++++ b/qmake/qmake.pro
+@@ -8,6 +8,8 @@ CONFIG -= qt
+ DEFINES += \
+ QT_BUILD_QMAKE \
+ PROEVALUATOR_FULL
++DESTDIR = ../bin/
++TARGET = qmake
+
+ VPATH += \
+ ../src/corelib/global \
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
new file mode 100644
index 0000000..21821c3
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
@@ -0,0 +1,72 @@
+From 2cb0f75bb9ab1e6709fe867887f9e6014a140356 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 5 Feb 2014 18:35:08 +0100
+Subject: [PATCH 06/10] eglfs: fix egl error for platforms only supporting one
+ window/surface
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+running qmlscene -platform eglfs <filename>.qml
+
+caused
+
+EGL Error : Could not create the egl surface: error = 0x3003
+
+Rebased version of [1-2]
+
+Upstream-Status: unknown
+
+[1] http://repository.timesys.com/buildsources/q/qt-everywhere-opensource/qt-everywhere-opensource-5.1.1/qt-everywhere-opensource-5.1.1-qeglfswindow.cpp.patch
+[2] https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/qeglfswindow.cpp.patch
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/plugins/platforms/eglfs/qeglfswindow.cpp | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp
+index 2d36c0b..854531e 100644
+--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
++++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp
+@@ -74,6 +74,15 @@ void QEglFSWindow::create()
+
+ m_flags = Created;
+
++ static EGLSurface __singleWindowSurface;
++ if(QEglFSHooks::hooks() && ! QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows) && (__singleWindowSurface)) {
++ m_surface = __singleWindowSurface;
++#ifdef QEGL_EXTRA_DEBUG
++ qWarning("Surface recreate request, re-using %x\n", m_surface);
++#endif
++ return;
++ }
++
+ if (window()->type() == Qt::Desktop)
+ return;
+
+@@ -85,7 +94,7 @@ void QEglFSWindow::create()
+ if (isRaster() && screen->compositingWindow())
+ return;
+
+-#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK)
++#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK) || defined(EGL_API_FB)
+ // We can have either a single OpenGL window or multiple raster windows.
+ // Other combinations cannot work.
+ qFatal("EGLFS: OpenGL windows cannot be mixed with others.");
+@@ -105,6 +114,11 @@ void QEglFSWindow::create()
+
+ resetSurface();
+
++ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows))
++ {
++ __singleWindowSurface = m_surface;
++ }
++
+ screen->setPrimarySurface(m_surface);
+
+ if (isRaster()) {
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
new file mode 100644
index 0000000..24ae7ea
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -0,0 +1,30 @@
+From 0923f72a444bcdc0675a24aec9782692b41d301c Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Wed, 19 Mar 2014 18:32:28 +0100
+Subject: [PATCH 07/10] qeglplatformintegration: Undefine CursorShape from X.h
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
+index f665455..9eb783c 100644
+--- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
++++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
+@@ -46,6 +46,12 @@
+ #include <qpa/qplatformnativeinterface.h>
+ #include <EGL/egl.h>
+
++// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/
++// /usr/include/X11/X.h:#define CursorShape 0 /* largest size that can be displayed */
++#ifdef CursorShape
++#undef CursorShape
++#endif
++
+ QT_BEGIN_NAMESPACE
+
+ class QEGLPlatformScreen;
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch
new file mode 100644
index 0000000..fd45516
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch
@@ -0,0 +1,31 @@
+From 4d5502114a3135f2c78eb9e63476918cbee00040 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sat, 16 Nov 2013 00:32:30 +0100
+Subject: [PATCH 08/10] Always build uic
+
+Even if we are not building gui or widgets. This tool is needed later
+as a native tool when compiling the target.
+
+Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
+Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/src.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/src.pro b/src/src.pro
+index 6a805a6..90623a6 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -158,7 +158,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
+ }
+ }
+ }
+-SUBDIRS += src_plugins src_tools_qdoc
++SUBDIRS += src_plugins src_tools_qdoc src_tools_uic
+
+ nacl: SUBDIRS -= src_network src_testlib
+
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch
new file mode 100644
index 0000000..ddd7116
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch
@@ -0,0 +1,30 @@
+From 7117e71f5e1aac3ac6e5e87852c108bbc13dc364 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Mon, 11 Nov 2013 20:22:34 -0500
+Subject: [PATCH 09/10] configure: preserve built qmake and swap with native
+ one
+
+Let configure script build the real qmake, but right after it's built, swap
+it with a native qmake for further internal use, preserving the real one.
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure b/configure
+index 5e93ce4..01fca8f 100755
+--- a/configure
++++ b/configure
+@@ -3821,6 +3821,8 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+
+ (cd "$outpath/qmake"; "$MAKE") || exit 2
+ fi # Build qmake
++mv "$outpath/bin/qmake" "$outpath/bin/qmake-real"
++mv "$outpath/bin/qmake-native" "$outpath/bin/qmake"
+
+ echo "Running configuration tests..."
+
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch
new file mode 100644
index 0000000..02eef9b
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch
@@ -0,0 +1,29 @@
+From 6afe8d5d1daf94ac64478406b5b84b6879981446 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <denys@ti.com>
+Date: Mon, 11 Nov 2013 20:27:30 -0500
+Subject: [PATCH 10/10] configure: bump path length from 256 to 512 characters
+
+Increase the path length that gets hardcoded into generated config.cpp file
+from 256 to 512 characters, as nativesdk path can be quite long.
+
+Signed-off-by: Denys Dmytriyenko <denys@ti.com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 01fca8f..801c7c1 100755
+--- a/configure
++++ b/configure
+@@ -3572,7 +3572,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
+ static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`";
+
+ /* Installation Info */
+-static const char qt_configure_prefix_path_strs[][256 + 12] = {
++static const char qt_configure_prefix_path_strs[][512 + 12] = {
+ #ifndef QT_BUILD_QMAKE
+ "qt_prfxpath=$QT_SYSROOT_PREFIX",
+ "qt_docspath=$QT_SYSROOT_DOCS",
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 6f11bf3..bafe37b 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -1,12 +1,29 @@
require qt5-git.inc
require ${PN}.inc
+SRC_URI = "\
+ git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+"
+
+# common with -native
+SRC_URI += "\
+ file://0001-Add-linux-oe-g-platform.patch \
+ file://0002-Add-external-hostbindir-option.patch \
+ file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+ file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
+ file://0001-Fix-missing-plugin_types.patch \
+ file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+"
+
+# specific for native version
+SRC_URI += " \
+ file://0008-Always-build-uic.patch \
+"
+
do_install_append() {
# for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
# e.g. qt3d, qtwayland
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
}
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 168 commits
-SRCREV = "08cbbde61778276ccdda73d89fd64d02c623779f"
+SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 07dd936..9bcfa79 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -1,6 +1,25 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 172 commits
-SRCREV = "bf0336a02502b3ed4d399c1cf5b4a56b1e858d42"
+SRC_URI = "\
+ git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+"
+
+# common with -native
+SRC_URI += "\
+ file://0001-Add-linux-oe-g-platform.patch \
+ file://0002-Add-external-hostbindir-option.patch \
+ file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+ file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
+ file://0001-Fix-missing-plugin_types.patch \
+ file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+"
+
+# target specific
+SRC_URI += "\
+ file://0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
+ file://0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
+ file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
+"
+
+SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 35e54d3..c0fd15d 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -1,6 +1,4 @@
require qt5-git.inc
require ${BPN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 25 commits
-SRCREV = "9902dfdbc44934ce2e8072bc237ca8cdbfb3402b"
+SRCREV = "6d9ab3981a1ae9e224b3c6a8cf107049a0ee5095"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index e2d6ae5..2d733a3 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 81 commits
-SRCREV = "7ceefa60ab4f79d5f40e7051edf80c1a77ae7734"
+SRCREV = "aedcd57c84ac9d6b74816c13bdf3fde31e1132b5"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index b442069..9347e7b 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 3 commits
-SRCREV = "1fbbe87e6d5dc84bff70bd90b71d07f9982a8bc3"
+SRCREV = "9b1883d2e90dd6ef92374d21e490a3de1c8330ba"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index e40bd3f..b413a5f 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 1 commits
-SRCREV = "dde6daeccdf0a3f8d49fe1777b49046576b12218"
+SRCREV = "554d617762c86964dfa074074304993ccdfbe2c9"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index e498515..bab8275 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 13 commits
-SRCREV = "2ba9fd5550eb7766c20b3a61679e88ec4a6c8a54"
+SRCREV = "27c9ffe1d2eb2103e9b420c86c6fc3d10cb1ff76"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index e9fed1a..88ca59e 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 17 commits
-SRCREV = "db7f7cc5654ddec60297259bc9f86f5f777749cd"
+SRCREV = "b088962950dbc4c6f0219de30b0d9a8cf47a3376"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index d744aa8..7c64460 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 2 commits
-SRCREV = "07d8ce32b1112dcb590c793ee51cb713e514011b"
+SRCREV = "c56f5d8848ce03cc6667804f815de47d2d8221fb"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 69c3353..fd525f1 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 15 commits
-SRCREV = "1c54d411ad6e98c3779a412750aec8b93d587872"
+SRCREV = "ea9add905768a26ce86ab542615a193296642732"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 2b86650..2deaaff 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 1 commits
-SRCREV = "f89d64ca722acf4a1a38c5e136bb01eff2525978"
+SRCREV = "e4453c92ee41943a3a1d67a725804a44e747f64e"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index aedcc40..6e3bda6 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 2 commits
-SRCREV = "9a8319a39a06d6cf3163978301d650b8f3558c62"
+SRCREV = "eee2eee734b4aa735d35f6c53d79c06c1c76425a"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 3418259..4619227 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -1,6 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 28 commits
-SRCREV = "03546732fa696467d23b24224fad2822bc6a9043"
+SRCREV = "6e75610dff5fb96ebd72cfb40ba7cbfea4bd21b7"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index b6032b7..0aa79e1 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 1 commits
-SRCREV = "ae68091e0d6023410bc657cf54e7fa9b6c8bbcc2"
+SRCREV = "ad81f5720c4f4a1dac099cbe2f9d47ed3a9025b0"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
new file mode 100644
index 0000000..575616b
--- /dev/null
+++ b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
@@ -0,0 +1,155 @@
+From 90a2e92062fc67fa54be0f5596606ce2bc21f772 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.jansa@gmail.com>
+Date: Wed, 11 Sep 2013 18:30:08 +0200
+Subject: [PATCH 1/2] Allow to build only lrelease + lupdate + lconvert
+
+This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native
+is built without GUI support (no-png is set) and we still want to build
+native lrelease + lupdate + lconvert tools.
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.jansa@gmail.com>
+---
+ examples/examples.pro | 4 ++--
+ src/designer/src/src.pro | 16 +++++++++-------
+ src/linguist/linguist.pro | 2 +-
+ src/src.pro | 14 ++++++++------
+ tests/auto/auto.pro | 24 +++++++++++++-----------
+ 5 files changed, 33 insertions(+), 27 deletions(-)
+
+diff --git a/examples/examples.pro b/examples/examples.pro
+index 4955969..8e86419 100644
+--- a/examples/examples.pro
++++ b/examples/examples.pro
+@@ -1,3 +1,3 @@
+ TEMPLATE = subdirs
+-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant
+-
++!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant
++qtHaveModule(widgets): SUBDIRS += linguist uitools
+diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
+index e02ca8e..49527c5 100644
+--- a/src/designer/src/src.pro
++++ b/src/designer/src/src.pro
+@@ -1,18 +1,20 @@
+ TEMPLATE = subdirs
+
+-SUBDIRS = \
+- uitools \
+- lib \
+- components \
+- designer
++!linguistonly {
++ SUBDIRS = \
++ lib \
++ components \
++ designer
++}
++SUBDIRS += uitools
+
+-contains(QT_CONFIG, shared): SUBDIRS += plugins
++!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins
+
+ components.depends = lib
+ designer.depends = components
+ plugins.depends = lib
+
+-qtNomakeTools( \
++!linguistonly:qtNomakeTools( \
+ lib \
+ components \
+ designer \
+diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
+index 3a70580..a977878 100644
+--- a/src/linguist/linguist.pro
++++ b/src/linguist/linguist.pro
+@@ -3,7 +3,7 @@ SUBDIRS = \
+ lrelease \
+ lupdate \
+ lconvert
+-!no-png:qtHaveModule(widgets): SUBDIRS += linguist
++!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist
+
+ qtNomakeTools( \
+ linguist \
+diff --git a/src/src.pro b/src/src.pro
+index 861d06d..3438f9a 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -4,10 +4,12 @@ qtHaveModule(widgets) {
+ no-png {
+ message("Some graphics-related tools are unavailable without PNG support")
+ } else {
+- SUBDIRS = assistant \
++ !linguistonly {
++ SUBDIRS = assistant \
+ pixeltool \
+- qtestlib \
+- designer
++ qtestlib
++ }
++ SUBDIRS += designer
+ # unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
+
+ linguist.depends = designer
+@@ -15,7 +17,7 @@ qtHaveModule(widgets) {
+ }
+
+ SUBDIRS += linguist
+-!android|android_app: SUBDIRS += qtpaths
++!linguistonly:!android|android_app: SUBDIRS += qtpaths
+
+ mac {
+ SUBDIRS += macdeployqt
+@@ -25,7 +27,7 @@ android {
+ SUBDIRS += androiddeployqt
+ }
+
+-qtHaveModule(dbus): SUBDIRS += qdbus
++!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus
+
+ win32|winrt:SUBDIRS += windeployqt
+ winrt:SUBDIRS += winrtrunner qtd3dservice
+@@ -36,4 +38,4 @@ qtNomakeTools( \
+ macdeployqt \
+ )
+
+-!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
++!linguistonly:!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
+diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
+index c3acfe3..b48e711 100644
+--- a/tests/auto/auto.pro
++++ b/tests/auto/auto.pro
+@@ -1,15 +1,17 @@
+ TEMPLATE=subdirs
+-SUBDIRS=\
+- linguist \
+- host.pro \
+- qhelpcontentmodel \
+- qhelpenginecore \
+- qhelpgenerator \
+- qhelpindexmodel \
+- qhelpprojectdata \
+- cmake \
+- installed_cmake \
+- qtdiag
++!linguistonly {
++ SUBDIRS=\
++ linguist \
++ host.pro \
++ qhelpcontentmodel \
++ qhelpenginecore \
++ qhelpgenerator \
++ qhelpindexmodel \
++ qhelpprojectdata \
++ cmake \
++ installed_cmake \
++ qtdiag
++}
+
+ installed_cmake.depends = cmake
+
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
new file mode 100644
index 0000000..1c40471
--- /dev/null
+++ b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
@@ -0,0 +1,32 @@
+From 509541ebd648414ee33f3aea3035d1e6382bfa3c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 17 Jan 2014 14:33:19 +0100
+Subject: [PATCH 2/2] assistant/help: fix linking of dependent libraries
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+else we get:
+| ...ld: warning: libQt5CLucene.so.5, needed by ...libQt5Help.so, not found (try using -rpath or -rpath-link)
+| ...undefined reference to `QCLucenePhraseQuery::getTerms() const'
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/assistant/help/help.pro | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
+index 168d23d..a9c3b59 100644
+--- a/src/assistant/help/help.pro
++++ b/src/assistant/help/help.pro
+@@ -59,3 +59,5 @@ HEADERS += qhelpenginecore.h \
+ # access to clucene
+ HEADERS += qhelpsearchindexwriter_clucene_p.h \
+ qhelpsearchindexreader_clucene_p.h
++
++LIBS += -lQt5CLucene
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb
index 200f427..49a1907 100644
--- a/recipes-qt/qt5/qttools-native_git.bb
+++ b/recipes-qt/qt5/qttools-native_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 13 commits
-SRCREV = "80c6a5ea7f827647cc58037e1d1cf4bbf30e1fb6"
+SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 200f427..49a1907 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 13 commits
-SRCREV = "80c6a5ea7f827647cc58037e1d1cf4bbf30e1fb6"
+SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index b820665..9fac8b2 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -10,3 +10,9 @@ SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e"
do_install_append() {
ln -sf ${D}${OE_QMAKE_PATH_QT_BINS}/qtwaylandscanner ${D}${bindir}/qtwaylandscanner
}
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index df7a562..3f18272 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -14,3 +14,9 @@ do_install_append() {
# do install files created by qtwaylandscanner
install ${B}/include/QtCompositor/5.3.0/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.3.0/QtCompositor/private
}
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 1f5df71..98fdc2f 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -1,6 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 1 commits
-SRCREV = "cb8ed9694b850a429a93490beaa6462d9f3b8ea6"
+SRCREV = "c9d13139b65818785f218cc96d136d33591ca2f5"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 047b37f..ec8b4f3 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -1,6 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 18 commits
-SRCREV = "a1b801fc98ccda988df41e08dc70fdbd50ecb513"
+SRCREV = "0546c8656a3728bf4375da39027e096beba4f111"
--git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index d0a2a8c..954545f 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -1,6 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 1 commits
-SRCREV = "dd7eec92e7a5f4383783cc161f638867572dc208"
+SRCREV = "947361a7dc8db093d0b8e1ec5ac953470a180259"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 28e45a4..b86a749 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -1,6 +1,10 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.2.1 + 4 commits
-SRCREV = "eaf0a92dcb6fb12f3d65aa4fc806ccbfaa7f7db0"
+SRCREV = "d25091bb8b52455e415f8147a9100094c489a041"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-qt5][PATCHv2 02/10] qt5: upgrade from 5.2.1 to 5.3.0
2014-06-05 22:08 ` [meta-qt5][PATCHv2 01/10] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
@ 2014-06-05 22:08 ` Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 03/10] qtwebsockets: Add new module Martin Jansa
` (7 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2014-06-05 22:08 UTC (permalink / raw)
To: openembedded-devel
From: Jonathan Liu <net147@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes-qt/qt5/nativesdk-qtbase.inc | 3 +-
recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb | 5 --
recipes-qt/qt5/nativesdk-qtbase_5.3.0.bb | 5 ++
recipes-qt/qt5/nativesdk-qttools.inc | 6 +++
recipes-qt/qt5/nativesdk-qttools_5.2.1.bb | 5 --
recipes-qt/qt5/nativesdk-qttools_5.3.0.bb | 5 ++
recipes-qt/qt5/{qt5-5.2.1.inc => qt5-5.3.0.inc} | 4 +-
recipes-qt/qt5/qtbase-native.inc | 2 +
...base-native_5.2.1.bb => qtbase-native_5.3.0.bb} | 4 +-
recipes-qt/qt5/qtbase.inc | 5 +-
.../0005-qt_module-Fix-pkgconfig-replacement.patch | 12 ++---
...mintegration-Undefine-CursorShape-from-X..patch | 30 +++++++++++
recipes-qt/qt5/qtbase/0010-Always-build-uic.patch | 19 +++----
.../0013-QOpenGLPaintDevice-sub-area-support.patch | 44 ++++++++--------
.../0015-Fix-linuxfb-argument-mmsize-parsing.patch | 42 ---------------
.../qt5/qtbase/0015-Fix-missing-plugin_types.patch | 30 +++++++++++
...lfs-Print-the-chosen-config-in-debug-mode.patch | 56 ++++++++++++++++++++
.../qtbase/0016-eglfs-Fix-quad-coordinates.patch | 39 --------------
recipes-qt/qt5/qtbase_5.2.1.bb | 7 ---
recipes-qt/qt5/qtbase_5.3.0.bb | 5 ++
recipes-qt/qt5/qtconnectivity.inc | 6 +++
recipes-qt/qt5/qtconnectivity_5.2.1.bb | 5 --
recipes-qt/qt5/qtconnectivity_5.3.0.bb | 5 ++
recipes-qt/qt5/qtdeclarative.inc | 7 +++
...x-improper-antialiasing-property-behavior.patch | 60 ++++++++++++++++++++++
...g-calculation-of-viewPort-for-transitions.patch | 41 ---------------
recipes-qt/qt5/qtdeclarative_5.2.1.bb | 9 ----
recipes-qt/qt5/qtdeclarative_5.3.0.bb | 5 ++
recipes-qt/qt5/qtgraphicaleffects.inc | 6 +++
recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb | 5 --
recipes-qt/qt5/qtgraphicaleffects_5.3.0.bb | 5 ++
recipes-qt/qt5/qtimageformats.inc | 6 +++
recipes-qt/qt5/qtimageformats_5.2.1.bb | 5 --
recipes-qt/qt5/qtimageformats_5.3.0.bb | 5 ++
recipes-qt/qt5/qtlocation.inc | 6 +++
recipes-qt/qt5/qtlocation_5.2.1.bb | 5 --
recipes-qt/qt5/qtlocation_5.3.0.bb | 5 ++
recipes-qt/qt5/qtmultimedia.inc | 6 +++
recipes-qt/qt5/qtmultimedia_5.2.1.bb | 5 --
recipes-qt/qt5/qtmultimedia_5.3.0.bb | 5 ++
recipes-qt/qt5/qtquick1.inc | 6 +++
recipes-qt/qt5/qtquick1_5.2.1.bb | 5 --
recipes-qt/qt5/qtquick1_5.3.0.bb | 5 ++
recipes-qt/qt5/qtquickcontrols.inc | 6 +++
recipes-qt/qt5/qtquickcontrols_5.2.1.bb | 6 ---
recipes-qt/qt5/qtquickcontrols_5.3.0.bb | 5 ++
recipes-qt/qt5/qtscript.inc | 6 +++
recipes-qt/qt5/qtscript_5.2.1.bb | 5 --
recipes-qt/qt5/qtscript_5.3.0.bb | 5 ++
recipes-qt/qt5/qtsensors.inc | 6 +++
recipes-qt/qt5/qtsensors_5.2.1.bb | 5 --
recipes-qt/qt5/qtsensors_5.3.0.bb | 5 ++
recipes-qt/qt5/qtserialport_5.2.1.bb | 5 --
recipes-qt/qt5/qtserialport_5.3.0.bb | 5 ++
recipes-qt/qt5/qtsvg.inc | 6 +++
recipes-qt/qt5/qtsvg_5.2.1.bb | 6 ---
recipes-qt/qt5/qtsvg_5.3.0.bb | 5 ++
recipes-qt/qt5/qttools-native.inc | 6 +++
recipes-qt/qt5/qttools-native_5.2.1.bb | 5 --
recipes-qt/qt5/qttools-native_5.3.0.bb | 5 ++
recipes-qt/qt5/qttools.inc | 6 +++
...w-to-build-only-lrelease-lupdate-lconvert.patch | 39 ++++++++++----
recipes-qt/qt5/qttools_5.2.1.bb | 5 --
recipes-qt/qt5/qttools_5.3.0.bb | 5 ++
recipes-qt/qt5/qtwayland-native.inc | 6 +++
recipes-qt/qt5/qtwayland.inc | 6 +++
recipes-qt/qt5/qtwebkit-examples_5.2.1.bb | 5 --
recipes-qt/qt5/qtwebkit-examples_5.3.0.bb | 5 ++
recipes-qt/qt5/qtwebkit_5.2.1.bb | 5 --
recipes-qt/qt5/qtwebkit_5.3.0.bb | 5 ++
| 6 +++
| 5 --
| 5 ++
recipes-qt/qt5/qtxmlpatterns.inc | 6 +++
recipes-qt/qt5/qtxmlpatterns_5.2.1.bb | 5 --
recipes-qt/qt5/qtxmlpatterns_5.3.0.bb | 5 ++
76 files changed, 462 insertions(+), 295 deletions(-)
delete mode 100644 recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb
create mode 100644 recipes-qt/qt5/nativesdk-qtbase_5.3.0.bb
delete mode 100644 recipes-qt/qt5/nativesdk-qttools_5.2.1.bb
create mode 100644 recipes-qt/qt5/nativesdk-qttools_5.3.0.bb
rename recipes-qt/qt5/{qt5-5.2.1.inc => qt5-5.3.0.inc} (86%)
rename recipes-qt/qt5/{qtbase-native_5.2.1.bb => qtbase-native_5.3.0.bb} (63%)
create mode 100644 recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
delete mode 100644 recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch
create mode 100644 recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch
create mode 100644 recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
delete mode 100644 recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch
delete mode 100644 recipes-qt/qt5/qtbase_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtbase_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtconnectivity_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtconnectivity_5.3.0.bb
create mode 100644 recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch
delete mode 100644 recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
delete mode 100644 recipes-qt/qt5/qtdeclarative_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtdeclarative_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtgraphicaleffects_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtimageformats_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtimageformats_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtlocation_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtlocation_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtmultimedia_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtmultimedia_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtquick1_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtquick1_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtquickcontrols_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtquickcontrols_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtscript_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtscript_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtsensors_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtsensors_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtserialport_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtserialport_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtsvg_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtsvg_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qttools-native_5.2.1.bb
create mode 100644 recipes-qt/qt5/qttools-native_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qttools_5.2.1.bb
create mode 100644 recipes-qt/qt5/qttools_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtwebkit-examples_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtwebkit-examples_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtwebkit_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtwebkit_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtx11extras_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtx11extras_5.3.0.bb
delete mode 100644 recipes-qt/qt5/qtxmlpatterns_5.2.1.bb
create mode 100644 recipes-qt/qt5/qtxmlpatterns_5.3.0.bb
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
index 884b1a6..62e841c 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -23,6 +23,8 @@ SRC_URI += "\
file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
+ file://0015-Fix-missing-plugin_types.patch \
+ file://0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
"
# common with -native
@@ -67,7 +69,6 @@ FILES_${PN}-tools = " \
DEBIAN_NOAUTONAME_${PN}-tools = "1"
QT_CONFIG_FLAGS += " \
- -reduce-relocations \
-shared \
-silent \
-no-pch \
diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb b/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb
deleted file mode 100644
index c106d22..0000000
--- a/recipes-qt/qt5/nativesdk-qtbase_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b"
-SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_5.3.0.bb b/recipes-qt/qt5/nativesdk-qtbase_5.3.0.bb
new file mode 100644
index 0000000..95d3af7
--- /dev/null
+++ b/recipes-qt/qt5/nativesdk-qtbase_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "4bc43a72e1b3d804171e5b52640e8d96"
+SRC_URI[sha256sum] = "07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab"
diff --git a/recipes-qt/qt5/nativesdk-qttools.inc b/recipes-qt/qt5/nativesdk-qttools.inc
index c67f9cd..6b8ba54 100644
--- a/recipes-qt/qt5/nativesdk-qttools.inc
+++ b/recipes-qt/qt5/nativesdk-qttools.inc
@@ -9,6 +9,12 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools:"
SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch"
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
+
PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
FILES_${PN}-dbg = " \
diff --git a/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb b/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb
deleted file mode 100644
index d186a21..0000000
--- a/recipes-qt/qt5/nativesdk-qttools_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b"
-SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5"
diff --git a/recipes-qt/qt5/nativesdk-qttools_5.3.0.bb b/recipes-qt/qt5/nativesdk-qttools_5.3.0.bb
new file mode 100644
index 0000000..d3956a7
--- /dev/null
+++ b/recipes-qt/qt5/nativesdk-qttools_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "628a91ddfe34efc6622fdba8c6348855"
+SRC_URI[sha256sum] = "f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250"
diff --git a/recipes-qt/qt5/qt5-5.2.1.inc b/recipes-qt/qt5/qt5-5.3.0.inc
similarity index 86%
rename from recipes-qt/qt5/qt5-5.2.1.inc
rename to recipes-qt/qt5/qt5-5.3.0.inc
index 50e8a7a..21c1a22 100644
--- a/recipes-qt/qt5/qt5-5.2.1.inc
+++ b/recipes-qt/qt5/qt5-5.3.0.inc
@@ -4,7 +4,7 @@
QT_VERSION ?= "${PV}"
# it's different for RC versions
-QT_VERSION_DIR ?= "5.2"
+QT_VERSION_DIR ?= "5.3"
SRC_URI += " \
http://download.qt-project.org/official_releases/qt/${QT_VERSION_DIR}/${QT_VERSION}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
@@ -13,7 +13,7 @@ SRC_URI += " \
S = "${WORKDIR}/${QT_MODULE}-opensource-src-${QT_VERSION}"
LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=2abca611d56c23eb99943bde21c80a0d \
file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc
index 860bc29..dc04987 100644
--- a/recipes-qt/qt5/qtbase-native.inc
+++ b/recipes-qt/qt5/qtbase-native.inc
@@ -19,6 +19,8 @@ SRC_URI += "\
file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
+ file://0015-Fix-missing-plugin_types.patch \
+ file://0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
"
# specific for native version
diff --git a/recipes-qt/qt5/qtbase-native_5.2.1.bb b/recipes-qt/qt5/qtbase-native_5.3.0.bb
similarity index 63%
rename from recipes-qt/qt5/qtbase-native_5.2.1.bb
rename to recipes-qt/qt5/qtbase-native_5.3.0.bb
index 54adc48..8468b4f 100644
--- a/recipes-qt/qt5/qtbase-native_5.2.1.bb
+++ b/recipes-qt/qt5/qtbase-native_5.3.0.bb
@@ -7,5 +7,5 @@ do_install_append() {
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
}
-SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b"
-SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0"
+SRC_URI[md5sum] = "4bc43a72e1b3d804171e5b52640e8d96"
+SRC_URI[sha256sum] = "07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab"
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 3768871..726576c 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -11,6 +11,8 @@ SRC_URI += "\
file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
+ file://0015-Fix-missing-plugin_types.patch \
+ file://0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
"
SRC_URI += "\
@@ -18,7 +20,7 @@ SRC_URI += "\
file://0011-Allow-building-a-separate-qmake-for-the-target.patch \
file://0013-QOpenGLPaintDevice-sub-area-support.patch \
file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
- file://0016-eglfs-Fix-quad-coordinates.patch \
+ file://0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
"
DEPENDS += "qtbase-native"
@@ -126,7 +128,6 @@ PACKAGECONFIG[nis] = "-nis,-no-nis"
PACKAGECONFIG[widgets] = "-widgets,-no-widgets"
QT_CONFIG_FLAGS += " \
- -reduce-relocations \
-shared \
-silent \
-no-pch \
diff --git a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch
index b8768c8..e1135ce 100644
--- a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch
+++ b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch
@@ -1,4 +1,4 @@
-From 7999eeb3f2ab1150aa301ec26ae9bf0788d09c9e Mon Sep 17 00:00:00 2001
+From 4d690dbc278063648434b0f02bdb1b6f4623b285 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 27 Apr 2013 23:15:37 +0200
Subject: [PATCH 05/14] qt_module: Fix pkgconfig replacement
@@ -47,10 +47,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 11509ee..be9b929 100644
+index 2134077..a88b8cc 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
-@@ -135,30 +135,36 @@ load(qt_installs)
+@@ -170,30 +170,36 @@ load(qt_installs)
rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
else: \
rplbase = $$MODULE_BASE_OUTDIR
@@ -75,7 +75,7 @@ index 11509ee..be9b929 100644
+lafile_replace.CONFIG = path
+QMAKE_PRL_INSTALL_REPLACE += lib_replace lafile_replace
- unix|win32-g++* {
+ unix|mingw {
CONFIG += create_pc
QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace
- QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace
@@ -93,7 +93,7 @@ index 11509ee..be9b929 100644
+ QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace lafile_replace
}
- unix|win32-g++* {
+ unix|mingw {
--
-1.8.5.3
+1.9.3
diff --git a/recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
new file mode 100644
index 0000000..2f4d80c
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -0,0 +1,30 @@
+From 959b2fb8d8eb5e755e3d9d3d3031b996f96fb23b Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Wed, 19 Mar 2014 18:32:28 +0100
+Subject: [PATCH 8/8] qeglplatformintegration: Undefine CursorShape from X.h
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
+index f665455..9eb783c 100644
+--- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
++++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h
+@@ -46,6 +46,12 @@
+ #include <qpa/qplatformnativeinterface.h>
+ #include <EGL/egl.h>
+
++// Undefine CursorShape from X.h, which is causing breakage in Qt::CursorShape in platformsupport/eglconvenience/
++// /usr/include/X11/X.h:#define CursorShape 0 /* largest size that can be displayed */
++#ifdef CursorShape
++#undef CursorShape
++#endif
++
+ QT_BEGIN_NAMESPACE
+
+ class QEGLPlatformScreen;
+--
+2.0.0
+
diff --git a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
index 5681b58..c55bc54 100644
--- a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
@@ -1,4 +1,4 @@
-From 8a10c6d053fe438aec007e4a73b60ac59716ccd4 Mon Sep 17 00:00:00 2001
+From 745055eb0f56ec4d48ea2ce57bcf3d0011afcec0 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 16 Nov 2013 00:32:30 +0100
Subject: [PATCH 10/12] Always build uic
@@ -10,14 +10,14 @@ Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- src/src.pro | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ src/src.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/src.pro b/src/src.pro
-index b7887a6..8801544 100644
+index 6a805a6..90623a6 100644
--- a/src/src.pro
+++ b/src/src.pro
-@@ -145,7 +145,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
+@@ -158,7 +158,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
}
}
}
@@ -26,13 +26,6 @@ index b7887a6..8801544 100644
nacl: SUBDIRS -= src_network src_testlib
-@@ -156,4 +156,4 @@ TR_EXCLUDE = \
- src_tools_bootstrap_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
-
- sub-tools.depends = $$TOOLS
--QMAKE_EXTRA_TARGETS = sub-tools
-\ No newline at end of file
-+QMAKE_EXTRA_TARGETS = sub-tools
--
-1.8.5.3
+1.9.3
diff --git a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch
index c6ec67c..54039de 100644
--- a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,4 +1,4 @@
-From 2fad0a6fa3c06577995ac44ed0a2a12eaef819c2 Mon Sep 17 00:00:00 2001
+From 3c7bfc66e6c84fe06b16dfa0b76ee71701e8d5b5 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <jani.hautakangas@ixonos.com>
Date: Thu, 16 May 2013 09:52:07 +0300
Subject: [PATCH 13/14] QOpenGLPaintDevice sub-area support
@@ -14,13 +14,13 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
src/gui/opengl/qopenglpaintdevice.cpp | 12 ++++++++++++
src/gui/opengl/qopenglpaintdevice.h | 2 ++
- src/gui/opengl/qopenglpaintengine.cpp | 10 +++++++---
+ src/gui/opengl/qopenglpaintengine.cpp | 9 +++++++--
src/gui/opengl/qopenglpaintengine_p.h | 1 +
src/gui/opengl/qopengltextureglyphcache.cpp | 2 +-
- 5 files changed, 23 insertions(+), 4 deletions(-)
+ 5 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
-index fa392d1..5df1762 100644
+index 6750458..034630a 100644
--- a/src/gui/opengl/qopenglpaintdevice.cpp
+++ b/src/gui/opengl/qopenglpaintdevice.cpp
@@ -111,6 +111,7 @@ class QOpenGLPaintDevicePrivate
@@ -76,7 +76,7 @@ index c05571c..01eb1bc 100644
void setSize(const QSize &size);
void setDevicePixelRatio(qreal devicePixelRatio);
diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
-index 0513551..f6aeb15 100644
+index 81a0d82..ce57261 100644
--- a/src/gui/opengl/qopenglpaintengine.cpp
+++ b/src/gui/opengl/qopenglpaintengine.cpp
@@ -1985,7 +1985,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
@@ -90,24 +90,24 @@ index 0513551..f6aeb15 100644
d->width = sz.width();
d->height = sz.height();
d->mode = BrushDrawingMode;
-@@ -2073,7 +2076,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
+@@ -2070,7 +2073,7 @@ void QOpenGL2PaintEngineEx::ensureActive()
d->device->ensureActiveTarget();
d->transferMode(BrushDrawingMode);
-- glViewport(0, 0, d->width, d->height);
-+ glViewport(d->x, d->y, d->width, d->height);
+- d->funcs.glViewport(0, 0, d->width, d->height);
++ d->funcs.glViewport(d->x, d->y, d->width, d->height);
d->needsSync = false;
d->lastMaskTextureUsed = 0;
d->shaderManager->setDirty();
-@@ -2116,6 +2119,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
+@@ -2113,6 +2116,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
if (bounds == QRect(0, 0, width, height)) {
- glDisable(GL_SCISSOR_TEST);
+ funcs.glDisable(GL_SCISSOR_TEST);
} else {
+ bounds = QRect(bounds.x(), bounds.y(), bounds.width(), bounds.height());
- glEnable(GL_SCISSOR_TEST);
+ funcs.glEnable(GL_SCISSOR_TEST);
setScissor(bounds);
}
-@@ -2124,14 +2128,14 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
+@@ -2121,12 +2125,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest()
void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect)
{
@@ -120,12 +120,10 @@ index 0513551..f6aeb15 100644
}
+ bottom += y;
const int height = rect.height();
--
- glScissor(left, bottom, width, height);
- }
+ funcs.glScissor(left, bottom, width, height);
diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
-index d51f0e5..0d4b38d 100644
+index 4f0e2e5..f211de1 100644
--- a/src/gui/opengl/qopenglpaintengine_p.h
+++ b/src/gui/opengl/qopenglpaintengine_p.h
@@ -264,6 +264,7 @@ public:
@@ -137,18 +135,18 @@ index d51f0e5..0d4b38d 100644
QOpenGLContext *ctx;
EngineMode mode;
diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
-index 3b62d1d..a5d1f7e 100644
+index ac88d9d..6c77f10 100644
--- a/src/gui/opengl/qopengltextureglyphcache.cpp
+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
-@@ -273,7 +273,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
- funcs.glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
+@@ -315,7 +315,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
+ funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
if (pex != 0) {
-- glViewport(0, 0, pex->width, pex->height);
-+ glViewport(pex->x, pex->y, pex->width, pex->height);
+- funcs->glViewport(0, 0, pex->width, pex->height);
++ funcs->glViewport(pex->x, pex->y, pex->width, pex->height);
pex->updateClipScissorTest();
} else {
- m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
+ if (m_vao.isCreated()) {
--
-1.8.5.3
+1.9.3
diff --git a/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch b/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch
deleted file mode 100644
index a31301e..0000000
--- a/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 99979159a404df09495c8ddd6a052837f66b8739 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
-Date: Fri, 7 Feb 2014 13:12:37 +0100
-Subject: [PATCH] Fix linuxfb argument 'mmsize' parsing
-
-Parse first for 'mmsize' because the regex for 'size' also fits to 'mmsize'.
-
-Upstream-Status: Backport
-
-Task-number: QTBUG-29133
-Change-Id: Idc4950270818e496d5d94a97a172b7c780f069b1
-Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
-Signed-off-by: Jonathan Liu <net147@gmail.com>
----
- src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-index 735a43d..33a9523 100644
---- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-+++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-@@ -333,6 +333,8 @@ bool QLinuxFbScreen::initialize()
- foreach (const QString &arg, mArgs) {
- if (arg == QLatin1String("nographicsmodeswitch"))
- doSwitchToGraphicsMode = false;
-+ else if (mmSizeRx.indexIn(arg) != -1)
-+ userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt());
- else if (sizeRx.indexIn(arg) != -1)
- userGeometry.setSize(QSize(sizeRx.cap(1).toInt(), sizeRx.cap(2).toInt()));
- else if (offsetRx.indexIn(arg) != -1)
-@@ -341,8 +343,6 @@ bool QLinuxFbScreen::initialize()
- ttyDevice = ttyRx.cap(1);
- else if (fbRx.indexIn(arg) != -1)
- fbDevice = fbRx.cap(1);
-- else if (mmSizeRx.indexIn(arg) != -1)
-- userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt());
- }
-
- if (fbDevice.isEmpty()) {
---
-1.7.1
-
diff --git a/recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch b/recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch
new file mode 100644
index 0000000..612cbdd
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch
@@ -0,0 +1,30 @@
+From f0e01b788e86f24352ba14ad17c3f337f934467d Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 21 Apr 2014 15:09:23 +0200
+Subject: [PATCH] Fix missing plugin_types
+
+* bearer/generic was failing with:
+ Project ERROR: No module claims plugin type 'bearer'
+
+Change-Id: I90848856a8b0a4df52e599983cf7dde0bc0e6623
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ mkspecs/features/qt_module_pris.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
+index f31bc38..415e780 100644
+--- a/mkspecs/features/qt_module_pris.prf
++++ b/mkspecs/features/qt_module_pris.prf
+@@ -177,7 +177,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
+ include($$mod_work_pfx/qt_lib_$${pri}.pri)
+ for(mod, mods_to_load) {
+ for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \
+- name depends module_config CONFIG DEFINES sources \
++ name depends module_config plugin_types CONFIG DEFINES sources \
+ includes bins libs libexecs plugins imports qml \
+ rpath_link \
+ )):defined(QT.$${mod}.$$var, var):cache(QT.$${mod}.$$var, transient)
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
new file mode 100644
index 0000000..65ebbd1
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
@@ -0,0 +1,56 @@
+From 91b185d1f4843d22d42461c0aee4cd0f5393bbc8 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Mon, 21 Apr 2014 19:22:04 +0200
+Subject: [PATCH] Revert "eglfs: Print the chosen config in debug mode"
+
+This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e.
+---
+ src/platformsupport/eglconvenience/qeglconvenience.cpp | 4 +++-
+ src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 -------
+ 2 files changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
+index e6624fb..3870f6c 100644
+--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
++++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
+@@ -437,9 +437,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
+ for (index = 0; attrs[index].attr != -1; ++index) {
+ EGLint value;
+ if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) {
+- qDebug("\t%s: %d", attrs[index].name, (int)value);
++ qWarning("\t%s: %d\n", attrs[index].name, (int)value);
+ }
+ }
++
++ qWarning("\n");
+ }
+
+ #ifdef Q_OS_LINUX
+diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+index eec6463..4a7c69b 100644
+--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
++++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+@@ -44,7 +44,6 @@
+ #include "qeglpbuffer_p.h"
+ #include <qpa/qplatformwindow.h>
+ #include <QOpenGLContext>
+-#include <QDebug>
+
+ QT_BEGIN_NAMESPACE
+
+@@ -192,12 +191,6 @@ void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLCont
+ return;
+ }
+
+- static const bool printConfig = qgetenv("QT_QPA_EGLFS_DEBUG").toInt();
+- if (printConfig) {
+- qDebug() << "Created context for format" << format << "with config:";
+- q_printEglConfig(m_eglDisplay, m_eglConfig);
+- }
+-
+ #ifndef QT_NO_OPENGL
+ // Make the context current to ensure the GL version query works. This needs a surface too.
+ const EGLint pbufferAttributes[] = {
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch b/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch
deleted file mode 100644
index 92785e4..0000000
--- a/recipes-qt/qt5/qtbase/0016-eglfs-Fix-quad-coordinates.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 84756d94c73885803ad8044099ab47c0c49b5076 Mon Sep 17 00:00:00 2001
-From: Laszlo Agocs <laszlo.agocs@digia.com>
-Date: Thu, 23 Jan 2014 11:45:22 +0100
-Subject: [PATCH] eglfs: Fix quad coordinates
-
-Prevent artifacts on raster windows by properly mapping
-the coordinates to [-1,1].
-
-Upstream-Status: Backport
-
-Task-number: QTBUG-36370
-Change-Id: I95d0d03952f597ef4ce6a950c6533a3af2df964a
-Reviewed-by: Andy Nichols <andy.nichols@digia.com>
-Signed-off-by: Jonathan Liu <net147@gmail.com>
----
- src/plugins/platforms/eglfs/qeglfscompositor.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/platforms/eglfs/qeglfscompositor.cpp b/src/plugins/platforms/eglfs/qeglfscompositor.cpp
-index 845bb5b..1efc4f7 100644
---- a/src/plugins/platforms/eglfs/qeglfscompositor.cpp
-+++ b/src/plugins/platforms/eglfs/qeglfscompositor.cpp
-@@ -153,10 +153,11 @@ void QEglFSCompositor::render(QEglFSWindow *window, uint texture, bool raster)
- QPoint tl = r.topLeft();
- QPoint br = r.bottomRight();
-
-+ // Map to [-1,1]
- GLfloat x1 = (tl.x() / sr.width()) * 2 - 1;
-- GLfloat x2 = (br.x() / sr.width()) * 2 - 1;
- GLfloat y1 = ((sr.height() - tl.y()) / sr.height()) * 2 - 1;
-- GLfloat y2 = ((sr.height() - br.y()) / sr.height()) * 2 - 1;
-+ GLfloat x2 = ((br.x() + 1) / sr.width()) * 2 - 1;
-+ GLfloat y2 = ((sr.height() - (br.y() + 1)) / sr.height()) * 2 - 1;
-
- if (!raster)
- qSwap(y1, y2);
---
-1.7.1
-
diff --git a/recipes-qt/qt5/qtbase_5.2.1.bb b/recipes-qt/qt5/qtbase_5.2.1.bb
deleted file mode 100644
index 4257367..0000000
--- a/recipes-qt/qt5/qtbase_5.2.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI += "file://0015-Fix-linuxfb-argument-mmsize-parsing.patch"
-
-SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b"
-SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0"
diff --git a/recipes-qt/qt5/qtbase_5.3.0.bb b/recipes-qt/qt5/qtbase_5.3.0.bb
new file mode 100644
index 0000000..95d3af7
--- /dev/null
+++ b/recipes-qt/qt5/qtbase_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "4bc43a72e1b3d804171e5b52640e8d96"
+SRC_URI[sha256sum] = "07320bc8bbb718c420e22486942985c79fb2e2743981a19954aa09cc8a7147ab"
diff --git a/recipes-qt/qt5/qtconnectivity.inc b/recipes-qt/qt5/qtconnectivity.inc
index c0a5147..a5fbb0c 100644
--- a/recipes-qt/qt5/qtconnectivity.inc
+++ b/recipes-qt/qt5/qtconnectivity.inc
@@ -11,3 +11,9 @@ do_configure_prepend() {
}
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'bluez4', 'CONFIG+=OE_BLUEZ_ENABLED', '', d)}"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtconnectivity_5.2.1.bb b/recipes-qt/qt5/qtconnectivity_5.2.1.bb
deleted file mode 100644
index 6fd0c7b..0000000
--- a/recipes-qt/qt5/qtconnectivity_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "cb2ef624b28b6ba61d6a467b8b3c314a"
-SRC_URI[sha256sum] = "ec31e1c3cd5aea4d7dff946802a7fde2599bb8a1931d4bb49cb0854371cf1223"
diff --git a/recipes-qt/qt5/qtconnectivity_5.3.0.bb b/recipes-qt/qt5/qtconnectivity_5.3.0.bb
new file mode 100644
index 0000000..2fb3f09
--- /dev/null
+++ b/recipes-qt/qt5/qtconnectivity_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "46e4e8df94b4da4415aa5f5076b8bc45"
+SRC_URI[sha256sum] = "d83555be4fc805afe9ef307cf8633d9c0cebc678042e384b24e0aa61d7bc1d02"
diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc
index 4a186fd..bdb1de9 100644
--- a/recipes-qt/qt5/qtdeclarative.inc
+++ b/recipes-qt/qt5/qtdeclarative.inc
@@ -2,8 +2,15 @@ require qt5.inc
SRC_URI += " \
file://0001-qmltestexample-fix-link.patch \
+ file://0002-Fix-improper-antialiasing-property-behavior.patch \
"
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
+
DEPENDS += "qtbase"
PACKAGECONFIG ??= "qtxmlpatterns"
diff --git a/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch b/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch
new file mode 100644
index 0000000..821149f
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative/0002-Fix-improper-antialiasing-property-behavior.patch
@@ -0,0 +1,60 @@
+From 009ad875f89d7d7bc4447e18c2fbbd485a75e0b5 Mon Sep 17 00:00:00 2001
+From: Oleg Shparber <trollixx@gmail.com>
+Date: Mon, 19 May 2014 00:53:39 -0700
+Subject: [PATCH] Fix improper antialiasing property behavior
+
+For components antialiased by default the property was returned
+as false if default true value was set to true again.
+
+Upstream-Status: Backport
+
+Task-number: QTBUG-39047
+Change-Id: I16960a12b6d38a0d9e487fc6612610c39c4949d4
+Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
+Signed-off-by: Jonathan Liu <net147@gmail.com>
+---
+ src/quick/items/qquickitem.cpp | 8 +++++---
+ tests/auto/quick/qquicktext/tst_qquicktext.cpp | 7 +++++++
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
+index 3f0dae8..ef2eac4 100644
+--- a/src/quick/items/qquickitem.cpp
++++ b/src/quick/items/qquickitem.cpp
+@@ -5691,10 +5691,12 @@ void QQuickItem::setAntialiasing(bool aa)
+ {
+ Q_D(QQuickItem);
+
+- bool changed = (aa != antialiasing());
+- d->antialiasingValid = true;
++ if (!d->antialiasingValid) {
++ d->antialiasingValid = true;
++ d->antialiasing = d->implicitAntialiasing;
++ }
+
+- if (!changed)
++ if (aa == d->antialiasing)
+ return;
+
+ d->antialiasing = aa;
+diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+index 0b69981..d36c55d 100644
+--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
++++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+@@ -1334,6 +1334,13 @@ void tst_qquicktext::antialiasing()
+ text->resetAntialiasing();
+ QCOMPARE(text->antialiasing(), true);
+ QCOMPARE(spy.count(), 2);
++
++ // QTBUG-39047
++ component.setData("import QtQuick 2.0\n Text { antialiasing: true }", QUrl());
++ object.reset(component.create());
++ text = qobject_cast<QQuickText *>(object.data());
++ QVERIFY(text);
++ QCOMPARE(text->antialiasing(), true);
+ }
+
+ void tst_qquicktext::weight()
+--
+1.9.3
+
diff --git a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch b/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
deleted file mode 100644
index 5643634..0000000
--- a/recipes-qt/qt5/qtdeclarative/0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a13535b21b8406d65c8f139306d8324bda05443b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20H=C3=A4nel?= <florian.haenel@basyskom.com>
-Date: Wed, 5 Jun 2013 19:23:32 +0200
-Subject: [PATCH 2/2] Fix wrong calculation of viewPort for transitions
-
-Viewport is calculated wrong for horizontal layout in a second instance
-
-Task-number: QTBUG-29944
-Task-Number: QTBUG-31546
-
-Upstream-Status: Pending
-
-Looks like backport of https://codereview.qt-project.org/49226 but this
-one was applied in previous patch, this change looks the same but is
-in different part of qquickitemview.cpp and ISN'T applied yet in dev
-branch.
-
-Signed-off-by: Florian Haenel <florian.haenel@lge.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
-Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe
----
- src/quick/items/qquickitemview.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
-index d7b9847..a54d282 100644
---- a/src/quick/items/qquickitemview.cpp
-+++ b/src/quick/items/qquickitemview.cpp
-@@ -1835,7 +1835,7 @@ void QQuickItemViewPrivate::layout()
-
- prepareVisibleItemTransitions();
-
-- QRectF viewBounds(0, position(), q->width(), q->height());
-+ QRectF viewBounds(q->contentX(), q->contentY(), q->width(), q->height());
- for (QList<FxViewItem*>::Iterator it = releasePendingTransition.begin();
- it != releasePendingTransition.end(); ) {
- FxViewItem *item = *it;
---
-1.8.5.3
-
diff --git a/recipes-qt/qt5/qtdeclarative_5.2.1.bb b/recipes-qt/qt5/qtdeclarative_5.2.1.bb
deleted file mode 100644
index eaa90ba..0000000
--- a/recipes-qt/qt5/qtdeclarative_5.2.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI += " \
- file://0003-Fix-wrong-calculation-of-viewPort-for-transitions.patch \
-"
-
-SRC_URI[md5sum] = "a23fba03a4b48f36fe8b51d326d08acc"
-SRC_URI[sha256sum] = "7e32b8d6e1d64ca4bdfa92d15f9b4217a1b24239ef40e8826eeccbe918866690"
diff --git a/recipes-qt/qt5/qtdeclarative_5.3.0.bb b/recipes-qt/qt5/qtdeclarative_5.3.0.bb
new file mode 100644
index 0000000..6725b57
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "9e29d2b481c771ce5c798a3319835673"
+SRC_URI[sha256sum] = "fab07eb4f4b2091e1d88b27b84ac49d7e8daaa1eb72fd62e602ee9ac3ed7f42f"
diff --git a/recipes-qt/qt5/qtgraphicaleffects.inc b/recipes-qt/qt5/qtgraphicaleffects.inc
index 2ced3c2..8610c34 100644
--- a/recipes-qt/qt5/qtgraphicaleffects.inc
+++ b/recipes-qt/qt5/qtgraphicaleffects.inc
@@ -3,3 +3,9 @@ require qt5.inc
DEPENDS += "qtdeclarative"
RDEPENDS_${PN}-dev = ""
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb b/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb
deleted file mode 100644
index 4d5673b..0000000
--- a/recipes-qt/qt5/qtgraphicaleffects_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "8dde8593750e33a79f49c5a2f03caf0c"
-SRC_URI[sha256sum] = "5abb17ee60d68cf49c4f8f0b69c3f1e4d0a2f7b32cda8d6901d9c35447cc3482"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.3.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.3.0.bb
new file mode 100644
index 0000000..f63e05a
--- /dev/null
+++ b/recipes-qt/qt5/qtgraphicaleffects_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "a4170d057978794c2c3c477e841a0e08"
+SRC_URI[sha256sum] = "3f95fb603fb3c7fbb54587b3dfe423491e058fd61af2d7371b1f12881cff20c1"
diff --git a/recipes-qt/qt5/qtimageformats.inc b/recipes-qt/qt5/qtimageformats.inc
index f90e58a..b5edf1b 100644
--- a/recipes-qt/qt5/qtimageformats.inc
+++ b/recipes-qt/qt5/qtimageformats.inc
@@ -2,3 +2,9 @@ require qt5.inc
DEPENDS += "qtbase tiff"
ALLOW_EMPTY_${PN} = "1"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtimageformats_5.2.1.bb b/recipes-qt/qt5/qtimageformats_5.2.1.bb
deleted file mode 100644
index 2d24ce7..0000000
--- a/recipes-qt/qt5/qtimageformats_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "9b88aa6f3888c7c7f5253c147ae4bf8f"
-SRC_URI[sha256sum] = "a6a0454769566fec1757fb09b1f33c9fc70d4016acbb04ebc6e493ddedfef124"
diff --git a/recipes-qt/qt5/qtimageformats_5.3.0.bb b/recipes-qt/qt5/qtimageformats_5.3.0.bb
new file mode 100644
index 0000000..509d815
--- /dev/null
+++ b/recipes-qt/qt5/qtimageformats_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "90c751ffe23c005eb411d1f081bf116d"
+SRC_URI[sha256sum] = "f3b895847d27eaa98979ad146e6c0f46f38e23471a87ef496b8b777c578db2dc"
diff --git a/recipes-qt/qt5/qtlocation.inc b/recipes-qt/qt5/qtlocation.inc
index 41f2d19..a35b0fa 100644
--- a/recipes-qt/qt5/qtlocation.inc
+++ b/recipes-qt/qt5/qtlocation.inc
@@ -18,3 +18,9 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtlocation_5.2.1.bb b/recipes-qt/qt5/qtlocation_5.2.1.bb
deleted file mode 100644
index f920e2c..0000000
--- a/recipes-qt/qt5/qtlocation_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "4de8ca8ac1a3e5db20a903286fb78840"
-SRC_URI[sha256sum] = "9543fcdcab5cf02be60e395e8145e1ec87d03a3d1f129a0dde92102283a9b536"
diff --git a/recipes-qt/qt5/qtlocation_5.3.0.bb b/recipes-qt/qt5/qtlocation_5.3.0.bb
new file mode 100644
index 0000000..4af556f
--- /dev/null
+++ b/recipes-qt/qt5/qtlocation_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "bfc7678bfe7d78f12fb20a54ac54e610"
+SRC_URI[sha256sum] = "ca34224a8aa5e6f81c04cbeb05ecc440b82cf27ac24f7c2b1d297a3497110414"
diff --git a/recipes-qt/qt5/qtmultimedia.inc b/recipes-qt/qt5/qtmultimedia.inc
index 3b7e568..119d61a 100644
--- a/recipes-qt/qt5/qtmultimedia.inc
+++ b/recipes-qt/qt5/qtmultimedia.inc
@@ -15,3 +15,9 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'openal', 'CONFIG+=OE_OPENAL_ENABLED', '', d)}"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gstreamer010', 'CONFIG+=OE_GSTREAMER010_ENABLED', '', d)}"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtmultimedia_5.2.1.bb b/recipes-qt/qt5/qtmultimedia_5.2.1.bb
deleted file mode 100644
index fc823a6..0000000
--- a/recipes-qt/qt5/qtmultimedia_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "26dc22c59fbbad9fdf0699d5f887166a"
-SRC_URI[sha256sum] = "62688cb7d8daa4d7050353fe39536c5edd97228a10185b9662a29b8c8cff1fa2"
diff --git a/recipes-qt/qt5/qtmultimedia_5.3.0.bb b/recipes-qt/qt5/qtmultimedia_5.3.0.bb
new file mode 100644
index 0000000..4d72587
--- /dev/null
+++ b/recipes-qt/qt5/qtmultimedia_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "921f4596ca39b78851663369db0bbcee"
+SRC_URI[sha256sum] = "9f30b9f0f758c44db4743d2de409cfa0aef297bc6b81c929b1875dfb638d517b"
diff --git a/recipes-qt/qt5/qtquick1.inc b/recipes-qt/qt5/qtquick1.inc
index a9ec211..0c690b2 100644
--- a/recipes-qt/qt5/qtquick1.inc
+++ b/recipes-qt/qt5/qtquick1.inc
@@ -2,3 +2,9 @@ require qt5.inc
DEPENDS += "qtscript qtsvg qtxmlpatterns qtwebkit"
# qttools
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtquick1_5.2.1.bb b/recipes-qt/qt5/qtquick1_5.2.1.bb
deleted file mode 100644
index 7563bc6..0000000
--- a/recipes-qt/qt5/qtquick1_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "6abbf131adffdf3cba63704d5d35f921"
-SRC_URI[sha256sum] = "8b2bb3250b9e09a4c568069bc4c7cfeddbdcda50b24f0bfecc7f85df3120ff65"
diff --git a/recipes-qt/qt5/qtquick1_5.3.0.bb b/recipes-qt/qt5/qtquick1_5.3.0.bb
new file mode 100644
index 0000000..bf6e8df
--- /dev/null
+++ b/recipes-qt/qt5/qtquick1_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "cd6ffd4a29f7050f71670e7afec09e5d"
+SRC_URI[sha256sum] = "74b03938df58e7825b0e46efb8266ac8d53741fff1c467b5b1fbfe2f3b840b68"
diff --git a/recipes-qt/qt5/qtquickcontrols.inc b/recipes-qt/qt5/qtquickcontrols.inc
index 2ced3c2..8610c34 100644
--- a/recipes-qt/qt5/qtquickcontrols.inc
+++ b/recipes-qt/qt5/qtquickcontrols.inc
@@ -3,3 +3,9 @@ require qt5.inc
DEPENDS += "qtdeclarative"
RDEPENDS_${PN}-dev = ""
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtquickcontrols_5.2.1.bb b/recipes-qt/qt5/qtquickcontrols_5.2.1.bb
deleted file mode 100644
index 2c09e44..0000000
--- a/recipes-qt/qt5/qtquickcontrols_5.2.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "027bc7d05fe740b21284dc909c9f11ac"
-SRC_URI[sha256sum] = "eb03a69402576984d588923e994c3cb672d8479ac9b68ed90da15d0c2fd82aac"
-
diff --git a/recipes-qt/qt5/qtquickcontrols_5.3.0.bb b/recipes-qt/qt5/qtquickcontrols_5.3.0.bb
new file mode 100644
index 0000000..365d511
--- /dev/null
+++ b/recipes-qt/qt5/qtquickcontrols_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "808b5a28f152f1af19dad30a10e5dbf1"
+SRC_URI[sha256sum] = "b8df0d64b69e765971fd6c71d8f0c4f7aabec73343a98225a4655a0b8b82df1c"
diff --git a/recipes-qt/qt5/qtscript.inc b/recipes-qt/qt5/qtscript.inc
index bbb05a6..73f5898 100644
--- a/recipes-qt/qt5/qtscript.inc
+++ b/recipes-qt/qt5/qtscript.inc
@@ -1,3 +1,9 @@
require qt5.inc
DEPENDS += "qtbase"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtscript_5.2.1.bb b/recipes-qt/qt5/qtscript_5.2.1.bb
deleted file mode 100644
index 4617c09..0000000
--- a/recipes-qt/qt5/qtscript_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "b8af09bb297d4c62e64df5418fe99dc9"
-SRC_URI[sha256sum] = "6621350d5eff65cb6f9853247246f30a2d4cdb465c14923ff7ccbd8c3a9cdefa"
diff --git a/recipes-qt/qt5/qtscript_5.3.0.bb b/recipes-qt/qt5/qtscript_5.3.0.bb
new file mode 100644
index 0000000..6065e6b
--- /dev/null
+++ b/recipes-qt/qt5/qtscript_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "4f755c8810946246adcfbaa74fafae62"
+SRC_URI[sha256sum] = "a86067103ffb4c307619aeaef68fbe25e7219ffd34b369e445cdd4deb4108390"
diff --git a/recipes-qt/qt5/qtsensors.inc b/recipes-qt/qt5/qtsensors.inc
index b2147f1..550398e 100644
--- a/recipes-qt/qt5/qtsensors.inc
+++ b/recipes-qt/qt5/qtsensors.inc
@@ -1,3 +1,9 @@
require qt5.inc
DEPENDS += "qtbase qtdeclarative"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtsensors_5.2.1.bb b/recipes-qt/qt5/qtsensors_5.2.1.bb
deleted file mode 100644
index 1f340d0..0000000
--- a/recipes-qt/qt5/qtsensors_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "045f98acba9fba0358a6a50356be0841"
-SRC_URI[sha256sum] = "09403e7e088f30da828e452559a6904d7c43420d423a429d6529285f99b1e407"
diff --git a/recipes-qt/qt5/qtsensors_5.3.0.bb b/recipes-qt/qt5/qtsensors_5.3.0.bb
new file mode 100644
index 0000000..03df1fc
--- /dev/null
+++ b/recipes-qt/qt5/qtsensors_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "3f8c7e7ed87785d8c1fbab4fec6f458d"
+SRC_URI[sha256sum] = "dde4d55635e616406adaf8e100dc468ccdd296c6589eff1208f0dce0ffc597c1"
diff --git a/recipes-qt/qt5/qtserialport_5.2.1.bb b/recipes-qt/qt5/qtserialport_5.2.1.bb
deleted file mode 100644
index 806e7ee..0000000
--- a/recipes-qt/qt5/qtserialport_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "2993ad7e92a0b6b41e3cb0e0e345d251"
-SRC_URI[sha256sum] = "f5754e4ba61843b7dfdf946a91b7d857a5cb470608b840f92452e72f24c67347"
diff --git a/recipes-qt/qt5/qtserialport_5.3.0.bb b/recipes-qt/qt5/qtserialport_5.3.0.bb
new file mode 100644
index 0000000..0df68e4
--- /dev/null
+++ b/recipes-qt/qt5/qtserialport_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "393a352f82f1f0000157834751a29578"
+SRC_URI[sha256sum] = "772d230019c52452dc661e864debf1fd520460bddce8d8abda70a4dcc00e8d5f"
diff --git a/recipes-qt/qt5/qtsvg.inc b/recipes-qt/qt5/qtsvg.inc
index bbb05a6..73f5898 100644
--- a/recipes-qt/qt5/qtsvg.inc
+++ b/recipes-qt/qt5/qtsvg.inc
@@ -1,3 +1,9 @@
require qt5.inc
DEPENDS += "qtbase"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtsvg_5.2.1.bb b/recipes-qt/qt5/qtsvg_5.2.1.bb
deleted file mode 100644
index d12bd83..0000000
--- a/recipes-qt/qt5/qtsvg_5.2.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "3f5487fe2bd5024f18f63a8d0eb4294d"
-SRC_URI[sha256sum] = "788f69557ff6d28073d6ef2b3300b42b987fba1d122f7884ba0269023cab44ef"
-
diff --git a/recipes-qt/qt5/qtsvg_5.3.0.bb b/recipes-qt/qt5/qtsvg_5.3.0.bb
new file mode 100644
index 0000000..77b591b
--- /dev/null
+++ b/recipes-qt/qt5/qtsvg_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "a35e2df8ff2d6b99e4b33443165359f4"
+SRC_URI[sha256sum] = "8006ca1cb13844772ac2926e662ab7a0eb16cb26157954cd415e0f6d641b4ed0"
diff --git a/recipes-qt/qt5/qttools-native.inc b/recipes-qt/qt5/qttools-native.inc
index 03b88cd..28fa3f8 100644
--- a/recipes-qt/qt5/qttools-native.inc
+++ b/recipes-qt/qt5/qttools-native.inc
@@ -13,3 +13,9 @@ do_configure() {
do_install() {
oe_runmake install INSTALL_ROOT=${D}
}
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qttools-native_5.2.1.bb b/recipes-qt/qt5/qttools-native_5.2.1.bb
deleted file mode 100644
index d186a21..0000000
--- a/recipes-qt/qt5/qttools-native_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b"
-SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5"
diff --git a/recipes-qt/qt5/qttools-native_5.3.0.bb b/recipes-qt/qt5/qttools-native_5.3.0.bb
new file mode 100644
index 0000000..d3956a7
--- /dev/null
+++ b/recipes-qt/qt5/qttools-native_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "628a91ddfe34efc6622fdba8c6348855"
+SRC_URI[sha256sum] = "f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250"
diff --git a/recipes-qt/qt5/qttools.inc b/recipes-qt/qt5/qttools.inc
index 0192f22..d4d8017 100644
--- a/recipes-qt/qt5/qttools.inc
+++ b/recipes-qt/qt5/qttools.inc
@@ -6,4 +6,10 @@ SRC_URI += " \
file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \
"
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
+
FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples"
diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
index 49f296d..0479bec 100644
--- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
@@ -1,4 +1,4 @@
-From a5150c9701d5b2e6c77e521544034ea732d2266b Mon Sep 17 00:00:00 2001
+From 5eb3dd427bca8bbc13b7554e8e21993b2fc708e7 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.jansa@gmail.com>
Date: Wed, 11 Sep 2013 18:30:08 +0200
Subject: [PATCH 1/2] Allow to build only lrelease + lupdate + lconvert
@@ -14,9 +14,9 @@ Signed-off-by: Martin Jansa <Martin.jansa@gmail.com>
examples/examples.pro | 4 ++--
src/designer/src/src.pro | 16 +++++++++-------
src/linguist/linguist.pro | 2 +-
- src/src.pro | 10 ++++++----
- tests/auto/auto.pro | 22 ++++++++++++----------
- 5 files changed, 30 insertions(+), 24 deletions(-)
+ src/src.pro | 14 ++++++++------
+ tests/auto/auto.pro | 24 +++++++++++++-----------
+ 5 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/examples/examples.pro b/examples/examples.pro
index 4955969..8e86419 100644
@@ -61,7 +61,7 @@ index e02ca8e..49527c5 100644
components \
designer \
diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
-index 2979a23..663bdd5 100644
+index 3a70580..a977878 100644
--- a/src/linguist/linguist.pro
+++ b/src/linguist/linguist.pro
@@ -3,7 +3,7 @@ SUBDIRS = \
@@ -74,7 +74,7 @@ index 2979a23..663bdd5 100644
qtNomakeTools( \
linguist \
diff --git a/src/src.pro b/src/src.pro
-index 866a199..ec08874 100644
+index a07a3bb..4c6b463 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -4,10 +4,12 @@ qtHaveModule(widgets) {
@@ -82,7 +82,7 @@ index 866a199..ec08874 100644
message("Some graphics-related tools are unavailable without PNG support")
} else {
- SUBDIRS = assistant \
-+ !linguistonly {
++ !linguistonly {
+ SUBDIRS = assistant \
pixeltool \
- qtestlib \
@@ -93,6 +93,15 @@ index 866a199..ec08874 100644
# unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
linguist.depends = designer
+@@ -15,7 +17,7 @@ qtHaveModule(widgets) {
+ }
+
+ SUBDIRS += linguist
+-if(!android|android_app):!ios: SUBDIRS += qtpaths
++!linguistonly:if(!android|android_app):!ios: SUBDIRS += qtpaths
+
+ mac {
+ SUBDIRS += macdeployqt
@@ -25,7 +27,7 @@ android {
SUBDIRS += androiddeployqt
}
@@ -101,12 +110,18 @@ index 866a199..ec08874 100644
+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus
win32|winrt:SUBDIRS += windeployqt
+ winrt:SUBDIRS += winrtrunner qtd3dservice
+@@ -36,4 +38,4 @@ qtNomakeTools( \
+ macdeployqt \
+ )
+-!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
++!linguistonly:!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
-index eaf440b..1778ad1 100644
+index c3acfe3..f2f88f7 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
-@@ -1,14 +1,16 @@
+@@ -1,15 +1,17 @@
TEMPLATE=subdirs
-SUBDIRS=\
- linguist \
@@ -117,7 +132,8 @@ index eaf440b..1778ad1 100644
- qhelpindexmodel \
- qhelpprojectdata \
- cmake \
-- installed_cmake
+- installed_cmake \
+- qtdiag
+!linguistonly {
+ SUBDIRS=\
+ linguist \
@@ -129,10 +145,11 @@ index eaf440b..1778ad1 100644
+ qhelpprojectdata \
+ cmake \
+ installed_cmake
++ qtdiag
+}
installed_cmake.depends = cmake
--
-1.8.5.3
+1.9.3
diff --git a/recipes-qt/qt5/qttools_5.2.1.bb b/recipes-qt/qt5/qttools_5.2.1.bb
deleted file mode 100644
index d186a21..0000000
--- a/recipes-qt/qt5/qttools_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b"
-SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5"
diff --git a/recipes-qt/qt5/qttools_5.3.0.bb b/recipes-qt/qt5/qttools_5.3.0.bb
new file mode 100644
index 0000000..d3956a7
--- /dev/null
+++ b/recipes-qt/qt5/qttools_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "628a91ddfe34efc6622fdba8c6348855"
+SRC_URI[sha256sum] = "f64d2ca5dc59ab8980987649bcef4597a7c0194e802e64d93448cac892fd8250"
diff --git a/recipes-qt/qt5/qtwayland-native.inc b/recipes-qt/qt5/qtwayland-native.inc
index 78416e8..bddcc22 100644
--- a/recipes-qt/qt5/qtwayland-native.inc
+++ b/recipes-qt/qt5/qtwayland-native.inc
@@ -15,3 +15,9 @@ do_configure() {
do_install() {
oe_runmake install INSTALL_ROOT=${D}
}
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc
index abeb15f..bb52f0d 100644
--- a/recipes-qt/qt5/qtwayland.inc
+++ b/recipes-qt/qt5/qtwayland.inc
@@ -22,3 +22,9 @@ FILES_${PN}-plugins += " \
FILES_${PN}-plugins-dbg += " \
${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \
"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb b/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb
deleted file mode 100644
index c16f91c..0000000
--- a/recipes-qt/qt5/qtwebkit-examples_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "ddad7d00ebd201a750242bd67b20ecf3"
-SRC_URI[sha256sum] = "d5ecff99b4d35bc5f184503cabc394a554be48c368aba140f95019501645a7f5"
diff --git a/recipes-qt/qt5/qtwebkit-examples_5.3.0.bb b/recipes-qt/qt5/qtwebkit-examples_5.3.0.bb
new file mode 100644
index 0000000..d1400fd
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit-examples_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "4ab24c0bf04f21207a48f261ce0d7943"
+SRC_URI[sha256sum] = "7e491050000c9608bf36f78bb3db5938b92e0dce89d686d903c85dc8fdadef38"
diff --git a/recipes-qt/qt5/qtwebkit_5.2.1.bb b/recipes-qt/qt5/qtwebkit_5.2.1.bb
deleted file mode 100644
index ef166f2..0000000
--- a/recipes-qt/qt5/qtwebkit_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "a20d99a1c2afbd6a7c6f54e615f1bd63"
-SRC_URI[sha256sum] = "ac089723489ee9146020bd8fc715358249d8cea7f2a2e92a692e2a5595a46b5c"
diff --git a/recipes-qt/qt5/qtwebkit_5.3.0.bb b/recipes-qt/qt5/qtwebkit_5.3.0.bb
new file mode 100644
index 0000000..6e4b001
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "cc9197eaef9e7950e907635f9bde1e98"
+SRC_URI[sha256sum] = "ceb1aeeede1febddbc10c5c23e6bcb18a90a5eb4d162d6f0b5075ff4ff3ba335"
--git a/recipes-qt/qt5/qtx11extras.inc b/recipes-qt/qt5/qtx11extras.inc
index bbb05a6..73f5898 100644
--- a/recipes-qt/qt5/qtx11extras.inc
+++ b/recipes-qt/qt5/qtx11extras.inc
@@ -1,3 +1,9 @@
require qt5.inc
DEPENDS += "qtbase"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtx11extras_5.2.1.bb b/recipes-qt/qt5/qtx11extras_5.2.1.bb
deleted file mode 100644
index b619a4d..0000000
--- a/recipes-qt/qt5/qtx11extras_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "ad94a2f14afc3f2dfe9743027860c28a"
-SRC_URI[sha256sum] = "4f62647772d37d27921a77caf6e02c51fb207c5a1d604b0b3047a92d0163d4b9"
--git a/recipes-qt/qt5/qtx11extras_5.3.0.bb b/recipes-qt/qt5/qtx11extras_5.3.0.bb
new file mode 100644
index 0000000..61b5814
--- /dev/null
+++ b/recipes-qt/qt5/qtx11extras_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "83fc516c7f6ab82599b3f6e46744cb85"
+SRC_URI[sha256sum] = "92d1c051294d92a250a405c120673721865b37d8f5db4eaac4b3f7fe46707719"
diff --git a/recipes-qt/qt5/qtxmlpatterns.inc b/recipes-qt/qt5/qtxmlpatterns.inc
index bbb05a6..73f5898 100644
--- a/recipes-qt/qt5/qtxmlpatterns.inc
+++ b/recipes-qt/qt5/qtxmlpatterns.inc
@@ -1,3 +1,9 @@
require qt5.inc
DEPENDS += "qtbase"
+
+# older copyright year than what e.g. qtbase is using now
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb b/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb
deleted file mode 100644
index ab5570c..0000000
--- a/recipes-qt/qt5/qtxmlpatterns_5.2.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-SRC_URI[md5sum] = "d01c6b837db4a6dee69a3f0352b37e18"
-SRC_URI[sha256sum] = "bed7b5edd8efc3d5b45c60b5ed949aec6a4daadb5f3bd9029467e90c4ef566d2"
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.3.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.3.0.bb
new file mode 100644
index 0000000..754350f
--- /dev/null
+++ b/recipes-qt/qt5/qtxmlpatterns_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "68c6e1311ecf8727368961739243d3b2"
+SRC_URI[sha256sum] = "ac66c182f28a3909dc939a111d2bf701056f6c68cecde54074c9c34637cdc988"
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-qt5][PATCHv2 03/10] qtwebsockets: Add new module
2014-06-05 22:08 ` [meta-qt5][PATCHv2 01/10] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 02/10] qt5: upgrade from 5.2.1 to 5.3.0 Martin Jansa
@ 2014-06-05 22:08 ` Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 04/10] qtenginio: " Martin Jansa
` (6 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2014-06-05 22:08 UTC (permalink / raw)
To: openembedded-devel
From: Jonathan Liu <net147@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes-qt/qt5/qtwebsockets.inc | 6 ++++++
recipes-qt/qt5/qtwebsockets_5.3.0.bb | 5 +++++
recipes-qt/qt5/qtwebsockets_git.bb | 6 ++++++
3 files changed, 17 insertions(+)
create mode 100644 recipes-qt/qt5/qtwebsockets.inc
create mode 100644 recipes-qt/qt5/qtwebsockets_5.3.0.bb
create mode 100644 recipes-qt/qt5/qtwebsockets_git.bb
diff --git a/recipes-qt/qt5/qtwebsockets.inc b/recipes-qt/qt5/qtwebsockets.inc
new file mode 100644
index 0000000..eb442a6
--- /dev/null
+++ b/recipes-qt/qt5/qtwebsockets.inc
@@ -0,0 +1,6 @@
+require qt5.inc
+
+DEPENDS += "qtbase qtdeclarative"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"
+LICENSE = "LGPL-2.1"
diff --git a/recipes-qt/qt5/qtwebsockets_5.3.0.bb b/recipes-qt/qt5/qtwebsockets_5.3.0.bb
new file mode 100644
index 0000000..2437060
--- /dev/null
+++ b/recipes-qt/qt5/qtwebsockets_5.3.0.bb
@@ -0,0 +1,5 @@
+require qt5-${PV}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "0ced83d5555e969f05e1ea89607ad584"
+SRC_URI[sha256sum] = "715f2e5196a29176bdb9980bf99334e5c8aefe5f4aac961d7de3c53b0a432ce6"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
new file mode 100644
index 0000000..3528ae7
--- /dev/null
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -0,0 +1,6 @@
+require qt5-git.inc
+require ${PN}.inc
+
+QT_MODULE_BRANCH = "release"
+# v5.3.0
+SRCREV = "c6dfdcdacfdd8c8190301b930caf67ad50ac09bb"
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-qt5][PATCHv2 04/10] qtenginio: Add new module
2014-06-05 22:08 ` [meta-qt5][PATCHv2 01/10] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 02/10] qt5: upgrade from 5.2.1 to 5.3.0 Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 03/10] qtwebsockets: Add new module Martin Jansa
@ 2014-06-05 22:08 ` Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 05/10] packagegroup-qt5-toolchain-target: Add qtenginio, qtwebsockets Martin Jansa
` (5 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2014-06-05 22:08 UTC (permalink / raw)
To: openembedded-devel
From: Jonathan Liu <net147@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes-qt/qt5/qtenginio.inc | 8 ++++++++
recipes-qt/qt5/qtenginio_1.0.4.bb | 7 +++++++
recipes-qt/qt5/qtenginio_git.bb | 6 ++++++
3 files changed, 21 insertions(+)
create mode 100644 recipes-qt/qt5/qtenginio.inc
create mode 100644 recipes-qt/qt5/qtenginio_1.0.4.bb
create mode 100644 recipes-qt/qt5/qtenginio_git.bb
diff --git a/recipes-qt/qt5/qtenginio.inc b/recipes-qt/qt5/qtenginio.inc
new file mode 100644
index 0000000..5b74a35
--- /dev/null
+++ b/recipes-qt/qt5/qtenginio.inc
@@ -0,0 +1,8 @@
+require qt5.inc
+
+DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
+
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=66c98a57685a93d9adf4815b0d11827a \
+ file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6"
+LICENSE = "LGPL-2.1 | GPL-3.0"
diff --git a/recipes-qt/qt5/qtenginio_1.0.4.bb b/recipes-qt/qt5/qtenginio_1.0.4.bb
new file mode 100644
index 0000000..af059da
--- /dev/null
+++ b/recipes-qt/qt5/qtenginio_1.0.4.bb
@@ -0,0 +1,7 @@
+QT_VERSION = "5.3.0"
+
+require qt5-${QT_VERSION}.inc
+require ${PN}.inc
+
+SRC_URI[md5sum] = "5870a3c01bbe175ed577f0c3f51f3f33"
+SRC_URI[sha256sum] = "090f6f7a22a197fd5cd9acdb3f79fa0361d1662abed1c450fc9db67c089745d4"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
new file mode 100644
index 0000000..3960bd2
--- /dev/null
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -0,0 +1,6 @@
+require qt5-git.inc
+require ${PN}.inc
+
+QT_MODULE_BRANCH = "release"
+# v1.0.4
+SRCREV = "bb55ab0eed452704e4ce52faf8e5337674c3b668"
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-qt5][PATCHv2 05/10] packagegroup-qt5-toolchain-target: Add qtenginio, qtwebsockets
2014-06-05 22:08 ` [meta-qt5][PATCHv2 01/10] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
` (2 preceding siblings ...)
2014-06-05 22:08 ` [meta-qt5][PATCHv2 04/10] qtenginio: " Martin Jansa
@ 2014-06-05 22:08 ` Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 06/10] recipes-git: Upgrade to latest origin/stable Martin Jansa
` (4 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2014-06-05 22:08 UTC (permalink / raw)
To: openembedded-devel
From: Jonathan Liu <net147@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index b2c5474..18ecb4d 100644
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -56,6 +56,9 @@ RDEPENDS_${PN} += " \
qtdeclarative-plugins \
qtdeclarative-qmlplugins \
qtdeclarative-staticdev \
+ qtenginio-dev \
+ qtenginio-mkspecs \
+ qtenginio-qmlplugins \
qtgraphicaleffects-qmlplugins \
qtimageformats-dev \
qtimageformats-plugins \
@@ -84,6 +87,9 @@ RDEPENDS_${PN} += " \
${@base_contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \
${@base_contains('BBFILE_COLLECTIONS', 'ruby-layer', '${USE_RUBY}', '', d)} \
${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \
+ qtwebsockets-dev \
+ qtwebsockets-mkspecs \
+ qtwebsockets-qmlplugins \
qtxmlpatterns-dev \
qtxmlpatterns-mkspecs \
"
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-qt5][PATCHv2 06/10] recipes-git: Upgrade to latest origin/stable
2014-06-05 22:08 ` [meta-qt5][PATCHv2 01/10] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
` (3 preceding siblings ...)
2014-06-05 22:08 ` [meta-qt5][PATCHv2 05/10] packagegroup-qt5-toolchain-target: Add qtenginio, qtwebsockets Martin Jansa
@ 2014-06-05 22:08 ` Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 07/10] recipes-git: Use LIC_FILES_CHKSUM from .inc files Martin Jansa
` (3 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2014-06-05 22:08 UTC (permalink / raw)
To: openembedded-devel
* qtbase: Fix undefined reference to qt_blend_argb32_on_argb32_ssse3
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
conf/distro/include/qt5-versions.inc | 9 +++-
recipes-qt/qt5/nativesdk-qtbase_git.bb | 12 ++---
recipes-qt/qt5/nativesdk-qttools_git.bb | 2 +-
recipes-qt/qt5/qt3d_git.bb | 2 +-
recipes-qt/qt5/qt5-git.inc | 2 +-
.../qtbase-git/0001-Add-linux-oe-g-platform.patch | 26 +++++++----
.../qtbase-git/0001-Fix-missing-plugin_types.patch | 30 ------------
...01-Revert-Use-the-gcc-feature-in-simd.prf.patch | 29 ++++++++++++
.../0002-Add-external-hostbindir-option.patch | 53 ++++++++++------------
...o-allow-to-set-qt.conf-from-the-outside-u.patch | 8 ++--
...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 8 ++--
...fs-Print-the-chosen-config-in-debug-mode.patch} | 10 ++--
...build-uic.patch => 0006-Always-build-uic.patch} | 6 +--
...build-it-in-configure-but-allow-to-build.patch} | 12 ++---
...eserve-built-qmake-and-swap-with-native-.patch} | 11 ++---
...l-error-for-platforms-only-supporting-on.patch} | 6 +--
...mp-path-length-from-256-to-512-character.patch} | 10 ++--
...integration-Undefine-CursorShape-from-X..patch} | 6 +--
recipes-qt/qt5/qtbase-native_git.bb | 8 ++--
recipes-qt/qt5/qtbase_git.bb | 12 ++---
recipes-qt/qt5/qtconnectivity_git.bb | 2 +-
recipes-qt/qt5/qtdeclarative.inc | 1 -
recipes-qt/qt5/qtdeclarative_5.3.0.bb | 4 ++
recipes-qt/qt5/qtdeclarative_git.bb | 2 +-
recipes-qt/qt5/qtenginio_git.bb | 4 +-
recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +-
recipes-qt/qt5/qtimageformats_git.bb | 2 +-
recipes-qt/qt5/qtlocation_git.bb | 2 +-
recipes-qt/qt5/qtmultimedia_git.bb | 2 +-
recipes-qt/qt5/qtquick1_git.bb | 2 +-
recipes-qt/qt5/qtquickcontrols_git.bb | 2 +-
recipes-qt/qt5/qtscript_git.bb | 2 +-
recipes-qt/qt5/qtsensors_git.bb | 2 +-
recipes-qt/qt5/qtserialport_git.bb | 2 +-
recipes-qt/qt5/qtsvg_git.bb | 2 +-
...w-to-build-only-lrelease-lupdate-lconvert.patch | 21 ++++-----
...t-help-fix-linking-of-dependent-libraries.patch | 4 +-
recipes-qt/qt5/qttools-native_git.bb | 2 +-
recipes-qt/qt5/qttools_git.bb | 2 +-
recipes-qt/qt5/qtwayland-native_git.bb | 2 +-
recipes-qt/qt5/qtwayland_git.bb | 2 +-
recipes-qt/qt5/qtwebkit-examples_git.bb | 2 +-
recipes-qt/qt5/qtwebkit_git.bb | 2 +-
recipes-qt/qt5/qtwebsockets_git.bb | 4 +-
| 2 +-
recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +-
46 files changed, 170 insertions(+), 170 deletions(-)
delete mode 100644 recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch
create mode 100644 recipes-qt/qt5/qtbase-git/0001-Revert-Use-the-gcc-feature-in-simd.prf.patch
rename recipes-qt/qt5/qtbase-git/{0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch => 0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch} (89%)
rename recipes-qt/qt5/qtbase-git/{0008-Always-build-uic.patch => 0006-Always-build-uic.patch} (87%)
rename recipes-qt/qt5/qtbase-git/{0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch => 0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch} (82%)
rename recipes-qt/qt5/qtbase-git/{0009-configure-preserve-built-qmake-and-swap-with-native-.patch => 0007-configure-preserve-built-qmake-and-swap-with-native-.patch} (71%)
rename recipes-qt/qt5/qtbase-git/{0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch => 0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch} (94%)
rename recipes-qt/qt5/qtbase-git/{0010-configure-bump-path-length-from-256-to-512-character.patch => 0008-configure-bump-path-length-from-256-to-512-character.patch} (77%)
rename recipes-qt/qt5/qtbase-git/{0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch => 0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch} (86%)
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc
index a2cc1fc..94b0462 100644
--- a/conf/distro/include/qt5-versions.inc
+++ b/conf/distro/include/qt5-versions.inc
@@ -1,7 +1,7 @@
# Select which version you prefer by defining QT5_VERSION and including this file
-# possible values now "5.2.1", "5.2.1+git%"
+# possible values now "5.3.0", "5.3.0+git%"
-QT5_VERSION ?= "5.2.1"
+QT5_VERSION ?= "5.3.0"
PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}"
PREFERRED_VERSION_qtbase = "${QT5_VERSION}"
@@ -24,4 +24,9 @@ PREFERRED_VERSION_qttools-native = "${QT5_VERSION}"
PREFERRED_VERSION_nativesdk-qttools = "${QT5_VERSION}"
PREFERRED_VERSION_qtwebkit = "${QT5_VERSION}"
PREFERRED_VERSION_qtwebkit-examples = "${QT5_VERSION}"
+PREFERRED_VERSION_qtwebsockets = "${QT5_VERSION}"
PREFERRED_VERSION_qtxmlpatterns = "${QT5_VERSION}"
+
+# qtenginio doesn't follow qt5 versioning, see https://bugreports.qt-project.org/browse/QTBUG-37791
+QT5_VERSION_QTENGINIO = "${@base_contains('QT5_VERSION', '5.3.0+git%', '${QT5_VERSION}', '1.0.4%', d)}"
+PREFERRED_VERSION_qtenginio = "${QT5_VERSION_QTENGINIO}"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index cac16a0..7c45693 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -14,19 +14,19 @@ SRC_URI += "\
file://0002-Add-external-hostbindir-option.patch \
file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
- file://0001-Fix-missing-plugin_types.patch \
- file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0001-Revert-Use-the-gcc-feature-in-simd.prf.patch \
"
# common with native version
SRC_URI += " \
- file://0008-Always-build-uic.patch \
+ file://0006-Always-build-uic.patch \
"
# specific for nativesdk version
SRC_URI += " \
- file://0009-configure-preserve-built-qmake-and-swap-with-native-.patch \
- file://0010-configure-bump-path-length-from-256-to-512-character.patch \
+ file://0007-configure-preserve-built-qmake-and-swap-with-native-.patch \
+ file://0008-configure-bump-path-length-from-256-to-512-character.patch \
"
-SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
+SRCREV = "267ba8b63e0fbf02cde4d2709397ed0e12f34ee2"
diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb b/recipes-qt/qt5/nativesdk-qttools_git.bb
index cbf1672..933119c 100644
--- a/recipes-qt/qt5/nativesdk-qttools_git.bb
+++ b/recipes-qt/qt5/nativesdk-qttools_git.bb
@@ -4,7 +4,7 @@ require ${PN}.inc
# prepend this again, because ${PN}.inc prepneds ${PN}
FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
-SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
+SRCREV = "eaf069902111533f0e675ab32279bb57a5916169"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 0438dd9..2e32549 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -4,4 +4,4 @@ require ${PN}.inc
QT_MODULE_BRANCH = "master"
# last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already
-SRCREV = "36a829ad6fb44fd01f490c35e011f6fd2470ffdd"
+SRCREV = "bdb98baf8253c69949a8c259369203da9ffb269c"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 25b7a62..3e714e0 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -10,7 +10,7 @@ SRC_URI += " \
S = "${WORKDIR}/git"
-PV = "5.2.1+5.3.0-beta1+git${SRCPV}"
+PV = "5.3.0+git${SRCPV}"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
index 828f5ea..95841ce 100644
--- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
-From 237a4b0143d91c0573ecf6f9ff5e37827a14a75d Mon Sep 17 00:00:00 2001
+From e70bd40730582e5e5531fca51a1574cb306c40d3 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 15 Apr 2013 04:29:32 +0200
-Subject: [PATCH 01/10] Add linux-oe-g++ platform
+Subject: [PATCH 1/8] Add linux-oe-g++ platform
* This qmake.conf unlike other platforms reads most variables from
shell environment, because it's easier for qt recipes to export
@@ -42,16 +42,16 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- configure | 60 +++++++++++++++------
+ configure | 66 ++++++++++++++++-------
mkspecs/features/configure.prf | 4 +-
mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++
mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
- 4 files changed, 185 insertions(+), 19 deletions(-)
+ 4 files changed, 188 insertions(+), 22 deletions(-)
create mode 100644 mkspecs/linux-oe-g++/qmake.conf
create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
diff --git a/configure b/configure
-index 55d68ef..bb24a9c 100755
+index d5c2b08..4eae0d3 100755
--- a/configure
+++ b/configure
@@ -324,6 +324,16 @@ getQMakeConf()
@@ -118,7 +118,7 @@ index 55d68ef..bb24a9c 100755
# Use CC/CXX to run config.tests
mkdir -p "$outpath/config.tests"
rm -f "$outpath/config.tests/.qmake.cache"
-@@ -3139,7 +3157,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
+@@ -3140,7 +3158,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
[ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
fi
@@ -127,7 +127,7 @@ index 55d68ef..bb24a9c 100755
TEST_COMPILER=$QMAKE_CONF_COMPILER
-@@ -3174,7 +3192,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
+@@ -3175,7 +3193,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
exit 1
fi
fi
@@ -136,7 +136,7 @@ index 55d68ef..bb24a9c 100755
GCC_MACHINE_DUMP=
case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
-@@ -3632,6 +3650,14 @@ setBootstrapVariable()
+@@ -3633,6 +3651,14 @@ setBootstrapVariable()
getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
}
@@ -151,20 +151,26 @@ index 55d68ef..bb24a9c 100755
# build qmake
if true; then ###[ '!' -f "$outpath/bin/qmake" ];
echo "Creating qmake..."
-@@ -3670,11 +3696,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -3671,14 +3697,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
fi
[ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
- setBootstrapVariable QMAKE_CC CC "$CC_TRANSFORM"
- setBootstrapVariable QMAKE_CXX CXX "$CC_TRANSFORM"
- setBootstrapVariable QMAKE_CFLAGS
+- setBootstrapVariable QMAKE_CFLAGS_SPLIT_SECTIONS
- setBootstrapVariable QMAKE_CXXFLAGS
+- setBootstrapVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS
- setBootstrapVariable QMAKE_LFLAGS
+- setBootstrapVariable QMAKE_LFLAGS_GCSECTIONS
+ setBootstrapEvalVariable QMAKE_CC CC "$CC_TRANSFORM"
+ setBootstrapEvalVariable QMAKE_CXX CXX "$CC_TRANSFORM"
+ setBootstrapEvalVariable QMAKE_CFLAGS
++ setBootstrapEvalVariable QMAKE_CFLAGS_SPLIT_SECTIONS
+ setBootstrapEvalVariable QMAKE_CXXFLAGS
++ setBootstrapEvalVariable QMAKE_CXXFLAGS_SPLIT_SECTIONS
+ setBootstrapEvalVariable QMAKE_LFLAGS
++ setBootstrapEvalVariable QMAKE_LFLAGS_GCSECTIONS
if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
setBootstrapVariable QMAKE_CFLAGS_RELEASE
@@ -340,5 +346,5 @@ index 0000000..dd12003
+
+#endif // QPLATFORMDEFS_H
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch b/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch
deleted file mode 100644
index 612cbdd..0000000
--- a/recipes-qt/qt5/qtbase-git/0001-Fix-missing-plugin_types.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f0e01b788e86f24352ba14ad17c3f337f934467d Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Mon, 21 Apr 2014 15:09:23 +0200
-Subject: [PATCH] Fix missing plugin_types
-
-* bearer/generic was failing with:
- Project ERROR: No module claims plugin type 'bearer'
-
-Change-Id: I90848856a8b0a4df52e599983cf7dde0bc0e6623
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- mkspecs/features/qt_module_pris.prf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf
-index f31bc38..415e780 100644
---- a/mkspecs/features/qt_module_pris.prf
-+++ b/mkspecs/features/qt_module_pris.prf
-@@ -177,7 +177,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri
- include($$mod_work_pfx/qt_lib_$${pri}.pri)
- for(mod, mods_to_load) {
- for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \
-- name depends module_config CONFIG DEFINES sources \
-+ name depends module_config plugin_types CONFIG DEFINES sources \
- includes bins libs libexecs plugins imports qml \
- rpath_link \
- )):defined(QT.$${mod}.$$var, var):cache(QT.$${mod}.$$var, transient)
---
-1.9.1
-
diff --git a/recipes-qt/qt5/qtbase-git/0001-Revert-Use-the-gcc-feature-in-simd.prf.patch b/recipes-qt/qt5/qtbase-git/0001-Revert-Use-the-gcc-feature-in-simd.prf.patch
new file mode 100644
index 0000000..88f5c12
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0001-Revert-Use-the-gcc-feature-in-simd.prf.patch
@@ -0,0 +1,29 @@
+From 9d33599f12787f85a19e8147604f919ac40c02c1 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Wed, 4 Jun 2014 15:26:11 +0200
+Subject: [PATCH] Revert "Use the "gcc" feature in simd.prf"
+
+It's causing linker issues, see my comment in:
+https://bugreports.qt-project.org/browse/QTBUG-38544
+
+This reverts commit 3b00cc480400d47c59c29d3507c7fcdc9be2a489.
+---
+ mkspecs/features/simd.prf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/simd.prf b/mkspecs/features/simd.prf
+index 62a63f9..4f86f60 100644
+--- a/mkspecs/features/simd.prf
++++ b/mkspecs/features/simd.prf
+@@ -18,7 +18,7 @@ QT_CPU_FEATURES = $$eval(QT_CPU_FEATURES.$$QT_ARCH)
+ #
+ # Set up compilers for SIMD (SSE/AVX, NEON etc)
+ #
+-gcc { # includes intel_icc and clang variants
++*-g++*|intel_icc|*-clang*|*-qcc* {
+ sse2 {
+ HEADERS += $$SSE2_HEADERS
+
+--
+2.0.0
+
diff --git a/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
index 5f9fd90..81f1867 100644
--- a/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
@@ -1,7 +1,7 @@
-From 00ad866f82f89ce938e9eaabfc50af3cde72ccfe Mon Sep 17 00:00:00 2001
+From eaa4a4c13e65e29e2214a01b69b77b9c6f2ada05 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 6 Apr 2013 13:15:07 +0200
-Subject: [PATCH 02/10] Add -external-hostbindir option
+Subject: [PATCH 2/8] Add -external-hostbindir option
* when cross-compiling it's sometimes useful to use existing tools from machine
(or in OpenEmbedded built with separate native recipe) when building for target
@@ -24,7 +24,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Simon Busch <morphis@gravedo.de>
---
configure | 15 +++++++++++++++
- mkspecs/features/qt_functions.prf | 9 ++++++++-
+ mkspecs/features/qt_functions.prf | 2 +-
mkspecs/features/qt_tool.prf | 3 +--
qmake/property.cpp | 1 +
qtbase.pro | 12 +++++++++---
@@ -34,10 +34,10 @@ Signed-off-by: Simon Busch <morphis@gravedo.de>
src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
tools/configure/configureapp.cpp | 8 ++++++++
- 11 files changed, 51 insertions(+), 13 deletions(-)
+ 11 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
-index bb24a9c..bf7c11e 100755
+index 4eae0d3..48d5119 100755
--- a/configure
+++ b/configure
@@ -777,6 +777,7 @@ QT_HOST_BINS=
@@ -48,7 +48,7 @@ index bb24a9c..bf7c11e 100755
#flags for SQL drivers
QT_CFLAGS_PSQL=
-@@ -898,6 +899,7 @@ while [ "$#" -gt 0 ]; do
+@@ -896,6 +897,7 @@ while [ "$#" -gt 0 ]; do
-testsdir| \
-hostdatadir| \
-hostbindir| \
@@ -56,7 +56,7 @@ index bb24a9c..bf7c11e 100755
-hostlibdir| \
-extprefix| \
-sysroot| \
-@@ -1112,6 +1114,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1110,6 +1112,9 @@ while [ "$#" -gt 0 ]; do
extprefix)
QT_EXT_PREFIX="$VAL"
;;
@@ -66,7 +66,7 @@ index bb24a9c..bf7c11e 100755
pkg-config)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_PKGCONFIG="$VAL"
-@@ -2250,6 +2255,10 @@ Installation options:
+@@ -2248,6 +2253,10 @@ Installation options:
-hostdatadir <dir> . Data used by qmake will be installed to <dir>
(default HOSTPREFIX)
@@ -77,7 +77,7 @@ index bb24a9c..bf7c11e 100755
Configure options:
The defaults (*) are usually acceptable. A plus (+) denotes a default value
-@@ -2914,6 +2923,11 @@ fi
+@@ -2915,6 +2924,11 @@ fi
# command line and environment validation
#-------------------------------------------------------------------------------
@@ -89,7 +89,7 @@ index bb24a9c..bf7c11e 100755
# update QT_CONFIG to show our current predefined configuration
CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
case "$CFG_QCONFIG" in
-@@ -3594,6 +3608,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
+@@ -3595,6 +3609,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
"qt_hbinpath=$QT_HOST_BINS",
"qt_hlibpath=$QT_HOST_LIBS",
"qt_hdatpath=$QT_HOST_DATA",
@@ -98,27 +98,20 @@ index bb24a9c..bf7c11e 100755
"qt_hostspec=$shortspec",
#endif
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 1dacfed..7229845 100644
+index d41fe3b..050a4a7 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
-@@ -193,7 +193,14 @@ defineTest(qtAddRpathLink) {
+@@ -193,7 +193,7 @@ defineTest(qtAddRpathLink) {
defineTest(qtPrepareTool) {
- $$1 = $$eval(QT_TOOL.$${2}.binary)
- isEmpty($$1) {
-- $$1 = $$[QT_HOST_BINS]/$$2
-+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
-+ # for some reason isEmpty does not work here, FIXME before submitting upstream
-+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5)
-+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true
-+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch
-+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) {
-+ $$1 = $$[QT_HOST_BINS]/$$2
-+ }
- exists($$eval($$1).pl) {
- $$1 = perl -w $$eval($$1).pl
+ cmd = $$eval(QT_TOOL.$${2}.binary)
+ isEmpty(cmd) {
+- cmd = $$[QT_HOST_BINS]/$$2
++ cmd = $$[QT_EXTERNAL_HOST_BINS]/$$2
+ exists($${cmd}.pl) {
+ cmd = perl -w $$system_path($${cmd}.pl)
} else: contains(QMAKE_HOST.os, Windows) {
diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
-index f0864f9..50bfac8 100644
+index 1d3e88c..bd44754 100644
--- a/mkspecs/features/qt_tool.prf
+++ b/mkspecs/features/qt_tool.prf
@@ -15,8 +15,7 @@ CONFIG += console
@@ -144,7 +137,7 @@ index e50485c..71291ad 100644
{ "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
};
diff --git a/qtbase.pro b/qtbase.pro
-index ed6fc39..2421f41 100644
+index d6861cf..92e6a83 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -71,16 +71,22 @@ CONFIG -= qt
@@ -273,7 +266,7 @@ index 99d87e2..5621dc0 100644
_qt5_Widgets_check_file_exists(${imported_location})
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
-index cff3f1b..540708b 100644
+index b756509..7e61845 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1213,6 +1213,13 @@ void Configure::parseCmdLine()
@@ -290,7 +283,7 @@ index cff3f1b..540708b 100644
else if (configCmdLine.at(i) == "-make-tool") {
++i;
if (i == argCount)
-@@ -3986,6 +3993,7 @@ void Configure::generateQConfigCpp()
+@@ -3983,6 +3990,7 @@ void Configure::generateQConfigCpp()
<< " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
<< " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
<< " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
@@ -299,5 +292,5 @@ index cff3f1b..540708b 100644
<< " \"qt_hostspec=" << hostSpec << "\"," << endl
<< "#endif" << endl
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index 95c67a8..4b4e47c 100644
--- a/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,8 +1,8 @@
-From 53b152be24082a2cf2497d2e687f9ee73a39d6f4 Mon Sep 17 00:00:00 2001
+From b76b34a03c3051cda5330c8ae9f5e2a26c5c4da6 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Wed, 26 Sep 2012 17:22:30 +0200
-Subject: [PATCH 03/10] qlibraryinfo: allow to set qt.conf from the outside
- using the environment
+Subject: [PATCH 3/8] qlibraryinfo: allow to set qt.conf from the outside using
+ the environment
Allow to set a qt.conf from the outside using the environment. This allows
to inject new prefixes and other paths into qmake. This is needed when using
@@ -35,5 +35,5 @@ index 3686b17..89e13cf 100644
if(!QFile::exists(qtconfig))
qtconfig = qt_libraryInfoFile();
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
index c263d09..1e5ffac 100644
--- a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -1,7 +1,7 @@
-From a39f5e64b7b5a31e7e5cd988b5f967ce6cf02990 Mon Sep 17 00:00:00 2001
+From 83205b1344e57e2cb0292cf1d276e40c7f45ca32 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 27 Apr 2013 22:33:33 +0200
-Subject: [PATCH 04/10] configureapp: Prefix default LIBDIRS and INCDIRS with
+Subject: [PATCH 4/8] configureapp: Prefix default LIBDIRS and INCDIRS with
SYSROOT
Upstream-Status: Pending
@@ -11,7 +11,7 @@ Upstream-Status: Pending
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
-index 540708b..45f4a1e 100644
+index 7e61845..29c6358 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3370,8 +3370,8 @@ void Configure::generateQConfigPri()
@@ -26,5 +26,5 @@ index 540708b..45f4a1e 100644
configStream << "}" << endl;
configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
similarity index 89%
rename from recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
rename to recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
index 65ebbd1..213a9c3 100644
--- a/recipes-qt/qt5/qtbase-git/0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
+++ b/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
@@ -1,7 +1,7 @@
-From 91b185d1f4843d22d42461c0aee4cd0f5393bbc8 Mon Sep 17 00:00:00 2001
+From 22775e5f0b1097964062fbcf1805a841f971de34 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 21 Apr 2014 19:22:04 +0200
-Subject: [PATCH] Revert "eglfs: Print the chosen config in debug mode"
+Subject: [PATCH 5/8] Revert "eglfs: Print the chosen config in debug mode"
This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e.
---
@@ -10,10 +10,10 @@ This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e.
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
-index e6624fb..3870f6c 100644
+index 5eed470..39c7c1f 100644
--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
-@@ -437,9 +437,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
+@@ -451,9 +451,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
for (index = 0; attrs[index].attr != -1; ++index) {
EGLint value;
if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) {
@@ -52,5 +52,5 @@ index eec6463..4a7c69b 100644
// Make the context current to ensure the GL version query works. This needs a surface too.
const EGLint pbufferAttributes[] = {
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch
similarity index 87%
rename from recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch
rename to recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch
index fd45516..f425c3e 100644
--- a/recipes-qt/qt5/qtbase-git/0008-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch
@@ -1,7 +1,7 @@
-From 4d5502114a3135f2c78eb9e63476918cbee00040 Mon Sep 17 00:00:00 2001
+From dd679f743291a924bed500a866eb05fab71c9978 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 16 Nov 2013 00:32:30 +0100
-Subject: [PATCH 08/10] Always build uic
+Subject: [PATCH 6/8] Always build uic
Even if we are not building gui or widgets. This tool is needed later
as a native tool when compiling the target.
@@ -27,5 +27,5 @@ index 6a805a6..90623a6 100644
nacl: SUBDIRS -= src_network src_testlib
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
similarity index 82%
rename from recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
rename to recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
index 395e84c..6d79acb 100644
--- a/recipes-qt/qt5/qtbase-git/0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
+++ b/recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
@@ -1,8 +1,8 @@
-From c0c4c468cc70a367e3bb2dd4a48c31e62b3b0fa4 Mon Sep 17 00:00:00 2001
+From d8e725cb2c25a443d888fe2652f9039e79ae75ac Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Mon, 29 Oct 2012 20:07:49 -0700
-Subject: [PATCH 05/10] qmake: don't build it in configure, but allow to build
- it separately
+Subject: [PATCH 6/8] qmake: don't build it in configure, but allow to build it
+ separately
* it is already built in qtbase-native, so we don't need it in configure
* allow building a separate qmake for the target
@@ -20,10 +20,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
-index bf7c11e..5e93ce4 100755
+index 48d5119..2a42c08 100755
--- a/configure
+++ b/configure
-@@ -3674,7 +3674,7 @@ setBootstrapEvalVariable()
+@@ -3675,7 +3675,7 @@ setBootstrapEvalVariable()
# build qmake
@@ -46,5 +46,5 @@ index 89d6ea5..7c605b9 100644
VPATH += \
../src/corelib/global \
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch
similarity index 71%
rename from recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch
rename to recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch
index ddd7116..79ac5e8 100644
--- a/recipes-qt/qt5/qtbase-git/0009-configure-preserve-built-qmake-and-swap-with-native-.patch
+++ b/recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch
@@ -1,8 +1,7 @@
-From 7117e71f5e1aac3ac6e5e87852c108bbc13dc364 Mon Sep 17 00:00:00 2001
+From 3db5991e607a82403272b0ea821fc84e3c8b6d2a Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Mon, 11 Nov 2013 20:22:34 -0500
-Subject: [PATCH 09/10] configure: preserve built qmake and swap with native
- one
+Subject: [PATCH 7/8] configure: preserve built qmake and swap with native one
Let configure script build the real qmake, but right after it's built, swap
it with a native qmake for further internal use, preserving the real one.
@@ -13,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
1 file changed, 2 insertions(+)
diff --git a/configure b/configure
-index 5e93ce4..01fca8f 100755
+index 48d5119..b7aac15 100755
--- a/configure
+++ b/configure
-@@ -3821,6 +3821,8 @@ if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -3825,6 +3825,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
(cd "$outpath/qmake"; "$MAKE") || exit 2
fi # Build qmake
@@ -26,5 +25,5 @@ index 5e93ce4..01fca8f 100755
echo "Running configuration tests..."
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase-git/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
similarity index 94%
rename from recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
rename to recipes-qt/qt5/qtbase-git/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
index 21821c3..f8a789c 100644
--- a/recipes-qt/qt5/qtbase-git/0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
+++ b/recipes-qt/qt5/qtbase-git/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
@@ -1,7 +1,7 @@
-From 2cb0f75bb9ab1e6709fe867887f9e6014a140356 Mon Sep 17 00:00:00 2001
+From cc8bd33740ee16b29e0801dbc2228314ef3cef2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 5 Feb 2014 18:35:08 +0100
-Subject: [PATCH 06/10] eglfs: fix egl error for platforms only supporting one
+Subject: [PATCH 7/8] eglfs: fix egl error for platforms only supporting one
window/surface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -68,5 +68,5 @@ index 2d36c0b..854531e 100644
if (isRaster()) {
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch
similarity index 77%
rename from recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch
rename to recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch
index 02eef9b..e5a3890 100644
--- a/recipes-qt/qt5/qtbase-git/0010-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,7 +1,7 @@
-From 6afe8d5d1daf94ac64478406b5b84b6879981446 Mon Sep 17 00:00:00 2001
+From 3eabdee39cad37a4ce451486fce20680f169a0f1 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Mon, 11 Nov 2013 20:27:30 -0500
-Subject: [PATCH 10/10] configure: bump path length from 256 to 512 characters
+Subject: [PATCH 8/8] configure: bump path length from 256 to 512 characters
Increase the path length that gets hardcoded into generated config.cpp file
from 256 to 512 characters, as nativesdk path can be quite long.
@@ -12,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
-index 01fca8f..801c7c1 100755
+index b7aac15..c51f785 100755
--- a/configure
+++ b/configure
-@@ -3572,7 +3572,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
+@@ -3573,7 +3573,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`";
/* Installation Info */
@@ -25,5 +25,5 @@ index 01fca8f..801c7c1 100755
"qt_prfxpath=$QT_SYSROOT_PREFIX",
"qt_docspath=$QT_SYSROOT_DOCS",
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
similarity index 86%
rename from recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
rename to recipes-qt/qt5/qtbase-git/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
index 24ae7ea..2f4d80c 100644
--- a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
+++ b/recipes-qt/qt5/qtbase-git/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -1,7 +1,7 @@
-From 0923f72a444bcdc0675a24aec9782692b41d301c Mon Sep 17 00:00:00 2001
+From 959b2fb8d8eb5e755e3d9d3d3031b996f96fb23b Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 19 Mar 2014 18:32:28 +0100
-Subject: [PATCH 07/10] qeglplatformintegration: Undefine CursorShape from X.h
+Subject: [PATCH 8/8] qeglplatformintegration: Undefine CursorShape from X.h
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
@@ -26,5 +26,5 @@ index f665455..9eb783c 100644
class QEGLPlatformScreen;
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index bafe37b..e10748f 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -11,13 +11,13 @@ SRC_URI += "\
file://0002-Add-external-hostbindir-option.patch \
file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
- file://0001-Fix-missing-plugin_types.patch \
- file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0001-Revert-Use-the-gcc-feature-in-simd.prf.patch \
"
# specific for native version
SRC_URI += " \
- file://0008-Always-build-uic.patch \
+ file://0006-Always-build-uic.patch \
"
do_install_append() {
@@ -26,4 +26,4 @@ do_install_append() {
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
}
-SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
+SRCREV = "267ba8b63e0fbf02cde4d2709397ed0e12f34ee2"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 9bcfa79..4f019be 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -11,15 +11,15 @@ SRC_URI += "\
file://0002-Add-external-hostbindir-option.patch \
file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
- file://0001-Fix-missing-plugin_types.patch \
- file://0001-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0001-Revert-Use-the-gcc-feature-in-simd.prf.patch \
"
# target specific
SRC_URI += "\
- file://0005-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
- file://0006-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
- file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
+ file://0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
+ file://0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
+ file://0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
"
-SRCREV = "207598fd8e69be34e8ba2c9db7720cb6003ea114"
+SRCREV = "267ba8b63e0fbf02cde4d2709397ed0e12f34ee2"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index c0fd15d..52f2a2d 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -1,4 +1,4 @@
require qt5-git.inc
require ${BPN}.inc
-SRCREV = "6d9ab3981a1ae9e224b3c6a8cf107049a0ee5095"
+SRCREV = "19f10aae3d333ef6486ea1390998f0674fd4d89e"
diff --git a/recipes-qt/qt5/qtdeclarative.inc b/recipes-qt/qt5/qtdeclarative.inc
index bdb1de9..ddc44c9 100644
--- a/recipes-qt/qt5/qtdeclarative.inc
+++ b/recipes-qt/qt5/qtdeclarative.inc
@@ -2,7 +2,6 @@ require qt5.inc
SRC_URI += " \
file://0001-qmltestexample-fix-link.patch \
- file://0002-Fix-improper-antialiasing-property-behavior.patch \
"
# older copyright year than what e.g. qtbase is using now
diff --git a/recipes-qt/qt5/qtdeclarative_5.3.0.bb b/recipes-qt/qt5/qtdeclarative_5.3.0.bb
index 6725b57..7bd6bb4 100644
--- a/recipes-qt/qt5/qtdeclarative_5.3.0.bb
+++ b/recipes-qt/qt5/qtdeclarative_5.3.0.bb
@@ -1,5 +1,9 @@
require qt5-${PV}.inc
require ${PN}.inc
+SRC_URI += " \
+ file://0002-Fix-improper-antialiasing-property-behavior.patch \
+"
+
SRC_URI[md5sum] = "9e29d2b481c771ce5c798a3319835673"
SRC_URI[sha256sum] = "fab07eb4f4b2091e1d88b27b84ac49d7e8daaa1eb72fd62e602ee9ac3ed7f42f"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 2d733a3..318ba44 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "aedcd57c84ac9d6b74816c13bdf3fde31e1132b5"
+SRCREV = "67a101af142355a0ca7cdc234b7ee1716a25d87c"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index 3960bd2..b7f2f79 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -1,6 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v1.0.4
-SRCREV = "bb55ab0eed452704e4ce52faf8e5337674c3b668"
+SRCREV = "07885f25ed57b98a695f28337fc4b91e611991aa"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 9347e7b..a1e9009 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "9b1883d2e90dd6ef92374d21e490a3de1c8330ba"
+SRCREV = "82abf6975b6737259ee656564e5ec7f8ad1d0508"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index b413a5f..3e04c40 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "554d617762c86964dfa074074304993ccdfbe2c9"
+SRCREV = "bcc7909dfe9d89f793919bc96abdfd6b704c4c0e"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index bab8275..fcb6993 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "27c9ffe1d2eb2103e9b420c86c6fc3d10cb1ff76"
+SRCREV = "749cdff5289412780f0bb8e351cb140ba64d85ce"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 88ca59e..f0ce24e 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "b088962950dbc4c6f0219de30b0d9a8cf47a3376"
+SRCREV = "7e668fe58fc9546eb91bbf39992566f709b5e6c2"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 7c64460..3400f47 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "c56f5d8848ce03cc6667804f815de47d2d8221fb"
+SRCREV = "26e713cddcc8a62e49ce7a3352d3b5f13ffd7d52"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index fd525f1..bab6854 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "ea9add905768a26ce86ab542615a193296642732"
+SRCREV = "82a0a8244a2edf27c196f6c8cc3e2c36a3f4a8c5"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 2deaaff..6d8fd31 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "e4453c92ee41943a3a1d67a725804a44e747f64e"
+SRCREV = "161e1fd31537f41992b3024c32b525b64be080ed"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 6e3bda6..c2ab063 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "eee2eee734b4aa735d35f6c53d79c06c1c76425a"
+SRCREV = "9efc5bea41e7acbce55c37b49b167092b71114a9"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 4619227..0755f45 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "6e75610dff5fb96ebd72cfb40ba7cbfea4bd21b7"
+SRCREV = "04a3308346190a70509a759423993f6bcc365328"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 0aa79e1..6fc617d 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "ad81f5720c4f4a1dac099cbe2f9d47ed3a9025b0"
+SRCREV = "35a2f0880831d38c60d2b4820dac808f48f6f3a8"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
index 575616b..9a31c13 100644
--- a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
@@ -1,4 +1,4 @@
-From 90a2e92062fc67fa54be0f5596606ce2bc21f772 Mon Sep 17 00:00:00 2001
+From 50fdb63c074138f783a448bc2db97b6f0ccfefea Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.jansa@gmail.com>
Date: Wed, 11 Sep 2013 18:30:08 +0200
Subject: [PATCH 1/2] Allow to build only lrelease + lupdate + lconvert
@@ -74,7 +74,7 @@ index 3a70580..a977878 100644
qtNomakeTools( \
linguist \
diff --git a/src/src.pro b/src/src.pro
-index 861d06d..3438f9a 100644
+index a486d65..393eac2 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -4,10 +4,12 @@ qtHaveModule(widgets) {
@@ -97,12 +97,12 @@ index 861d06d..3438f9a 100644
}
SUBDIRS += linguist
--!android|android_app: SUBDIRS += qtpaths
-+!linguistonly:!android|android_app: SUBDIRS += qtpaths
+-if(!android|android_app):!ios: SUBDIRS += qtpaths
++if(!android|android_app):!linguistonly:!ios: SUBDIRS += qtpaths
mac {
SUBDIRS += macdeployqt
-@@ -25,7 +27,7 @@ android {
+@@ -25,11 +27,11 @@ android {
SUBDIRS += androiddeployqt
}
@@ -111,12 +111,11 @@ index 861d06d..3438f9a 100644
win32|winrt:SUBDIRS += windeployqt
winrt:SUBDIRS += winrtrunner qtd3dservice
-@@ -36,4 +38,4 @@ qtNomakeTools( \
- macdeployqt \
- )
+-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
++!linguistonly:qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
--!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
-+!linguistonly:!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
+ qtNomakeTools( \
+ pixeltool \
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index c3acfe3..b48e711 100644
--- a/tests/auto/auto.pro
@@ -151,5 +150,5 @@ index c3acfe3..b48e711 100644
installed_cmake.depends = cmake
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
index 1c40471..eaf4694 100644
--- a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
+++ b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
@@ -1,4 +1,4 @@
-From 509541ebd648414ee33f3aea3035d1e6382bfa3c Mon Sep 17 00:00:00 2001
+From f375385c4795e3cd7df7aca2a4c769597164aaa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 17 Jan 2014 14:33:19 +0100
Subject: [PATCH 2/2] assistant/help: fix linking of dependent libraries
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644
+
+LIBS += -lQt5CLucene
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb
index 49a1907..b37e0ed 100644
--- a/recipes-qt/qt5/qttools-native_git.bb
+++ b/recipes-qt/qt5/qttools-native_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
+SRCREV = "eaf069902111533f0e675ab32279bb57a5916169"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 49a1907..b37e0ed 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "e7b791c8bb5e64a4c786bf370b10366815af704f"
+SRCREV = "eaf069902111533f0e675ab32279bb57a5916169"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index 9fac8b2..9089f0f 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -4,7 +4,7 @@ require ${PN}.inc
# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1
-SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e"
+SRCREV = "98dca3b54f52f08117c1e0d3a1b4826ed12ef23f"
# wayland-scanner and qtwaylandscanner must be in same path to work properly
do_install_append() {
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 3f18272..ca068da 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -4,7 +4,7 @@ require ${PN}.inc
# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1
-SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
+SRCREV = "98dca3b54f52f08117c1e0d3a1b4826ed12ef23f"
SRC_URI += " \
file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 98fdc2f..f0ceb5d 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "c9d13139b65818785f218cc96d136d33591ca2f5"
+SRCREV = "bce5056b9e16a943357e362455a46685d3f22093"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index ec8b4f3..829dc77 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "0546c8656a3728bf4375da39027e096beba4f111"
+SRCREV = "a7ef31b64324fa43623e768a0798175884bd6e79"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 3528ae7..ff13986 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -1,6 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-QT_MODULE_BRANCH = "release"
-# v5.3.0
-SRCREV = "c6dfdcdacfdd8c8190301b930caf67ad50ac09bb"
+SRCREV = "eb16b1970293dfeb5918751afbdf1fb7f62028e1"
--git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 954545f..fdb8094 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "947361a7dc8db093d0b8e1ec5ac953470a180259"
+SRCREV = "2d84caf5ef1b5dace0d678df4581db3c955be6ee"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index b86a749..fb1846c 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -1,7 +1,7 @@
require qt5-git.inc
require ${PN}.inc
-SRCREV = "d25091bb8b52455e415f8147a9100094c489a041"
+SRCREV = "e13d30be68228ccda3b6310ac44a84981b17f03b"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-qt5][PATCHv2 07/10] recipes-git: Use LIC_FILES_CHKSUM from .inc files
2014-06-05 22:08 ` [meta-qt5][PATCHv2 01/10] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
` (4 preceding siblings ...)
2014-06-05 22:08 ` [meta-qt5][PATCHv2 06/10] recipes-git: Upgrade to latest origin/stable Martin Jansa
@ 2014-06-05 22:08 ` Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 08/10] qtbase: Refresh patches to match with b5.3.0* branches on github.com/meta-qt5 Martin Jansa
` (2 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2014-06-05 22:08 UTC (permalink / raw)
To: openembedded-devel
* the old checksum was introduced in .inc files in upgrade of
tarball recipes to 5.3.0, use that until it's updated in
git recipes and then we'll have to move old checksum from .inc
to release recipe only.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes-qt/qt5/nativesdk-qttools_git.bb | 6 ------
recipes-qt/qt5/qtdeclarative_git.bb | 6 ------
recipes-qt/qt5/qtgraphicaleffects_git.bb | 6 ------
recipes-qt/qt5/qtimageformats_git.bb | 6 ------
recipes-qt/qt5/qtlocation_git.bb | 6 ------
recipes-qt/qt5/qtmultimedia_git.bb | 6 ------
recipes-qt/qt5/qtquick1_git.bb | 6 ------
recipes-qt/qt5/qtquickcontrols_git.bb | 6 ------
recipes-qt/qt5/qtscript_git.bb | 6 ------
recipes-qt/qt5/qtsensors_git.bb | 6 ------
recipes-qt/qt5/qtsvg_git.bb | 6 ------
recipes-qt/qt5/qttools-native_git.bb | 6 ------
recipes-qt/qt5/qttools_git.bb | 6 ------
recipes-qt/qt5/qtwayland-native_git.bb | 6 ------
recipes-qt/qt5/qtwayland_git.bb | 6 ------
recipes-qt/qt5/qtxmlpatterns_git.bb | 6 ------
16 files changed, 96 deletions(-)
diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb b/recipes-qt/qt5/nativesdk-qttools_git.bb
index 933119c..a9a6114 100644
--- a/recipes-qt/qt5/nativesdk-qttools_git.bb
+++ b/recipes-qt/qt5/nativesdk-qttools_git.bb
@@ -5,9 +5,3 @@ require ${PN}.inc
FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
SRCREV = "eaf069902111533f0e675ab32279bb57a5916169"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 318ba44..97223fc 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "67a101af142355a0ca7cdc234b7ee1716a25d87c"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index a1e9009..ef9cf50 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "82abf6975b6737259ee656564e5ec7f8ad1d0508"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 3e04c40..3c154a4 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "bcc7909dfe9d89f793919bc96abdfd6b704c4c0e"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index fcb6993..6157633 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "749cdff5289412780f0bb8e351cb140ba64d85ce"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index f0ce24e..906709c 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "7e668fe58fc9546eb91bbf39992566f709b5e6c2"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 3400f47..7cb29a6 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "26e713cddcc8a62e49ce7a3352d3b5f13ffd7d52"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index bab6854..9dd7730 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "82a0a8244a2edf27c196f6c8cc3e2c36a3f4a8c5"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 6d8fd31..54fd7ec 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "161e1fd31537f41992b3024c32b525b64be080ed"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index c2ab063..6cd22b3 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "9efc5bea41e7acbce55c37b49b167092b71114a9"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 6fc617d..9420ff8 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "35a2f0880831d38c60d2b4820dac808f48f6f3a8"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb
index b37e0ed..4f5a7cf 100644
--- a/recipes-qt/qt5/qttools-native_git.bb
+++ b/recipes-qt/qt5/qttools-native_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "eaf069902111533f0e675ab32279bb57a5916169"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index b37e0ed..4f5a7cf 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "eaf069902111533f0e675ab32279bb57a5916169"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index 9089f0f..3179c98 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -10,9 +10,3 @@ SRCREV = "98dca3b54f52f08117c1e0d3a1b4826ed12ef23f"
do_install_append() {
ln -sf ${D}${OE_QMAKE_PATH_QT_BINS}/qtwaylandscanner ${D}${bindir}/qtwaylandscanner
}
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index ca068da..f586605 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -14,9 +14,3 @@ do_install_append() {
# do install files created by qtwaylandscanner
install ${B}/include/QtCompositor/5.3.0/QtCompositor/private/{qwayland-server-*,*protocol*}.h ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.3.0/QtCompositor/private
}
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index fb1846c..5d63a6b 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -2,9 +2,3 @@ require qt5-git.inc
require ${PN}.inc
SRCREV = "e13d30be68228ccda3b6310ac44a84981b17f03b"
-
-# older copyright year than what e.g. qtbase is using now
-LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-qt5][PATCHv2 08/10] qtbase: Refresh patches to match with b5.3.0* branches on github.com/meta-qt5
2014-06-05 22:08 ` [meta-qt5][PATCHv2 01/10] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
` (5 preceding siblings ...)
2014-06-05 22:08 ` [meta-qt5][PATCHv2 07/10] recipes-git: Use LIC_FILES_CHKSUM from .inc files Martin Jansa
@ 2014-06-05 22:08 ` Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 09/10] qtbase: Refresh patches to match with stable* " Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 10/10] maliit-framework-qt5: Add patch to fix build with qt-5.3, remove unused files Martin Jansa
8 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2014-06-05 22:08 UTC (permalink / raw)
To: openembedded-devel
* move more patches to "shared" section
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes-qt/qt5/nativesdk-qtbase.inc | 13 ++++---
recipes-qt/qt5/qtbase-native.inc | 15 ++++----
recipes-qt/qt5/qtbase.inc | 17 ++++-----
.../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 18 +++++-----
...o-allow-to-set-qt.conf-from-the-outside-u.patch | 10 +++---
.../0003-Add-external-hostbindir-option.patch | 40 +++++++++++-----------
...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 12 +++----
.../0005-qt_module-Fix-pkgconfig-replacement.patch | 6 ++--
...on-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | 8 ++---
| 12 +++----
...ake-pulseaudio-alsa-freetype-a-configurab.patch | 10 +++---
...E_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch | 8 ++---
...s.patch => 0010-Fix-missing-plugin_types.patch} | 6 ++--
...fs-Print-the-chosen-config-in-debug-mode.patch} | 8 ++---
...integration-Undefine-CursorShape-from-X..patch} | 4 +--
...mp-path-length-from-256-to-512-character.patch} | 10 +++---
...0014-QOpenGLPaintDevice-sub-area-support.patch} | 6 ++--
...l-error-for-platforms-only-supporting-on.patch} | 20 +++++------
...build-uic.patch => 0016-Always-build-uic.patch} | 6 ++--
...-qmake-is-already-built-in-qtbase-native.patch} | 10 +++---
...building-a-separate-qmake-for-the-target.patch} | 6 ++--
...eserve-built-qmake-and-swap-with-native-.patch} | 10 +++---
22 files changed, 131 insertions(+), 124 deletions(-)
rename recipes-qt/qt5/qtbase/{0015-Fix-missing-plugin_types.patch => 0010-Fix-missing-plugin_types.patch} (90%)
rename recipes-qt/qt5/qtbase/{0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch => 0011-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch} (91%)
rename recipes-qt/qt5/qtbase/{0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch => 0012-qeglplatformintegration-Undefine-CursorShape-from-X..patch} (87%)
rename recipes-qt/qt5/qtbase/{0012-configure-bump-path-length-from-256-to-512-character.patch => 0013-configure-bump-path-length-from-256-to-512-character.patch} (78%)
rename recipes-qt/qt5/qtbase/{0013-QOpenGLPaintDevice-sub-area-support.patch => 0014-QOpenGLPaintDevice-sub-area-support.patch} (97%)
rename recipes-qt/qt5/qtbase/{0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch => 0015-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch} (81%)
rename recipes-qt/qt5/qtbase/{0010-Always-build-uic.patch => 0016-Always-build-uic.patch} (87%)
rename recipes-qt/qt5/qtbase/{0010-qmake-is-already-built-in-qtbase-native.patch => 0016-qmake-is-already-built-in-qtbase-native.patch} (74%)
rename recipes-qt/qt5/qtbase/{0011-Allow-building-a-separate-qmake-for-the-target.patch => 0017-Allow-building-a-separate-qmake-for-the-target.patch} (83%)
rename recipes-qt/qt5/qtbase/{0011-configure-preserve-built-qmake-and-swap-with-native-.patch => 0017-configure-preserve-built-qmake-and-swap-with-native-.patch} (73%)
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
index 62e841c..5424ce9 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -23,19 +23,22 @@ SRC_URI += "\
file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
- file://0015-Fix-missing-plugin_types.patch \
- file://0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0010-Fix-missing-plugin_types.patch \
+ file://0011-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0012-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
+ file://0013-configure-bump-path-length-from-256-to-512-character.patch \
+ file://0014-QOpenGLPaintDevice-sub-area-support.patch \
+ file://0015-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
"
# common with -native
SRC_URI += " \
- file://0010-Always-build-uic.patch \
+ file://0016-Always-build-uic.patch \
"
# specific for nativesdk version
SRC_URI += " \
- file://0011-configure-preserve-built-qmake-and-swap-with-native-.patch \
- file://0012-configure-bump-path-length-from-256-to-512-character.patch \
+ file://0017-configure-preserve-built-qmake-and-swap-with-native-.patch \
"
PACKAGES = "${PN}-tools-dbg ${PN}-tools-dev ${PN}-tools-staticdev ${PN}-tools"
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc
index dc04987..fae7888 100644
--- a/recipes-qt/qt5/qtbase-native.inc
+++ b/recipes-qt/qt5/qtbase-native.inc
@@ -7,8 +7,7 @@ QT_MODULE = "qtbase"
require qt5-native.inc
-# common with target version
-# common with -native and target version
+# common with nativesdk- and target version
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
@@ -19,13 +18,17 @@ SRC_URI += "\
file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
- file://0015-Fix-missing-plugin_types.patch \
- file://0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0010-Fix-missing-plugin_types.patch \
+ file://0011-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0012-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
+ file://0013-configure-bump-path-length-from-256-to-512-character.patch \
+ file://0014-QOpenGLPaintDevice-sub-area-support.patch \
+ file://0015-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
"
-# specific for native version
+# common with nativesdk- version
SRC_URI += " \
- file://0010-Always-build-uic.patch \
+ file://0016-Always-build-uic.patch \
"
QT_CONF_PATH = "${B}/qt.conf"
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 726576c..c4d1b84 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -1,6 +1,6 @@
require qt5.inc
-# common with -native
+# common with qtbase-native and nativesdk-qtbase
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
@@ -11,16 +11,17 @@ SRC_URI += "\
file://0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
file://0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch \
file://0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch \
- file://0015-Fix-missing-plugin_types.patch \
- file://0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0010-Fix-missing-plugin_types.patch \
+ file://0011-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0012-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
+ file://0013-configure-bump-path-length-from-256-to-512-character.patch \
+ file://0014-QOpenGLPaintDevice-sub-area-support.patch \
+ file://0015-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
"
SRC_URI += "\
- file://0010-qmake-is-already-built-in-qtbase-native.patch \
- file://0011-Allow-building-a-separate-qmake-for-the-target.patch \
- file://0013-QOpenGLPaintDevice-sub-area-support.patch \
- file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
- file://0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
+ file://0016-qmake-is-already-built-in-qtbase-native.patch \
+ file://0017-Allow-building-a-separate-qmake-for-the-target.patch \
"
DEPENDS += "qtbase-native"
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index 5ce4cdd..cddd621 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
-From f883ec8652ee603d9bb9def7eb669ed82c493961 Mon Sep 17 00:00:00 2001
+From 2c2e479049c49539049db7e53d500e673285025f Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 15 Apr 2013 04:29:32 +0200
-Subject: [PATCH 01/14] Add linux-oe-g++ platform
+Subject: [PATCH 01/17] Add linux-oe-g++ platform
* This qmake.conf unlike other platforms reads most variables from
shell environment, because it's easier for qt recipes to export
@@ -41,7 +41,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
diff --git a/configure b/configure
-index aaa59bd..0e74f29 100755
+index 601d84a..eaa4092 100755
--- a/configure
+++ b/configure
@@ -324,6 +324,16 @@ getQMakeConf()
@@ -97,8 +97,8 @@ index aaa59bd..0e74f29 100755
SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
for varname in $SYSTEM_VARIABLES; do
qmakevarname="${varname}"
-@@ -3362,7 +3394,7 @@ if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then
- CFG_QGTKSTYLE=no
+@@ -3117,7 +3149,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
+ [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
fi
-QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
@@ -106,7 +106,7 @@ index aaa59bd..0e74f29 100755
TEST_COMPILER=$QMAKE_CONF_COMPILER
-@@ -3397,7 +3429,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
+@@ -3152,7 +3184,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
exit 1
fi
fi
@@ -115,7 +115,7 @@ index aaa59bd..0e74f29 100755
GCC_MACHINE_DUMP=
case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
-@@ -3878,6 +3910,14 @@ setBootstrapVariable()
+@@ -3617,6 +3649,14 @@ setBootstrapVariable()
getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
}
@@ -130,7 +130,7 @@ index aaa59bd..0e74f29 100755
# build qmake
if true; then ###[ '!' -f "$outpath/bin/qmake" ];
echo "Creating qmake..."
-@@ -3916,11 +3956,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -3655,11 +3695,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
fi
[ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -300,5 +300,5 @@ index 0000000..dd12003
+
+#endif // QPLATFORMDEFS_H
--
-1.8.5.3
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index 2f72dca..14f0fc7 100644
--- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,7 +1,7 @@
-From 841d1f06f3fd2f59f6b18067b02d5fcfc93aaa7a Mon Sep 17 00:00:00 2001
+From c45a30d1301f85e49eef66c06cccf2a16741a932 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Wed, 26 Sep 2012 17:22:30 +0200
-Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside
+Subject: [PATCH 02/17] qlibraryinfo: allow to set qt.conf from the outside
using the environment
Allow to set a qt.conf from the outside using the environment. This allows
@@ -16,10 +16,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 1c3b09f..c647a16 100644
+index 6d25325..80e0f30 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -149,7 +149,10 @@ QLibrarySettings::QLibrarySettings()
+@@ -153,7 +153,10 @@ QLibrarySettings::QLibrarySettings()
QSettings *QLibraryInfoPrivate::findConfiguration()
{
@@ -32,5 +32,5 @@ index 1c3b09f..c647a16 100644
if(!QFile::exists(qtconfig))
qtconfig = qt_libraryInfoFile();
--
-1.8.5.3
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
index 7e03f74..f8253ec 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,7 +1,7 @@
-From 3648eeddaed0cf31fba226ec713d2321f398974f Mon Sep 17 00:00:00 2001
+From 5c2a17167e89f8f6cf26cbc289e57fa466678d2d Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 6 Apr 2013 13:15:07 +0200
-Subject: [PATCH 03/14] Add -external-hostbindir option
+Subject: [PATCH 03/17] Add -external-hostbindir option
* when cross-compiling it's sometimes useful to use existing tools from machine
(or in OpenEmbedded built with separate native recipe) when building for target
@@ -28,10 +28,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
-index 0e74f29..7f3f2f0 100755
+index eaa4092..43ad8df 100755
--- a/configure
+++ b/configure
-@@ -788,6 +788,7 @@ QT_HOST_BINS=
+@@ -791,6 +791,7 @@ QT_HOST_BINS=
QT_HOST_LIBS=
QT_HOST_DATA=
QT_EXT_PREFIX=
@@ -39,7 +39,7 @@ index 0e74f29..7f3f2f0 100755
#flags for SQL drivers
QT_CFLAGS_PSQL=
-@@ -907,6 +908,7 @@ while [ "$#" -gt 0 ]; do
+@@ -910,6 +911,7 @@ while [ "$#" -gt 0 ]; do
-testsdir| \
-hostdatadir| \
-hostbindir| \
@@ -47,7 +47,7 @@ index 0e74f29..7f3f2f0 100755
-hostlibdir| \
-extprefix| \
-sysroot| \
-@@ -1120,6 +1122,9 @@ while [ "$#" -gt 0 ]; do
+@@ -1124,6 +1126,9 @@ while [ "$#" -gt 0 ]; do
extprefix)
QT_EXT_PREFIX="$VAL"
;;
@@ -57,7 +57,7 @@ index 0e74f29..7f3f2f0 100755
pkg-config)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_PKGCONFIG="$VAL"
-@@ -2236,6 +2241,10 @@ Installation options:
+@@ -2248,6 +2253,10 @@ Installation options:
-hostdatadir <dir> . Data used by qmake will be installed to <dir>
(default HOSTPREFIX)
@@ -68,7 +68,7 @@ index 0e74f29..7f3f2f0 100755
Configure options:
The defaults (*) are usually acceptable. A plus (+) denotes a default value
-@@ -3151,6 +3160,11 @@ fi
+@@ -2906,6 +2915,11 @@ fi
# command line and environment validation
#-------------------------------------------------------------------------------
@@ -80,7 +80,7 @@ index 0e74f29..7f3f2f0 100755
# update QT_CONFIG to show our current predefined configuration
CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
case "$CFG_QCONFIG" in
-@@ -3838,6 +3852,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
+@@ -3593,6 +3607,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
"qt_hbinpath=$QT_HOST_BINS",
"qt_hlibpath=$QT_HOST_LIBS",
"qt_hdatpath=$QT_HOST_DATA",
@@ -135,10 +135,10 @@ index e50485c..71291ad 100644
{ "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
};
diff --git a/qtbase.pro b/qtbase.pro
-index 140a137..4e01d5b 100644
+index ed6fc39..2421f41 100644
--- a/qtbase.pro
+++ b/qtbase.pro
-@@ -70,16 +70,22 @@ CONFIG -= qt
+@@ -71,16 +71,22 @@ CONFIG -= qt
#qmake
qmake.path = $$[QT_HOST_BINS]
@@ -165,10 +165,10 @@ index 140a137..4e01d5b 100644
# If we are doing a prefix build, create a "module" pri which enables
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index c647a16..da82913 100644
+index 80e0f30..89e13cf 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -281,7 +281,7 @@ QLibraryInfo::isDebugBuild()
+@@ -336,7 +336,7 @@ QLibraryInfo::isDebugBuild()
*/
static const struct {
@@ -177,7 +177,7 @@ index c647a16..da82913 100644
} qtConfEntries[] = {
{ "Prefix", "." },
{ "Documentation", "doc" }, // should be ${Data}/doc
-@@ -307,6 +307,7 @@ static const struct {
+@@ -362,6 +362,7 @@ static const struct {
{ "HostBinaries", "bin" },
{ "HostLibraries", "lib" },
{ "HostData", "." },
@@ -186,10 +186,10 @@ index c647a16..da82913 100644
{ "HostSpec", "" },
#endif
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
-index 17864b5..a14bc0f 100644
+index 0b573c2..b5535ee 100644
--- a/src/corelib/global/qlibraryinfo.h
+++ b/src/corelib/global/qlibraryinfo.h
-@@ -84,6 +84,7 @@ public:
+@@ -88,6 +88,7 @@ public:
HostBinariesPath,
HostLibrariesPath,
HostDataPath,
@@ -198,10 +198,10 @@ index 17864b5..a14bc0f 100644
HostSpecPath,
LastHostPath = HostSpecPath,
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
-index 5ab413a..50a192b 100644
+index fe2caa2..eb472db 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
-@@ -1186,6 +1186,13 @@ void Configure::parseCmdLine()
+@@ -1208,6 +1208,13 @@ void Configure::parseCmdLine()
dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i);
}
@@ -215,7 +215,7 @@ index 5ab413a..50a192b 100644
else if (configCmdLine.at(i) == "-make-tool") {
++i;
if (i == argCount)
-@@ -3852,6 +3859,7 @@ void Configure::generateQConfigCpp()
+@@ -3957,6 +3964,7 @@ void Configure::generateQConfigCpp()
<< " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
<< " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
<< " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
@@ -224,5 +224,5 @@ index 5ab413a..50a192b 100644
<< " \"qt_hostspec=" << hostSpec << "\"," << endl
<< "#endif" << endl
--
-1.8.5.3
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
index 16317ac..d24e193 100644
--- a/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ b/recipes-qt/qt5/qtbase/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -1,7 +1,7 @@
-From 698f073fb8cc6dc1ced277b6ae2056cb9d02f2d5 Mon Sep 17 00:00:00 2001
+From 15b871b694cead18fcb750c0bb393440ea929e06 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 27 Apr 2013 22:33:33 +0200
-Subject: [PATCH 04/14] configureapp: Prefix default LIBDIRS and INCDIRS with
+Subject: [PATCH 04/17] configureapp: Prefix default LIBDIRS and INCDIRS with
SYSROOT
Upstream-Status: Pending
@@ -10,10 +10,10 @@ Upstream-Status: Pending
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
-index 50a192b..46eabe4 100644
+index eb472db..808c8dd 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
-@@ -3213,8 +3213,8 @@ void Configure::generateQConfigPri()
+@@ -3344,8 +3344,8 @@ void Configure::generateQConfigPri()
configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl;
if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
// FIXME: add detection
@@ -23,7 +23,7 @@ index 50a192b..46eabe4 100644
+ configStream << " QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
}
configStream << "}" << endl;
- if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
+ configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
--
-1.8.5.3
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch
index e1135ce..751ba27 100644
--- a/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch
+++ b/recipes-qt/qt5/qtbase/0005-qt_module-Fix-pkgconfig-replacement.patch
@@ -1,7 +1,7 @@
-From 4d690dbc278063648434b0f02bdb1b6f4623b285 Mon Sep 17 00:00:00 2001
+From ad57786c39de2a192c0972bca6ffde2ce7a05d91 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 27 Apr 2013 23:15:37 +0200
-Subject: [PATCH 05/14] qt_module: Fix pkgconfig replacement
+Subject: [PATCH 05/17] qt_module: Fix pkgconfig replacement
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -95,5 +95,5 @@ index 2134077..a88b8cc 100644
unix|mingw {
--
-1.9.3
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
index 726bfe0..2ad412e 100644
--- a/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
+++ b/recipes-qt/qt5/qtbase/0006-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
@@ -1,7 +1,7 @@
-From ebd38fc708cf7190e47a75754235f56fa5d86300 Mon Sep 17 00:00:00 2001
+From 96b69ad415b4883782841fa1d7723cf182e4ce6e Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 8 May 2013 23:54:35 +0200
-Subject: [PATCH 06/14] configure: don't export SYSTEM_VARIABLES to .qmake.vars
+Subject: [PATCH 06/17] configure: don't export SYSTEM_VARIABLES to .qmake.vars
* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is
causing issues as we need g++ to be used as linker
@@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 14 deletions(-)
diff --git a/configure b/configure
-index 7f3f2f0..13dd619 100755
+index 43ad8df..341a01b 100755
--- a/configure
+++ b/configure
@@ -581,20 +581,6 @@ fi'`
@@ -39,5 +39,5 @@ index 7f3f2f0..13dd619 100755
mkdir -p "$outpath/config.tests"
rm -f "$outpath/config.tests/.qmake.cache"
--
-1.8.5.3
+2.0.0
--git a/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch
index e8a7784..66eb898 100644
--- a/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch
+++ b/recipes-qt/qt5/qtbase/0007-configure.prf-Allow-to-add-extra-arguments-to-make.patch
@@ -1,7 +1,7 @@
-From 828eecd8f361cb965bd40f535435efa91665c8e5 Mon Sep 17 00:00:00 2001
+From 28fa609f9726993dd5b52de45c3458a1bdff6149 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 9 May 2013 10:06:50 +0200
-Subject: [PATCH 07/14] configure.prf: Allow to add extra arguments to make
+Subject: [PATCH 07/17] configure.prf: Allow to add extra arguments to make
* sometimes we would like to add -e or define some variable and respect it from both
Makefiles used in configure tests and also Makefiles to build the application
@@ -14,11 +14,11 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
-index 39144e7..de48b07 100644
+index fe41c54..e2db923 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
-@@ -54,12 +54,12 @@ defineTest(qtCompileTest) {
- qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\""
+@@ -60,12 +60,12 @@ defineTest(qtCompileTest) {
+ }
# Clean up after previous run
- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean")
@@ -33,5 +33,5 @@ index 39144e7..de48b07 100644
msg = "test $$1 succeeded"
write_file($$QMAKE_CONFIG_LOG, msg, append)
--
-1.8.5.3
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch b/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch
index cccf7fb..d1d5873 100644
--- a/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch
+++ b/recipes-qt/qt5/qtbase/0008-configure-make-pulseaudio-alsa-freetype-a-configurab.patch
@@ -1,7 +1,7 @@
-From 3923edc900d1b3dd23e0a6af3a32255707cd497c Mon Sep 17 00:00:00 2001
+From 8cca7892a65992369bb50a965293ebd2198ce40a Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Tue, 28 Feb 2012 15:10:24 +0000
-Subject: [PATCH 08/14] configure: make pulseaudio, alsa, freetype a
+Subject: [PATCH 08/17] configure: make pulseaudio, alsa, freetype a
configurable option
Allows disabling pulseaudio, alsa, freetype support at configure time
@@ -16,10 +16,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 21 insertions(+)
diff --git a/configure b/configure
-index 13dd619..66c2ae0 100755
+index 341a01b..7d33403 100755
--- a/configure
+++ b/configure
-@@ -1810,6 +1810,27 @@ while [ "$#" -gt 0 ]; do
+@@ -1826,6 +1826,27 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
@@ -48,5 +48,5 @@ index 13dd619..66c2ae0 100755
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_QGTKSTYLE="$VAL"
--
-1.8.5.3
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch
index 23e22a8..c83e330 100644
--- a/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch
+++ b/recipes-qt/qt5/qtbase/0009-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determ.patch
@@ -1,7 +1,7 @@
-From acbd622d1b91c1aa9ec8c48d10d91354d175345c Mon Sep 17 00:00:00 2001
+From c1c28fa202519d6af0ca5aac942c3e18aaeda602 Mon Sep 17 00:00:00 2001
From: Simon Busch <morphis@gravedo.de>
Date: Mon, 22 Jul 2013 21:09:41 +0000
-Subject: [PATCH 09/14] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to
+Subject: [PATCH 09/17] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to
determine path to host binaries
Upstream-Status: Inappropiate (configuration)
@@ -46,7 +46,7 @@ index 9bda70e..6e3605a 100644
_qt5_Core_check_file_exists(${imported_location})
diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
-index 1d94715..617efa8 100644
+index 1d94715..301af8f 100644
--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
@@ -81,5 +81,5 @@ index e5650ff..16ff007 100644
_qt5_Widgets_check_file_exists(${imported_location})
--
-1.8.5.3
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch b/recipes-qt/qt5/qtbase/0010-Fix-missing-plugin_types.patch
similarity index 90%
rename from recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch
rename to recipes-qt/qt5/qtbase/0010-Fix-missing-plugin_types.patch
index 612cbdd..8defd45 100644
--- a/recipes-qt/qt5/qtbase/0015-Fix-missing-plugin_types.patch
+++ b/recipes-qt/qt5/qtbase/0010-Fix-missing-plugin_types.patch
@@ -1,7 +1,7 @@
-From f0e01b788e86f24352ba14ad17c3f337f934467d Mon Sep 17 00:00:00 2001
+From 92cd73cb679dec203484cd76deff50cf329d8c44 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 21 Apr 2014 15:09:23 +0200
-Subject: [PATCH] Fix missing plugin_types
+Subject: [PATCH 10/17] Fix missing plugin_types
* bearer/generic was failing with:
Project ERROR: No module claims plugin type 'bearer'
@@ -26,5 +26,5 @@ index f31bc38..415e780 100644
rpath_link \
)):defined(QT.$${mod}.$$var, var):cache(QT.$${mod}.$$var, transient)
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase/0011-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
similarity index 91%
rename from recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
rename to recipes-qt/qt5/qtbase/0011-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
index 65ebbd1..412ff35 100644
--- a/recipes-qt/qt5/qtbase/0016-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
+++ b/recipes-qt/qt5/qtbase/0011-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
@@ -1,7 +1,7 @@
-From 91b185d1f4843d22d42461c0aee4cd0f5393bbc8 Mon Sep 17 00:00:00 2001
+From 13d45f81c26b22668c58d56a797db6f4309b5469 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 21 Apr 2014 19:22:04 +0200
-Subject: [PATCH] Revert "eglfs: Print the chosen config in debug mode"
+Subject: [PATCH 11/17] Revert "eglfs: Print the chosen config in debug mode"
This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e.
---
@@ -10,7 +10,7 @@ This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e.
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
-index e6624fb..3870f6c 100644
+index 75789db..cd732d9 100644
--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
@@ -437,9 +437,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
@@ -52,5 +52,5 @@ index eec6463..4a7c69b 100644
// Make the context current to ensure the GL version query works. This needs a surface too.
const EGLint pbufferAttributes[] = {
--
-1.9.1
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0012-qeglplatformintegration-Undefine-CursorShape-from-X..patch
similarity index 87%
rename from recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
rename to recipes-qt/qt5/qtbase/0012-qeglplatformintegration-Undefine-CursorShape-from-X..patch
index 2f4d80c..6c7d139 100644
--- a/recipes-qt/qt5/qtbase/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
+++ b/recipes-qt/qt5/qtbase/0012-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -1,7 +1,7 @@
-From 959b2fb8d8eb5e755e3d9d3d3031b996f96fb23b Mon Sep 17 00:00:00 2001
+From ebe56bbaf8916bae94e7cef7932b87fd0fe13959 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 19 Mar 2014 18:32:28 +0100
-Subject: [PATCH 8/8] qeglplatformintegration: Undefine CursorShape from X.h
+Subject: [PATCH 12/17] qeglplatformintegration: Undefine CursorShape from X.h
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
diff --git a/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0013-configure-bump-path-length-from-256-to-512-character.patch
similarity index 78%
rename from recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch
rename to recipes-qt/qt5/qtbase/0013-configure-bump-path-length-from-256-to-512-character.patch
index be86f71..a215a5d 100644
--- a/recipes-qt/qt5/qtbase/0012-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0013-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,7 +1,7 @@
-From 63313ba681ad5bb0ef83c3b8908387939c2b41d5 Mon Sep 17 00:00:00 2001
+From 2fd1d381e0202296303f296965467f3252d72e25 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Mon, 11 Nov 2013 20:27:30 -0500
-Subject: [PATCH 12/12] configure: bump path length from 256 to 512 characters
+Subject: [PATCH 13/17] configure: bump path length from 256 to 512 characters
Increase the path length that gets hardcoded into generated config.cpp file
from 256 to 512 characters, as nativesdk path can be quite long.
@@ -12,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
-index d423cce..1ea4102 100755
+index 7d33403..53eb65d 100755
--- a/configure
+++ b/configure
-@@ -3823,7 +3823,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
+@@ -3578,7 +3578,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`";
/* Installation Info */
@@ -25,5 +25,5 @@ index d423cce..1ea4102 100755
"qt_prfxpath=$QT_SYSROOT_PREFIX",
"qt_docspath=$QT_SYSROOT_DOCS",
--
-1.8.5.3
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0014-QOpenGLPaintDevice-sub-area-support.patch
similarity index 97%
rename from recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch
rename to recipes-qt/qt5/qtbase/0014-QOpenGLPaintDevice-sub-area-support.patch
index 54039de..64dd18a 100644
--- a/recipes-qt/qt5/qtbase/0013-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase/0014-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,7 +1,7 @@
-From 3c7bfc66e6c84fe06b16dfa0b76ee71701e8d5b5 Mon Sep 17 00:00:00 2001
+From d252513e388358e52865a29374840327369cb479 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <jani.hautakangas@ixonos.com>
Date: Thu, 16 May 2013 09:52:07 +0300
-Subject: [PATCH 13/14] QOpenGLPaintDevice sub-area support
+Subject: [PATCH 14/17] QOpenGLPaintDevice sub-area support
Allows creating QOpenGLPaintDevice targetting sub-area
of binded framebuffer.
@@ -148,5 +148,5 @@ index ac88d9d..6c77f10 100644
} else {
if (m_vao.isCreated()) {
--
-1.9.3
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase/0015-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
similarity index 81%
rename from recipes-qt/qt5/qtbase/0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
rename to recipes-qt/qt5/qtbase/0015-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
index 6fd2938..92b9ddd 100644
--- a/recipes-qt/qt5/qtbase/0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
+++ b/recipes-qt/qt5/qtbase/0015-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
@@ -1,7 +1,7 @@
-From c8995c6eb6cf4bfa8daf1e3e96bd4885a096f405 Mon Sep 17 00:00:00 2001
+From c209e7648bc0c59707fe18874789a826f8beb47b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 5 Feb 2014 18:35:08 +0100
-Subject: [PATCH 14/14] eglfs: fix egl error for platforms only supporting one
+Subject: [PATCH 15/17] eglfs: fix egl error for platforms only supporting one
window/surface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -26,12 +26,12 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
1 file changed, 15 insertions(+)
diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp
-index bba00da..567820c 100644
+index 2d36c0b..f2b68d3 100644
--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp
-@@ -87,6 +87,16 @@ void QEglFSWindow::create()
- if (m_flags.testFlag(Created))
- return;
+@@ -72,6 +72,16 @@ void QEglFSWindow::create()
+
+ QEGLPlatformWindow::create();
+ static EGLSurface __singleWindowSurface;
+ if(QEglFSHooks::hooks() && !QEglFSHooks::hooks()->hasCapability(QPlatformIntegration::MultipleWindows) && (__singleWindowSurface))
@@ -44,9 +44,9 @@ index bba00da..567820c 100644
+ }
+
m_flags = Created;
- m_wid = newWId();
-@@ -130,6 +140,11 @@ void QEglFSWindow::create()
+ if (window()->type() == Qt::Desktop)
+@@ -105,6 +115,11 @@ void QEglFSWindow::create()
resetSurface();
@@ -57,7 +57,7 @@ index bba00da..567820c 100644
+
screen->setPrimarySurface(m_surface);
- if (m_flags.testFlag(IsRaster)) {
+ if (isRaster()) {
--
-1.8.5.3
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0016-Always-build-uic.patch
similarity index 87%
rename from recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
rename to recipes-qt/qt5/qtbase/0016-Always-build-uic.patch
index c55bc54..a466dbc 100644
--- a/recipes-qt/qt5/qtbase/0010-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0016-Always-build-uic.patch
@@ -1,7 +1,7 @@
-From 745055eb0f56ec4d48ea2ce57bcf3d0011afcec0 Mon Sep 17 00:00:00 2001
+From 981cbf981b4a36d790b4ebf1a3434ef439ad3e52 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 16 Nov 2013 00:32:30 +0100
-Subject: [PATCH 10/12] Always build uic
+Subject: [PATCH 16/17] Always build uic
Even if we are not building gui or widgets. This tool is needed later
as a native tool when compiling the target.
@@ -27,5 +27,5 @@ index 6a805a6..90623a6 100644
nacl: SUBDIRS -= src_network src_testlib
--
-1.9.3
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0016-qmake-is-already-built-in-qtbase-native.patch
similarity index 74%
rename from recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch
rename to recipes-qt/qt5/qtbase/0016-qmake-is-already-built-in-qtbase-native.patch
index 64ba88e..b807862 100644
--- a/recipes-qt/qt5/qtbase/0010-qmake-is-already-built-in-qtbase-native.patch
+++ b/recipes-qt/qt5/qtbase/0016-qmake-is-already-built-in-qtbase-native.patch
@@ -1,7 +1,7 @@
-From 77a18a9fe2d0e4a1dcd95e2d78c85eb37452bc73 Mon Sep 17 00:00:00 2001
+From 9a83bdba584d2a816c4f54fbc903f9f8f9fc0a2d Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Mon, 29 Oct 2012 20:07:49 -0700
-Subject: [PATCH 10/14] qmake is already built in qtbase-native
+Subject: [PATCH 16/17] qmake is already built in qtbase-native
Ported from OE by: Yu Ke <ke.yu@intel.com>
Upstream-Status: Inappropriate [configuration]
@@ -13,10 +13,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
-index 66c2ae0..ac836aa 100755
+index 53eb65d..b61c82b 100755
--- a/configure
+++ b/configure
-@@ -3941,7 +3941,7 @@ setBootstrapEvalVariable()
+@@ -3680,7 +3680,7 @@ setBootstrapEvalVariable()
# build qmake
@@ -26,5 +26,5 @@ index 66c2ae0..ac836aa 100755
mkdir -p "$outpath/qmake" || exit
--
-1.8.5.3
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0017-Allow-building-a-separate-qmake-for-the-target.patch
similarity index 83%
rename from recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch
rename to recipes-qt/qt5/qtbase/0017-Allow-building-a-separate-qmake-for-the-target.patch
index f80edbd..a6fcfe5 100644
--- a/recipes-qt/qt5/qtbase/0011-Allow-building-a-separate-qmake-for-the-target.patch
+++ b/recipes-qt/qt5/qtbase/0017-Allow-building-a-separate-qmake-for-the-target.patch
@@ -1,7 +1,7 @@
-From dd14f3eda61669c66c95dbcbca3afbd61f9aa746 Mon Sep 17 00:00:00 2001
+From a850a288fb526e6a4003616aa11dd992688ccc89 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Mon, 29 Oct 2012 20:26:36 -0700
-Subject: [PATCH 11/14] Allow building a separate qmake for the target
+Subject: [PATCH 17/17] Allow building a separate qmake for the target
Upstream-Status: Inappropriate [config]
@@ -26,5 +26,5 @@ index 89d6ea5..7c605b9 100644
VPATH += \
../src/corelib/global \
--
-1.8.5.3
+2.0.0
diff --git a/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0017-configure-preserve-built-qmake-and-swap-with-native-.patch
similarity index 73%
rename from recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch
rename to recipes-qt/qt5/qtbase/0017-configure-preserve-built-qmake-and-swap-with-native-.patch
index 798cd45..0d5bc2f 100644
--- a/recipes-qt/qt5/qtbase/0011-configure-preserve-built-qmake-and-swap-with-native-.patch
+++ b/recipes-qt/qt5/qtbase/0017-configure-preserve-built-qmake-and-swap-with-native-.patch
@@ -1,7 +1,7 @@
-From 441b2ebc41013505b9f5b6a4db43526506f84e47 Mon Sep 17 00:00:00 2001
+From 88e1910cc2e0c2890d7084cc66ebb7c3c9981bf3 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Mon, 11 Nov 2013 20:22:34 -0500
-Subject: [PATCH 11/12] configure: preserve built qmake and swap with native
+Subject: [PATCH 17/17] configure: preserve built qmake and swap with native
one
Let configure script build the real qmake, but right after it's built, swap
@@ -13,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
1 file changed, 2 insertions(+)
diff --git a/configure b/configure
-index 66c2ae0..d423cce 100755
+index 53eb65d..01832e6 100755
--- a/configure
+++ b/configure
-@@ -4085,6 +4085,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -3827,6 +3827,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
(cd "$outpath/qmake"; "$MAKE") || exit 2
fi # Build qmake
@@ -26,5 +26,5 @@ index 66c2ae0..d423cce 100755
echo "Running configuration tests..."
--
-1.8.5.3
+2.0.0
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-qt5][PATCHv2 09/10] qtbase: Refresh patches to match with stable* branches on github.com/meta-qt5
2014-06-05 22:08 ` [meta-qt5][PATCHv2 01/10] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
` (6 preceding siblings ...)
2014-06-05 22:08 ` [meta-qt5][PATCHv2 08/10] qtbase: Refresh patches to match with b5.3.0* branches on github.com/meta-qt5 Martin Jansa
@ 2014-06-05 22:08 ` Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 10/10] maliit-framework-qt5: Add patch to fix build with qt-5.3, remove unused files Martin Jansa
8 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2014-06-05 22:08 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes-qt/qt5/nativesdk-qtbase_git.bb | 23 +++---
.../qtbase-git/0001-Add-linux-oe-g-platform.patch | 4 +-
...-allow-to-set-qt.conf-from-the-outside-u.patch} | 8 +--
...h => 0003-Add-external-hostbindir-option.patch} | 10 +--
...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 4 +-
...le-Fix-pkgconfig-and-libtool-replacements.patch | 81 ++++++++++++++++++++++
...fs-Print-the-chosen-config-in-debug-mode.patch} | 4 +-
...integration-Undefine-CursorShape-from-X..patch} | 4 +-
...ump-path-length-from-256-to-512-character.patch | 6 +-
...l-error-for-platforms-only-supporting-on.patch} | 4 +-
...0-Revert-Use-the-gcc-feature-in-simd.prf.patch} | 7 +-
...build-uic.patch => 0011-Always-build-uic.patch} | 4 +-
...build-it-in-configure-but-allow-to-build.patch} | 8 +--
...eserve-built-qmake-and-swap-with-native-.patch} | 7 +-
recipes-qt/qt5/qtbase-native_git.bb | 20 +++---
recipes-qt/qt5/qtbase_git.bb | 24 ++++---
16 files changed, 153 insertions(+), 65 deletions(-)
rename recipes-qt/qt5/qtbase-git/{0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch => 0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch} (87%)
rename recipes-qt/qt5/qtbase-git/{0002-Add-external-hostbindir-option.patch => 0003-Add-external-hostbindir-option.patch} (97%)
create mode 100644 recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
rename recipes-qt/qt5/qtbase-git/{0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch => 0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch} (93%)
rename recipes-qt/qt5/qtbase-git/{0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch => 0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch} (87%)
rename recipes-qt/qt5/qtbase-git/{0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch => 0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch} (94%)
rename recipes-qt/qt5/qtbase-git/{0001-Revert-Use-the-gcc-feature-in-simd.prf.patch => 0010-Revert-Use-the-gcc-feature-in-simd.prf.patch} (74%)
rename recipes-qt/qt5/qtbase-git/{0006-Always-build-uic.patch => 0011-Always-build-uic.patch} (88%)
rename recipes-qt/qt5/qtbase-git/{0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch => 0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch} (86%)
rename recipes-qt/qt5/qtbase-git/{0007-configure-preserve-built-qmake-and-swap-with-native-.patch => 0012-configure-preserve-built-qmake-and-swap-with-native-.patch} (80%)
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 7c45693..252cada 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -8,25 +8,28 @@ SRC_URI = "\
git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
"
-# common with -native
+# common with -native and -nativesdk
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
- file://0002-Add-external-hostbindir-option.patch \
- file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+ file://0003-Add-external-hostbindir-option.patch \
file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
- file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
- file://0001-Revert-Use-the-gcc-feature-in-simd.prf.patch \
+ file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
+ file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
+ file://0008-configure-bump-path-length-from-256-to-512-character.patch \
+ file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
+ file://0010-Revert-Use-the-gcc-feature-in-simd.prf.patch \
"
-# common with native version
+# common with -native version
SRC_URI += " \
- file://0006-Always-build-uic.patch \
+ file://0011-Always-build-uic.patch \
"
# specific for nativesdk version
SRC_URI += " \
- file://0007-configure-preserve-built-qmake-and-swap-with-native-.patch \
- file://0008-configure-bump-path-length-from-256-to-512-character.patch \
+ file://0012-configure-preserve-built-qmake-and-swap-with-native-.patch \
"
-SRCREV = "267ba8b63e0fbf02cde4d2709397ed0e12f34ee2"
+SRCREV = "80b6fbc2d9dfc753d6570e971aa4cf4f3420585c"
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
index 95841ce..eca6b36 100644
--- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
-From e70bd40730582e5e5531fca51a1574cb306c40d3 Mon Sep 17 00:00:00 2001
+From 9c7d71880c6ec5b07e3030b7c7a23e004d5c60a2 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 15 Apr 2013 04:29:32 +0200
-Subject: [PATCH 1/8] Add linux-oe-g++ platform
+Subject: [PATCH 01/12] Add linux-oe-g++ platform
* This qmake.conf unlike other platforms reads most variables from
shell environment, because it's easier for qt recipes to export
diff --git a/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
similarity index 87%
rename from recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
rename to recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index 4b4e47c..29f788e 100644
--- a/recipes-qt/qt5/qtbase-git/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,8 +1,8 @@
-From b76b34a03c3051cda5330c8ae9f5e2a26c5c4da6 Mon Sep 17 00:00:00 2001
+From ad884ab378939e685a3b00af03bb6875d9bdc1d5 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Wed, 26 Sep 2012 17:22:30 +0200
-Subject: [PATCH 3/8] qlibraryinfo: allow to set qt.conf from the outside using
- the environment
+Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside
+ using the environment
Allow to set a qt.conf from the outside using the environment. This allows
to inject new prefixes and other paths into qmake. This is needed when using
@@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 3686b17..89e13cf 100644
+index 6d25325..80e0f30 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -153,7 +153,10 @@ QLibrarySettings::QLibrarySettings()
diff --git a/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
similarity index 97%
rename from recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
rename to recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
index 81f1867..44d17ca 100644
--- a/recipes-qt/qt5/qtbase-git/0002-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
@@ -1,7 +1,7 @@
-From eaa4a4c13e65e29e2214a01b69b77b9c6f2ada05 Mon Sep 17 00:00:00 2001
+From b45d963702c139ea4f5b5ce572d046511a878d81 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 6 Apr 2013 13:15:07 +0200
-Subject: [PATCH 2/8] Add -external-hostbindir option
+Subject: [PATCH 03/12] Add -external-hostbindir option
* when cross-compiling it's sometimes useful to use existing tools from machine
(or in OpenEmbedded built with separate native recipe) when building for target
@@ -198,10 +198,10 @@ index 9bda70e..6e3605a 100644
_qt5_Core_check_file_exists(${imported_location})
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 6d25325..3686b17 100644
+index 80e0f30..89e13cf 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -333,7 +333,7 @@ QLibraryInfo::isDebugBuild()
+@@ -336,7 +336,7 @@ QLibraryInfo::isDebugBuild()
*/
static const struct {
@@ -210,7 +210,7 @@ index 6d25325..3686b17 100644
} qtConfEntries[] = {
{ "Prefix", "." },
{ "Documentation", "doc" }, // should be ${Data}/doc
-@@ -359,6 +359,7 @@ static const struct {
+@@ -362,6 +362,7 @@ static const struct {
{ "HostBinaries", "bin" },
{ "HostLibraries", "lib" },
{ "HostData", "." },
diff --git a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
index 1e5ffac..78fb3c6 100644
--- a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -1,7 +1,7 @@
-From 83205b1344e57e2cb0292cf1d276e40c7f45ca32 Mon Sep 17 00:00:00 2001
+From 8a14a69d5b0078554ed002e682c72e995b1e6320 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 27 Apr 2013 22:33:33 +0200
-Subject: [PATCH 4/8] configureapp: Prefix default LIBDIRS and INCDIRS with
+Subject: [PATCH 04/12] configureapp: Prefix default LIBDIRS and INCDIRS with
SYSROOT
Upstream-Status: Pending
diff --git a/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
new file mode 100644
index 0000000..29108cd
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
@@ -0,0 +1,81 @@
+From 1e87c127c5d268870c51894c955bf24cde83ff69 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Sat, 27 Apr 2013 23:15:37 +0200
+Subject: [PATCH 05/12] qt_module: Fix pkgconfig and libtool replacements
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* in situation like this:
+ QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
+ QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib
+ QT_INSTALL_LIBS/raw:/usr/lib
+ QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib
+
+ I don't want the replacement like this:
+ sed
+ -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g"
+ -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g"
+ "../../lib/pkgconfig/Qt5Core.pc"
+ >"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc"
+ because that way I'll end with -L/usr/lib in .pc file which is
+ cross-compile unfriendly, keeping ${libdir}/${includedir} works better
+ in my case
+
+* qt_module: Fix paths in .prl files
+* qmake does not prefix them with QT_SYSROOT when using them
+ so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
+ variable, which is unsafe for cross-compilation
+* writting QT_SYSROOT in .prl files is dangerous for sstate when
+ builds are in different directories, so we need
+ SSTATE_SCAN_FILES += "*.pri *.prl"
+ to make them relocateble
+
+* fix paths in packageconfig files
+ This reverts parts of:
+
+ enable path replacement in installed prl files on all platforms
+
+ Task-number: QTBUG-33794
+ Change-Id: Id0d38715673b8a1c0c034e9c15783eb255c4315b
+ Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
+
+Change-Id: Ie1c94b15f2a4e736b65b4d0924d99eb2a7d92a6c
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ mkspecs/features/qt_module.prf | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
+index 8bf4c92..9737f8c 100644
+--- a/mkspecs/features/qt_module.prf
++++ b/mkspecs/features/qt_module.prf
+@@ -188,10 +188,24 @@ unix|mingw {
+ QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module
+ QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
+
++ pkgconfig_include_replace.match = $$rplbase/include
++ pkgconfig_include_replace.replace = "\$$\\{includedir}"
++ pkgconfig_include_replace.CONFIG = path
++ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace
++
++ pkgconfig_lib_replace.match = $$rplbase/lib
++ pkgconfig_lib_replace.replace = "\$$\\{libdir}"
++ pkgconfig_lib_replace.CONFIG = path
++ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_lib_replace
++
+ unix {
+ CONFIG += create_libtool explicitlib
+ QMAKE_LIBTOOL_LIBDIR = $$qt_libdir
+ QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace
++ lafile_replace.match = "-L$$[QT_INSTALL_LIBS/raw]"
++ lafile_replace.replace = ""
++ lafile_replace.CONFIG = path
++ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace
+ }
+ }
+
+--
+2.0.0
+
diff --git a/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
similarity index 93%
rename from recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
rename to recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
index 213a9c3..0e3bc99 100644
--- a/recipes-qt/qt5/qtbase-git/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
+++ b/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
@@ -1,7 +1,7 @@
-From 22775e5f0b1097964062fbcf1805a841f971de34 Mon Sep 17 00:00:00 2001
+From ca212fd10a95b2c694f3c89c3f22a2b0ae185198 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 21 Apr 2014 19:22:04 +0200
-Subject: [PATCH 5/8] Revert "eglfs: Print the chosen config in debug mode"
+Subject: [PATCH 06/12] Revert "eglfs: Print the chosen config in debug mode"
This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e.
---
diff --git a/recipes-qt/qt5/qtbase-git/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
similarity index 87%
rename from recipes-qt/qt5/qtbase-git/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
rename to recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
index 2f4d80c..1f029a2 100644
--- a/recipes-qt/qt5/qtbase-git/0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch
+++ b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -1,7 +1,7 @@
-From 959b2fb8d8eb5e755e3d9d3d3031b996f96fb23b Mon Sep 17 00:00:00 2001
+From 3d61189d1706d3367eada4e7db6f2c6c167130ce Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 19 Mar 2014 18:32:28 +0100
-Subject: [PATCH 8/8] qeglplatformintegration: Undefine CursorShape from X.h
+Subject: [PATCH 07/12] qeglplatformintegration: Undefine CursorShape from X.h
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
diff --git a/recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch
index e5a3890..b1c4690 100644
--- a/recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,7 +1,7 @@
-From 3eabdee39cad37a4ce451486fce20680f169a0f1 Mon Sep 17 00:00:00 2001
+From 107fe67947ced65315550e6a7795be24efaab371 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Mon, 11 Nov 2013 20:27:30 -0500
-Subject: [PATCH 8/8] configure: bump path length from 256 to 512 characters
+Subject: [PATCH 08/12] configure: bump path length from 256 to 512 characters
Increase the path length that gets hardcoded into generated config.cpp file
from 256 to 512 characters, as nativesdk path can be quite long.
@@ -12,7 +12,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
-index b7aac15..c51f785 100755
+index 48d5119..3c0347a 100755
--- a/configure
+++ b/configure
@@ -3573,7 +3573,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
diff --git a/recipes-qt/qt5/qtbase-git/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
similarity index 94%
rename from recipes-qt/qt5/qtbase-git/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
rename to recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
index f8a789c..cbd0bcd 100644
--- a/recipes-qt/qt5/qtbase-git/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
+++ b/recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
@@ -1,7 +1,7 @@
-From cc8bd33740ee16b29e0801dbc2228314ef3cef2f Mon Sep 17 00:00:00 2001
+From b8f2fdcd7683058554b5d76b270c5f4bb3d0b91a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 5 Feb 2014 18:35:08 +0100
-Subject: [PATCH 7/8] eglfs: fix egl error for platforms only supporting one
+Subject: [PATCH 09/12] eglfs: fix egl error for platforms only supporting one
window/surface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
diff --git a/recipes-qt/qt5/qtbase-git/0001-Revert-Use-the-gcc-feature-in-simd.prf.patch b/recipes-qt/qt5/qtbase-git/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch
similarity index 74%
rename from recipes-qt/qt5/qtbase-git/0001-Revert-Use-the-gcc-feature-in-simd.prf.patch
rename to recipes-qt/qt5/qtbase-git/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch
index 88f5c12..da05f28 100644
--- a/recipes-qt/qt5/qtbase-git/0001-Revert-Use-the-gcc-feature-in-simd.prf.patch
+++ b/recipes-qt/qt5/qtbase-git/0010-Revert-Use-the-gcc-feature-in-simd.prf.patch
@@ -1,10 +1,7 @@
-From 9d33599f12787f85a19e8147604f919ac40c02c1 Mon Sep 17 00:00:00 2001
+From 8d8db9db8518289f4c1856dd3062c2e324c5c9be Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 4 Jun 2014 15:26:11 +0200
-Subject: [PATCH] Revert "Use the "gcc" feature in simd.prf"
-
-It's causing linker issues, see my comment in:
-https://bugreports.qt-project.org/browse/QTBUG-38544
+Subject: [PATCH 10/12] Revert "Use the "gcc" feature in simd.prf"
This reverts commit 3b00cc480400d47c59c29d3507c7fcdc9be2a489.
---
diff --git a/recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch
similarity index 88%
rename from recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch
rename to recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch
index f425c3e..a1af18e 100644
--- a/recipes-qt/qt5/qtbase-git/0006-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch
@@ -1,7 +1,7 @@
-From dd679f743291a924bed500a866eb05fab71c9978 Mon Sep 17 00:00:00 2001
+From 271db04ebfbaf67e2e8c30ff050510c5a42acfa4 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 16 Nov 2013 00:32:30 +0100
-Subject: [PATCH 6/8] Always build uic
+Subject: [PATCH 11/12] Always build uic
Even if we are not building gui or widgets. This tool is needed later
as a native tool when compiling the target.
diff --git a/recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
similarity index 86%
rename from recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
rename to recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
index 6d79acb..820fb21 100644
--- a/recipes-qt/qt5/qtbase-git/0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
+++ b/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
@@ -1,8 +1,8 @@
-From d8e725cb2c25a443d888fe2652f9039e79ae75ac Mon Sep 17 00:00:00 2001
+From ac507c953112630d7e929be35586e97396b76327 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Mon, 29 Oct 2012 20:07:49 -0700
-Subject: [PATCH 6/8] qmake: don't build it in configure, but allow to build it
- separately
+Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build
+ it separately
* it is already built in qtbase-native, so we don't need it in configure
* allow building a separate qmake for the target
@@ -20,7 +20,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
-index 48d5119..2a42c08 100755
+index 3c0347a..a75ca11 100755
--- a/configure
+++ b/configure
@@ -3675,7 +3675,7 @@ setBootstrapEvalVariable()
diff --git a/recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch
similarity index 80%
rename from recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch
rename to recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch
index 79ac5e8..81b05f3 100644
--- a/recipes-qt/qt5/qtbase-git/0007-configure-preserve-built-qmake-and-swap-with-native-.patch
+++ b/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch
@@ -1,7 +1,8 @@
-From 3db5991e607a82403272b0ea821fc84e3c8b6d2a Mon Sep 17 00:00:00 2001
+From 11bd34bfe629767ec32a36593386ef0655e86f24 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denys@ti.com>
Date: Mon, 11 Nov 2013 20:22:34 -0500
-Subject: [PATCH 7/8] configure: preserve built qmake and swap with native one
+Subject: [PATCH 12/12] configure: preserve built qmake and swap with native
+ one
Let configure script build the real qmake, but right after it's built, swap
it with a native qmake for further internal use, preserving the real one.
@@ -12,7 +13,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
1 file changed, 2 insertions(+)
diff --git a/configure b/configure
-index 48d5119..b7aac15 100755
+index 3c0347a..c51f785 100755
--- a/configure
+++ b/configure
@@ -3825,6 +3825,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index e10748f..7965292 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -5,19 +5,23 @@ SRC_URI = "\
git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
"
-# common with -native
+# common with -native and -nativesdk
SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
- file://0002-Add-external-hostbindir-option.patch \
- file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+ file://0003-Add-external-hostbindir-option.patch \
file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
- file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
- file://0001-Revert-Use-the-gcc-feature-in-simd.prf.patch \
+ file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
+ file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
+ file://0008-configure-bump-path-length-from-256-to-512-character.patch \
+ file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
+ file://0010-Revert-Use-the-gcc-feature-in-simd.prf.patch \
"
-# specific for native version
+# common with -nativesdk version
SRC_URI += " \
- file://0006-Always-build-uic.patch \
+ file://0011-Always-build-uic.patch \
"
do_install_append() {
@@ -26,4 +30,4 @@ do_install_append() {
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
}
-SRCREV = "267ba8b63e0fbf02cde4d2709397ed0e12f34ee2"
+SRCREV = "80b6fbc2d9dfc753d6570e971aa4cf4f3420585c"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 4f019be..037a4f6 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -5,21 +5,23 @@ SRC_URI = "\
git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
"
-# common with -native
-SRC_URI += "\
+# common with -native and -nativesdk
+SRC_URI += "\
file://0001-Add-linux-oe-g-platform.patch \
- file://0002-Add-external-hostbindir-option.patch \
- file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+ file://0003-Add-external-hostbindir-option.patch \
file://0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
- file://0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
- file://0001-Revert-Use-the-gcc-feature-in-simd.prf.patch \
+ file://0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
+ file://0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch \
+ file://0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
+ file://0008-configure-bump-path-length-from-256-to-512-character.patch \
+ file://0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
+ file://0010-Revert-Use-the-gcc-feature-in-simd.prf.patch \
"
-
+
# target specific
SRC_URI += "\
- file://0006-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
- file://0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \
- file://0008-qeglplatformintegration-Undefine-CursorShape-from-X..patch \
+ file://0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
"
-SRCREV = "267ba8b63e0fbf02cde4d2709397ed0e12f34ee2"
+SRCREV = "80b6fbc2d9dfc753d6570e971aa4cf4f3420585c"
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [meta-qt5][PATCHv2 10/10] maliit-framework-qt5: Add patch to fix build with qt-5.3, remove unused files
2014-06-05 22:08 ` [meta-qt5][PATCHv2 01/10] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
` (7 preceding siblings ...)
2014-06-05 22:08 ` [meta-qt5][PATCHv2 09/10] qtbase: Refresh patches to match with stable* " Martin Jansa
@ 2014-06-05 22:08 ` Martin Jansa
8 siblings, 0 replies; 16+ messages in thread
From: Martin Jansa @ 2014-06-05 22:08 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
...LUGIN_PATH-to-allow-openembedded-to-build.patch | 34 -----------------
...k-to-libmaliit-1-0-in-inputcontext-plugin.patch | 23 ------------
.../maliit/maliit-framework-qt5/qt5.3-fix.patch | 43 ++++++++++++++++++++++
recipes-qt/maliit/maliit-framework-qt5_git.bb | 1 +
4 files changed, 44 insertions(+), 57 deletions(-)
delete mode 100644 recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch
delete mode 100644 recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch
create mode 100644 recipes-qt/maliit/maliit-framework-qt5/qt5.3-fix.patch
diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch
deleted file mode 100644
index 830e6de..0000000
--- a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-QT_IM_PLUGIN_PATH-to-allow-openembedded-to-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fb6acbd2af9ed288c1c4f4200fc73d8d9955486a Mon Sep 17 00:00:00 2001
-From: Samuel Stirtzel <s.stirtzel@googlemail.com>
-Date: Wed, 1 Aug 2012 13:33:10 +0200
-Subject: [PATCH] Fix QT_IM_PLUGIN_PATH to allow openembedded to build Maliit
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
----
- input-context/input-context.pri | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/input-context/input-context.pri b/input-context/input-context.pri
-index d94e6a3..d460e70 100644
---- a/input-context/input-context.pri
-+++ b/input-context/input-context.pri
-@@ -25,8 +25,10 @@ for(OPTION,$$list($$lower($$COV_OPTION))){
-
- QMAKE_CLEAN += $$OBJECTS_DIR/*.gcno $$OBJECTS_DIR/*.gcda
-
--QT_IM_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/inputmethods
--QT_PREFIX = $$[QT_INSTALL_PREFIX]
--local-install {
-- QT_IM_PLUGIN_PATH = $$replace(QT_IM_PLUGIN_PATH, $$QT_PREFIX, $$PREFIX)
-+isEmpty(QT_IM_PLUGIN_PATH) {
-+ QT_IM_PLUGIN_PATH = $$[QT_INSTALL_PLUGINS]/inputmethods
-+ QT_PREFIX = $$[QT_INSTALL_PREFIX]
-+ local-install {
-+ QT_IM_PLUGIN_PATH = $$replace(QT_IM_PLUGIN_PATH, $$QT_PREFIX, $$PREFIX)
-+ }
- }
---
-1.7.9.5
-
diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch
deleted file mode 100644
index c2291c6..0000000
--- a/recipes-qt/maliit/maliit-framework-qt5/0001-Link-to-libmaliit-1-0-in-inputcontext-plugin.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From cc33efdedbec9e9a55e9a0c6756516fd84d42e53 Mon Sep 17 00:00:00 2001
-From: Samuel Stirtzel <s.stirtzel@googlemail.com>
-Date: Fri, 1 Mar 2013 11:31:41 +0100
-Subject: [PATCH] Link to libmaliit-1,0 in inputcontext plugin
-
-Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com>
----
- .../input-context-plugin/input-context-plugin.pro | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/input-context/input-context-plugin/input-context-plugin.pro b/input-context/input-context-plugin/input-context-plugin.pro
-index eefbe93..296e2fa 100644
---- a/input-context/input-context-plugin/input-context-plugin.pro
-+++ b/input-context/input-context-plugin/input-context-plugin.pro
-@@ -15,3 +15,5 @@ CONFIG += plugin
-
- INSTALLS += target
- target.path += $$QT_IM_PLUGIN_PATH
-+
-+LIBS += -L../../lib -l"maliit-1.0"
---
-1.7.9.5
-
diff --git a/recipes-qt/maliit/maliit-framework-qt5/qt5.3-fix.patch b/recipes-qt/maliit/maliit-framework-qt5/qt5.3-fix.patch
new file mode 100644
index 0000000..4f8890f
--- /dev/null
+++ b/recipes-qt/maliit/maliit-framework-qt5/qt5.3-fix.patch
@@ -0,0 +1,43 @@
+Fix compatibility with qt-5.3
+
+https://bugs.launchpad.net/ubuntu/+source/maliit-framework/+bug/1323962
+
+Upstream-Status: Pending
+
+diff --git a/src/maliit/plugins/updateevent.cpp b/src/maliit/plugins/updateevent.cpp
+index 06a5228..85b7166 100644
+--- a/src/maliit/plugins/updateevent.cpp
++++ b/src/maliit/plugins/updateevent.cpp
+@@ -38,7 +38,7 @@ bool MImUpdateEventPrivate::isFlagSet(Qt::InputMethodHint hint,
+ bool result = false;
+
+ if (update.contains(Maliit::Internal::inputMethodHints)) {
+- const Qt::InputMethodHints hints(static_cast<Qt::InputMethodHints>(
++ const Qt::InputMethodHints hints(static_cast<int>(
+ update.value(Maliit::Internal::inputMethodHints).toLongLong()));
+
+ result = (hints & hint);
+@@ -89,8 +89,8 @@ QStringList MImUpdateEvent::propertiesChanged() const
+ Qt::InputMethodHints MImUpdateEvent::hints(bool *changed) const
+ {
+ Q_D(const MImUpdateEvent);
+- return static_cast<Qt::InputMethodHints>(
+- d->extractProperty(Maliit::Internal::inputMethodHints, changed).toLongLong());
++ return Qt::InputMethodHints(static_cast<int>(
++ d->extractProperty(Maliit::Internal::inputMethodHints, changed).toLongLong()));
+ }
+
+ bool MImUpdateEvent::westernNumericInputEnforced(bool *changed) const
+diff --git a/src/mimpluginmanager.cpp b/src/mimpluginmanager.cpp
+index 02788a4..3c5c99a 100644
+--- a/src/mimpluginmanager.cpp
++++ b/src/mimpluginmanager.cpp
+@@ -1493,7 +1493,7 @@ void MIMPluginManager::handleWidgetStateChanged(unsigned int clientId,
+ }
+ }
+
+- const Qt::InputMethodHints lastHints = static_cast<Qt::InputMethodHints>(newState.value(Maliit::Internal::inputMethodHints).toLongLong());
++ const Qt::InputMethodHints lastHints(static_cast<int>(newState.value(Maliit::Internal::inputMethodHints).toLongLong()));
+ MImUpdateEvent ev(newState, changedProperties, lastHints);
+
+ // general notification last
diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb
index 633bf6e..3ef56ec 100644
--- a/recipes-qt/maliit/maliit-framework-qt5_git.bb
+++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb
@@ -9,6 +9,7 @@ inherit qmake5
SRC_URI = "git://github.com/maliit/framework.git;branch=master \
file://0001-Fix-MALIIT_INSTALL_PRF-to-allow-the-build-with-opene.patch \
file://maliit-server.desktop \
+ file://qt5.3-fix.patch \
"
SRCREV = "dbc0403f329d7f6ce2f5a09e6ff5adbd2548a8c9"
--
2.0.0
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2014-06-05 22:08 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-04 9:56 [meta-qt5][PATCH 1/5] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
2014-06-04 9:56 ` [meta-qt5][PATCH 2/5] qt5: upgrade from 5.2.1 to 5.3.0 Martin Jansa
2014-06-04 9:56 ` [meta-qt5][PATCH 3/5] qtenginio, qtwebsockets: Add 2 new modules and include them in packagegroup-qt5-toolchain-target Martin Jansa
2014-06-04 23:45 ` Otavio Salvador
2014-06-04 9:56 ` [meta-qt5][PATCH 4/5] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
2014-06-04 9:56 ` [meta-qt5][PATCH 5/5] recipes-git: Use LIC_FILES_CHKSUM from .inc files Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 01/10] recipes-git: Upgrade from latest origin/release to latest origin/stable Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 02/10] qt5: upgrade from 5.2.1 to 5.3.0 Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 03/10] qtwebsockets: Add new module Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 04/10] qtenginio: " Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 05/10] packagegroup-qt5-toolchain-target: Add qtenginio, qtwebsockets Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 06/10] recipes-git: Upgrade to latest origin/stable Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 07/10] recipes-git: Use LIC_FILES_CHKSUM from .inc files Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 08/10] qtbase: Refresh patches to match with b5.3.0* branches on github.com/meta-qt5 Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 09/10] qtbase: Refresh patches to match with stable* " Martin Jansa
2014-06-05 22:08 ` [meta-qt5][PATCHv2 10/10] maliit-framework-qt5: Add patch to fix build with qt-5.3, remove unused files Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.