aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-05-28 11:48:09 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-28 15:25:25 +0200
commitf8b065ea1174dd1fa7d93359f6826bfc9d23174c (patch)
tree2da2a4be9b5aff64e54a818a19a8939266eed05f
parentf52b59a5cc9ddfb0ede39194e284c858bfd0cbd8 (diff)
qt5: drop 5.0.0 and 5.0.1 versions
* maintaining 4 different versions requires a lot more testing of changes in .inc files and we have only one version of modules without release (only one _git.bb) and it's impossible to find SRCREV which would be compatible with all 4 versions. * 0005-AddSynchoronization-qimagereader.patch was already backported to 5.0.2 in upstream * 0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch was already applied in 5.0.2 * 5.0.2 is now default version (based on DEFAULT_PREFERENCE and in qt5-versions.inc Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--conf/distro/include/qt5-versions.inc4
-rw-r--r--recipes-qt/qt5/qt5-5.0.0.inc18
-rw-r--r--recipes-qt/qt5/qt5-5.0.1.inc18
-rw-r--r--recipes-qt/qt5/qt5-5.0.2.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_5.0.0.bb7
-rw-r--r--recipes-qt/qt5/qtbase-native_5.0.1.bb7
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch304
-rw-r--r--recipes-qt/qt5/qtbase/0001-Always-build-uic.patch31
-rw-r--r--recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch36
-rw-r--r--recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch221
-rw-r--r--recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch50
-rw-r--r--recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch37
-rw-r--r--recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch30
-rw-r--r--recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch29
-rw-r--r--recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch29
-rw-r--r--recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch68
-rw-r--r--recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch62
-rw-r--r--recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch46
-rw-r--r--recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch44
-rw-r--r--recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch37
-rw-r--r--recipes-qt/qt5/qtbase_5.0.0.bb10
-rw-r--r--recipes-qt/qt5/qtbase_5.0.1.bb9
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch39
-rw-r--r--recipes-qt/qt5/qtdeclarative_5.0.0.bb17
-rw-r--r--recipes-qt/qt5/qtdeclarative_5.0.1.bb13
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb14
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb13
-rw-r--r--recipes-qt/qt5/qtimageformats_5.0.0.bb13
-rw-r--r--recipes-qt/qt5/qtimageformats_5.0.1.bb13
-rw-r--r--recipes-qt/qt5/qtjsbackend-native_5.0.0.bb12
-rw-r--r--recipes-qt/qt5/qtjsbackend-native_5.0.1.bb12
-rw-r--r--recipes-qt/qt5/qtjsbackend_5.0.0.bb12
-rw-r--r--recipes-qt/qt5/qtjsbackend_5.0.1.bb12
-rw-r--r--recipes-qt/qt5/qtmultimedia_5.0.0.bb13
-rw-r--r--recipes-qt/qt5/qtmultimedia_5.0.1.bb13
-rw-r--r--recipes-qt/qt5/qtquick1_5.0.0.bb13
-rw-r--r--recipes-qt/qt5/qtquick1_5.0.1.bb13
-rw-r--r--recipes-qt/qt5/qtscript_5.0.0.bb13
-rw-r--r--recipes-qt/qt5/qtscript_5.0.1.bb13
-rw-r--r--recipes-qt/qt5/qtsvg_5.0.0.bb13
-rw-r--r--recipes-qt/qt5/qtsvg_5.0.1.bb13
-rw-r--r--recipes-qt/qt5/qtwebkit_5.0.0.bb8
-rw-r--r--recipes-qt/qt5/qtwebkit_5.0.1.bb7
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_5.0.0.bb13
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_5.0.1.bb13
45 files changed, 2 insertions, 1412 deletions
diff --git a/conf/distro/include/qt5-versions.inc b/conf/distro/include/qt5-versions.inc
index 63e1abee..01a5a25a 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.0.0", "5.0.1", "5.0.2", "5.0.2+git%"
+# possible values now "5.0.2", "5.0.2+git%"
-QT5_VERSION ?= "5.0.1"
+QT5_VERSION ?= "5.0.2"
PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}"
PREFERRED_VERSION_qtbase = "${QT5_VERSION}"
diff --git a/recipes-qt/qt5/qt5-5.0.0.inc b/recipes-qt/qt5/qt5-5.0.0.inc
deleted file mode 100644
index 85811c0f..00000000
--- a/recipes-qt/qt5/qt5-5.0.0.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (C) 2012 O.S. Systems Software LTDA.
-
-QT_VERSION ?= "${PV}"
-
-# it's different for RC versions
-QT_VERSION_DIR ?= "${QT_VERSION}"
-
-SRC_URI += " \
- http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
-"
-
-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=02356821480f1d3d534b21e0343265b5 \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qt5-5.0.1.inc b/recipes-qt/qt5/qt5-5.0.1.inc
deleted file mode 100644
index 85811c0f..00000000
--- a/recipes-qt/qt5/qt5-5.0.1.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (C) 2012 O.S. Systems Software LTDA.
-
-QT_VERSION ?= "${PV}"
-
-# it's different for RC versions
-QT_VERSION_DIR ?= "${QT_VERSION}"
-
-SRC_URI += " \
- http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules_tar/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
-"
-
-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=02356821480f1d3d534b21e0343265b5 \
- file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
- file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
- file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qt5-5.0.2.inc b/recipes-qt/qt5/qt5-5.0.2.inc
index f99809ec..e2a56e5c 100644
--- a/recipes-qt/qt5/qt5-5.0.2.inc
+++ b/recipes-qt/qt5/qt5-5.0.2.inc
@@ -6,8 +6,6 @@ QT_VERSION ?= "${PV}"
# it's different for RC versions
QT_VERSION_DIR ?= "${QT_VERSION}"
-DEFAULT_PREFERENCE = "-1"
-
SRC_URI += " \
http://releases.qt-project.org/qt5/${QT_VERSION_DIR}/submodules/${QT_MODULE}-opensource-src-${QT_VERSION}.tar.xz \
"
diff --git a/recipes-qt/qt5/qtbase-native_5.0.0.bb b/recipes-qt/qt5/qtbase-native_5.0.0.bb
deleted file mode 100644
index f791b600..00000000
--- a/recipes-qt/qt5/qtbase-native_5.0.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e"
-SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500"
diff --git a/recipes-qt/qt5/qtbase-native_5.0.1.bb b/recipes-qt/qt5/qtbase-native_5.0.1.bb
deleted file mode 100644
index 2dce2c1d..00000000
--- a/recipes-qt/qt5/qtbase-native_5.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df"
-SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8"
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
deleted file mode 100644
index f4645f69..00000000
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ /dev/null
@@ -1,304 +0,0 @@
-From 4edde46f33aacc24fffa021adcc7e0d68ba414a3 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/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
- *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
-
-* 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: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 54 ++++++++++++++++---
- mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++
- mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
- 3 files changed, 187 insertions(+), 7 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 89246c8..0ab8eee 100755
---- a/configure
-+++ b/configure
-@@ -216,6 +216,16 @@ getQMakeConf()
- getQMakeConf3 "$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
-@@ -224,6 +234,16 @@ getXQMakeConf()
- getQMakeConf3 "$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
-@@ -707,6 +727,18 @@ fi
- # initalize variables
- #-------------------------------------------------------------------------------
-
-+# 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}"
-+ cmd=`echo \
-+'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"
- for varname in $SYSTEM_VARIABLES; do
- qmakevarname="${varname}"
-@@ -2623,7 +2655,7 @@ else
- CFG_FRAMEWORK=no
- fi
-
--QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX`
-+QMAKE_CONF_COMPILER=`getXQEvalMakeConf QMAKE_CXX`
-
- TEST_COMPILER=$QMAKE_CONF_COMPILER
- if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
-@@ -2632,7 +2664,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
-@@ -3587,6 +3619,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. Please wait..."
-@@ -3625,11 +3665,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 [ $QT_EDITION = "QT_EDITION_OPENSOURCE" ]; then
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION"
-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.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch
deleted file mode 100644
index 3f2e3fd9..00000000
--- a/recipes-qt/qt5/qtbase/0001-Always-build-uic.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1092de02d1ac256a8c56fb5b5e590a4df8188acb Mon Sep 17 00:00:00 2001
-From: Mikko Levonmaa <mikko.levonmaa@palm.com>
-Date: Tue, 27 Nov 2012 12:46:44 -0800
-Subject: [PATCH] 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.
-
-Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com>
----
- src/tools/tools.pro | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/tools/tools.pro b/src/tools/tools.pro
-index c67d6bf..b6f3b39 100644
---- a/src/tools/tools.pro
-+++ b/src/tools/tools.pro
-@@ -1,8 +1,8 @@
- TEMPLATE = subdirs
-
--TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc
-+TOOLS_SUBDIRS = src_tools_bootstrap src_tools_moc src_tools_rcc src_tools_qdoc src_tools_uic
- contains(QT_CONFIG, dbus): TOOLS_SUBDIRS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml
--!contains(QT_CONFIG, no-widgets): TOOLS_SUBDIRS += src_tools_uic
-+
- # Set subdir and respective target name
- src_tools_bootstrap.subdir = $$PWD/bootstrap
- src_tools_bootstrap.target = sub-tools-bootstrap
---
-1.7.4.1
-
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
deleted file mode 100644
index fc8a481e..00000000
--- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a836731e94223d49ef05fdabe7905dd1b25c647c 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/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
-the same qmake binary to build qt/x11 and qt/embedded
-
-Upstream-Status: Pending
-
-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 a8dc086..8138fff 100644
---- a/src/corelib/global/qlibraryinfo.cpp
-+++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -138,7 +138,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.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
deleted file mode 100644
index 8c100bc5..00000000
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From 3b0a595bbe9d5bce898fc5a84c9bb39c976b9f7d 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/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
-
-* this way we can skip bootstraping tools we already have
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 15 ++++++++++++++-
- mkspecs/features/qt_functions.prf | 5 ++++-
- mkspecs/features/qt_tool.prf | 2 +-
- qmake/property.cpp | 1 +
- qtbase.pro | 15 +++++++++++----
- src/corelib/global/qlibraryinfo.cpp | 3 ++-
- src/corelib/global/qlibraryinfo.h | 1 +
- tools/configure/configureapp.cpp | 8 ++++++++
- 8 files changed, 42 insertions(+), 8 deletions(-)
-
-diff --git a/configure b/configure
-index 0ab8eee..50f1ef2 100755
---- a/configure
-+++ b/configure
-@@ -928,6 +928,7 @@ CFG_GCC_SYSROOT="yes"
- QT_HOST_PREFIX=
- QT_HOST_BINS=
- QT_HOST_DATA=
-+QT_EXTERNAL_HOST_BINS=
-
- #flags for SQL drivers
- QT_CFLAGS_PSQL=
-@@ -1026,7 +1027,7 @@ while [ "$#" -gt 0 ]; do
- VAL=no
- ;;
- #Qt style options that pass an argument
-- -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig)
-+ -prefix|-docdir|-headerdir|-plugindir|-importdir|-qmldir|-archdatadir|-datadir|-libdir|-bindir|-libexecdir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-device|-device-option|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-hostdatadir|-hostbindir|-qpa|-qconfig|-external-hostbindir)
- VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
- shift
- VAL="$1"
-@@ -1223,6 +1224,9 @@ while [ "$#" -gt 0 ]; do
- hostbindir)
- QT_HOST_BINS="$VAL"
- ;;
-+ external-hostbindir)
-+ QT_EXTERNAL_HOST_BINS="$VAL"
-+ ;;
- pkg-config)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_PKGCONFIG="$VAL"
-@@ -2921,6 +2925,11 @@ else
- QT_HOST_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_HOST_DATA"`
- fi
-
-+# 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
-+
- #-------------------------------------------------------------------------------
- # help - interactive parts of the script _after_ this section please
- #-------------------------------------------------------------------------------
-@@ -3087,6 +3096,9 @@ 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
-@@ -3558,6 +3570,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
- "qt_hpfxpath=$QT_HOST_PREFIX",
- "qt_hbinpath=$QT_HOST_BINS",
- "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 389f241..e249960 100644
---- a/mkspecs/features/qt_functions.prf
-+++ b/mkspecs/features/qt_functions.prf
-@@ -194,7 +194,10 @@ defineTest(qtAddModules) {
- defineTest(qtPrepareTool) {
- $$1 = $$eval(QT_TOOL.$${2}.command)
- isEmpty($$1) {
-- $$1 = $$[QT_HOST_BINS/get]/$$2
-+ $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
-+ isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
-+ $$1 = $$[QT_HOST_BINS/get]/$$2
-+ }
- contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) {
- exists($$eval($$1).bat) {
- $$1 = $$eval($$1).bat
-diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
-index 16db6c7..5518933 100644
---- a/mkspecs/features/qt_tool.prf
-+++ b/mkspecs/features/qt_tool.prf
-@@ -31,7 +31,7 @@ load(qt_targets)
-
- # If we are doing a prefix build, create a "module" pri which enables
- # qtPrepareTool() to work with the non-installed build.
--!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache) {
-+!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
-
- isEmpty(MODULE):MODULE = $$TARGET
-
-diff --git a/qmake/property.cpp b/qmake/property.cpp
-index bbd4734..dca0c58 100644
---- a/qmake/property.cpp
-+++ b/qmake/property.cpp
-@@ -74,6 +74,7 @@ static const struct {
- { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true },
- { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true },
- { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, 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 e66d9fb..a6ae763 100644
---- a/qtbase.pro
-+++ b/qtbase.pro
-@@ -68,17 +68,24 @@ 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
--equals(QMAKE_HOST.os, Windows):syncqt.files += $$PWD/bin/syncqt.bat
-+!isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
-+ syncqt.files = $$[QT_EXTERNAL_HOST_BINS]/bin/syncqt
-+}
-+equals(QMAKE_HOST.os, Windows) {
-+ syncqt.files = $${syncqt.files}.bat
-+}
- INSTALLS += syncqt
-
- #mkspecs
-diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 8138fff..301643f 100644
---- a/src/corelib/global/qlibraryinfo.cpp
-+++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild()
- */
-
- static const struct {
-- char key[19], value[13];
-+ char key[21], value[13];
- } qtConfEntries[] = {
- { "Prefix", "." },
- { "Documentation", "doc" }, // should be ${Data}/doc
-@@ -291,6 +291,7 @@ static const struct {
- { "HostPrefix", "" },
- { "HostBinaries", "bin" },
- { "HostData", "." },
-+ { "ExternalHostBinaries", "" },
- { "TargetSpec", "" },
- { "HostSpec", "" },
- #endif
-diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
-index a574b4b..1535d20 100644
---- a/src/corelib/global/qlibraryinfo.h
-+++ b/src/corelib/global/qlibraryinfo.h
-@@ -85,6 +85,7 @@ public:
- HostPrefixPath,
- HostBinariesPath,
- HostDataPath,
-+ ExternalHostBinariesPath,
- TargetSpecPath,
- HostSpecPath,
- LastHostPath = HostSpecPath,
-diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
-index 126643e..0e01ab5 100644
---- a/tools/configure/configureapp.cpp
-+++ b/tools/configure/configureapp.cpp
-@@ -1143,6 +1143,13 @@ void Configure::parseCmdLine()
- dictionary[ "QT_HOST_DATA" ] = 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)
-@@ -3627,6 +3634,7 @@ void Configure::generateQConfigCpp()
- << " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl
- << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << 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.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch
deleted file mode 100644
index d39130c1..00000000
--- a/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ff72f8350e8b2ded813163150a7d1874061ed589 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 17 Apr 2013 18:06:25 +0200
-Subject: [PATCH 04/12] 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].
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- mkspecs/features/qt_functions.prf | 6 +++++-
- mkspecs/features/qt_tool.prf | 2 +-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index e249960..105ba4c 100644
---- a/mkspecs/features/qt_functions.prf
-+++ b/mkspecs/features/qt_functions.prf
-@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) {
- $$1 = $$eval(QT_TOOL.$${2}.command)
- isEmpty($$1) {
- $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2
-- isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
-+ # 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/get]/$$2
- }
- contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) {
-diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
-index 5518933..b0e4f28 100644
---- a/mkspecs/features/qt_tool.prf
-+++ b/mkspecs/features/qt_tool.prf
-@@ -31,7 +31,7 @@ load(qt_targets)
-
- # If we are doing a prefix build, create a "module" pri which enables
- # qtPrepareTool() to work with the non-installed build.
--!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):isEmpty($$[QT_EXTERNAL_HOST_BINS]) {
-+!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):!exists($$[QT_EXTERNAL_HOST_BINS]) {
-
- isEmpty(MODULE):MODULE = $$TARGET
-
---
-1.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch b/recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch
deleted file mode 100644
index a16731a9..00000000
--- a/recipes-qt/qt5/qtbase/0005-AddSynchoronization-qimagereader.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit e28c03cb829c229209090d7939a9aba1af1fdea9
-Author: aavit <eirik.aavitsland@digia.com>
-Date: Tue Feb 19 18:11:16 2013 +0100
-
- Fix reentrancy problem in image reading
-
- There were race conditions when accessing the plugin factory and
- the image reader plugins from different threads; ref QTBUG-29281.
- Added a mutex lock to avoid.
-
- Change-Id: Ic1a3b6cbaf5603f1bcf7025b58247a9a3f6d08a9
- Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
-
-Upstream-Status: Backport (from 5.1.0)
-
-diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
-index 5eaf7bb..6847786 100644
---- a/src/gui/image/qimagereader.cpp
-+++ b/src/gui/image/qimagereader.cpp
-@@ -133,6 +133,7 @@
- // factory loader
- #include <qcoreapplication.h>
- #include <private/qfactoryloader_p.h>
-+#include <QMutexLocker>
-
- // image handlers
- #include <private/qbmphandler_p.h>
-@@ -232,6 +233,9 @@ static QImageIOHandler *createReadHandlerHelper(QIODevice *device,
- QByteArray suffix;
-
- #ifndef QT_NO_IMAGEFORMATPLUGIN
-+ static QMutex mutex;
-+ QMutexLocker locker(&mutex);
-+
- typedef QMultiMap<int, QString> PluginKeyMap;
-
- // check if we have plugins that support the image format
diff --git a/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch
deleted file mode 100644
index 319aae6f..00000000
--- a/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 240fb45541c06103e8a930beeb5ee59a15b529bf 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/12] qmake is already built in qtbase-native
-
-Ported from OE by: Yu Ke <ke.yu@intel.com>
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 50f1ef2..8710c28 100755
---- a/configure
-+++ b/configure
-@@ -3641,7 +3641,7 @@ setBootstrapEvalVariable()
-
-
- # build qmake
--if true; then ###[ '!' -f "$outpath/bin/qmake" ];
-+if false; then ###[ '!' -f "$outpath/bin/qmake" ];
- echo "Creating qmake. Please wait..."
-
- mkdir -p "$outpath/qmake" || exit
---
-1.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch
deleted file mode 100644
index c639c172..00000000
--- a/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 892351a55c3f6a033a1823e104315cb0f03b454d 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 06/12] Allow building a separate qmake for the target
-
-Upstream-Status: Inappropriate [config]
-
-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>
----
- qmake/qmake.pro | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/qmake/qmake.pro b/qmake/qmake.pro
-index 0d92ac2..9be0e9b 100644
---- a/qmake/qmake.pro
-+++ b/qmake/qmake.pro
-@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic
- DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \
- PROEVALUATOR_FULL PROEVALUATOR_DEBUG
- DESTDIR = ../bin/
-+TARGET = qmake
-
- OBJECTS_DIR = .
- MOC_DIR = .
---
-1.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
deleted file mode 100644
index c40c66b1..00000000
--- a/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9928daa856cd7433618df38b263e029fb9948679 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 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with
- SYSROOT
-
-Upstream-Status: Pending
----
- 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 0e01ab5..6bb7986 100644
---- a/tools/configure/configureapp.cpp
-+++ b/tools/configure/configureapp.cpp
-@@ -3061,8 +3061,8 @@ void Configure::generateQConfigPri()
- configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
- if (!dictionary["XQMAKESPEC"].isEmpty() && !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;
- }
- if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
- configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl;
---
-1.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch
deleted file mode 100644
index 8d40e4f2..00000000
--- a/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 063936d0daabacad8c9b8e68adf9423d54846290 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 08/12] qt_module: Fix pkgconfig replacement
-
-* 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
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- mkspecs/features/qt_module.prf | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 50e9469..9532377 100644
---- a/mkspecs/features/qt_module.prf
-+++ b/mkspecs/features/qt_module.prf
-@@ -191,18 +191,30 @@ unix|win32-g++* {
- rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
- else: \
- rplbase = $$[QT_INSTALL_PREFIX/get]
-+ pkgconfig_include_replace.match = $$rplbase/include
-+ pkgconfig_include_replace.replace = "\$$\\{includedir}"
-+ pkgconfig_lib_replace.match = $$rplbase/lib
-+ pkgconfig_lib_replace.replace = "\$$\\{libdir}"
- include_replace.match = $$rplbase/include
- include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
- lib_replace.match = $$rplbase/lib
- lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
-- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace
-+ lafile_replace.match = $$rplbase
-+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
-+
-+ !isEmpty(SYSROOT): \
-+ rplbase = $$[SYSROOT] \
-+ lafile_replace.match = $$rplbase \
-+ lafile_replace.replace = "=" \
-+
-+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
- }
-
- unix {
- CONFIG += create_libtool explicitlib
- QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
- QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw]
-- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
-+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace
- }
-
- unix|win32-g++* {
---
-1.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch
deleted file mode 100644
index dde3b95b..00000000
--- a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 1a0133993cc7924208dd4a0d818599accbcf999e Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 28 Apr 2013 12:56:55 +0200
-Subject: [PATCH 09/12] 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
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- mkspecs/features/qt_module.prf | 28 +++++++++++++++++-----------
- 1 file changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 9532377..73053f7 100644
---- a/mkspecs/features/qt_module.prf
-+++ b/mkspecs/features/qt_module.prf
-@@ -195,17 +195,23 @@ unix|win32-g++* {
- pkgconfig_include_replace.replace = "\$$\\{includedir}"
- pkgconfig_lib_replace.match = $$rplbase/lib
- pkgconfig_lib_replace.replace = "\$$\\{libdir}"
-- include_replace.match = $$rplbase/include
-- include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
-- lib_replace.match = $$rplbase/lib
-- lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
-- lafile_replace.match = $$rplbase
-- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
--
-- !isEmpty(SYSROOT): \
-- rplbase = $$[SYSROOT] \
-- lafile_replace.match = $$rplbase \
-- lafile_replace.replace = "=" \
-+ !exists($$[QT_SYSROOT]) {
-+ include_replace.match = $$rplbase/include
-+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
-+ lib_replace.match = $$rplbase/lib
-+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
-+ lafile_replace.match = $$rplbase
-+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]"
-+ } else {
-+ # include_replace and lib_replace are duplicate, but we don't want to
-+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional
-+ include_replace.match = $$rplbase
-+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
-+ lib_replace.match = $$rplbase
-+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
-+ lafile_replace.match = $$rplbase
-+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
-+ }
-
- QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
- }
---
-1.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch
deleted file mode 100644
index ff8aaa1d..00000000
--- a/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 668c20fe721aba2057c8e929e5029c423a687360 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 5 May 2013 11:18:34 +0200
-Subject: [PATCH 10/12] wayland-scanner: disable silent rules
-
-* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- mkspecs/features/wayland-scanner.prf | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf
-index 90e1e0f..0750849 100644
---- a/mkspecs/features/wayland-scanner.prf
-+++ b/mkspecs/features/wayland-scanner.prf
-@@ -10,7 +10,7 @@ wayland-server-header.variable_out = HEADERS
- wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
- wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-
--silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
-+#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
- QMAKE_EXTRA_COMPILERS += wayland-server-header
-
- wayland-client-header.name = wayland ${QMAKE_FILE_BASE}
-@@ -19,7 +19,7 @@ wayland-client-header.variable_out = HEADERS
- wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
- wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-
--silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
-+#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
- QMAKE_EXTRA_COMPILERS += wayland-client-header
-
- wayland-code.name = wayland ${QMAKE_FILE_BASE}
-@@ -28,5 +28,5 @@ wayland-code.variable_out = SOURCES
- wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c
- wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-
--silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
-+#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
- QMAKE_EXTRA_COMPILERS += wayland-code
---
-1.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
deleted file mode 100644
index d1402124..00000000
--- a/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 62c2c404238e007021a80fcf62b51173be23a67e 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 11/12] 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
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure | 15 +--------------
- 1 file changed, 1 insertion(+), 14 deletions(-)
-
-diff --git a/configure b/configure
-index 8710c28..8b97cc2 100755
---- a/configure
-+++ b/configure
-@@ -740,20 +740,7 @@ fi'`
- done
-
- SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
--for varname in $SYSTEM_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}'"
--fi'`
-- eval "$cmd"
--done
-+
- # Use CC/CXX to run config.tests
- mkdir -p "$outpath/config.tests"
- rm -f "$outpath/config.tests/.qmake.cache"
---
-1.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
deleted file mode 100644
index 5d7cbc34..00000000
--- a/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b0a008c649f76e0353f49f9c953e9d8141e5927a 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 12/12] 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
-
-Upstream-Status: Pending
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- mkspecs/features/configure.prf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
-index 39144e7..de48b07 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\""
-
- # 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)
---
-1.8.2.1
-
diff --git a/recipes-qt/qt5/qtbase_5.0.0.bb b/recipes-qt/qt5/qtbase_5.0.0.bb
deleted file mode 100644
index 7f4cf298..00000000
--- a/recipes-qt/qt5/qtbase_5.0.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://0004-Disable-mkv8snapshot.patch"
-SRC_URI += "file://0005-AddSynchoronization-qimagereader.patch"
-
-SRC_URI[md5sum] = "c29073bfc3cf6b39492a2481d982386e"
-SRC_URI[sha256sum] = "89bcde09b24e8139f9d1d957dcb07c5aada83d578c84279f66813f348243d500"
diff --git a/recipes-qt/qt5/qtbase_5.0.1.bb b/recipes-qt/qt5/qtbase_5.0.1.bb
deleted file mode 100644
index dfcb742f..00000000
--- a/recipes-qt/qt5/qtbase_5.0.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://0004-Disable-mkv8snapshot.patch"
-
-SRC_URI[md5sum] = "720e5061d75913dfa97bf8bef4a443df"
-SRC_URI[sha256sum] = "6f8a0489eb057f6cba5e77cabaec13dcd010da562b3b88f91fe960022d7c37c8"
diff --git a/recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch b/recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch
deleted file mode 100644
index 650e603a..00000000
--- a/recipes-qt/qt5/qtdeclarative/0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 27be7a832f017653ffda705407bb7a64246eda1f Mon Sep 17 00:00:00 2001
-From: Daniel d'Andrada <daniel.dandrada@canonical.com>
-Date: Tue, 18 Dec 2012 10:51:21 -0200
-Subject: [PATCH] Flickable: Fix bug when flicking twice using touches
-
-When you flick twice in rapid succession, in the same direction,
-the expected behavior is for flickable to be moving quite fast in the
-direction of the flicks.
-
-But when you flicked using touch events instead of mouse ones,
-the second flick caused Flickable to immediately halt. This change fixes it.
-
-Upstream-Status: Backport
-
-Change-Id: I02bd02fed30bd4a98959194e04f0a26b4420cd05
-Reviewed-by: Andras Becsi <andras.becsi@digia.com>
----
- src/quick/items/qquickflickable.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
-index 6e5e6b7..88ef20f 100644
---- a/src/quick/items/qquickflickable.cpp
-+++ b/src/quick/items/qquickflickable.cpp
-@@ -2038,6 +2038,11 @@ bool QQuickFlickable::sendMouseEvent(QQuickItem *item, QMouseEvent *event)
-
- QQuickWindow *c = window();
- QQuickItem *grabber = c ? c->mouseGrabberItem() : 0;
-+ if (grabber == this && d->stealMouse) {
-+ // we are already the grabber and we do want the mouse event to ourselves.
-+ return true;
-+ }
-+
- bool grabberDisabled = grabber && !grabber->isEnabled();
- bool stealThisEvent = d->stealMouse;
- if ((stealThisEvent || contains(localPos)) && (!grabber || !grabber->keepMouseGrab() || grabberDisabled)) {
---
-1.7.9.5
-
diff --git a/recipes-qt/qt5/qtdeclarative_5.0.0.bb b/recipes-qt/qt5/qtdeclarative_5.0.0.bb
deleted file mode 100644
index 1e9876a9..00000000
--- a/recipes-qt/qt5/qtdeclarative_5.0.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.0 and 5.0.1
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.1"
-
-SRC_URI += " \
- file://0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch \
-"
-
-SRC_URI[md5sum] = "5373ebb2f78e27e14d0c2b3997599832"
-SRC_URI[sha256sum] = "eb13966ecaa61baff53f19b03e97f0e7ca7103a25d89c7540f6e8d7d98bf59bd"
diff --git a/recipes-qt/qt5/qtdeclarative_5.0.1.bb b/recipes-qt/qt5/qtdeclarative_5.0.1.bb
deleted file mode 100644
index df0ab3de..00000000
--- a/recipes-qt/qt5/qtdeclarative_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.0 and 5.0.1
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "91bb22db9501847e7549e8a431d81b78"
-SRC_URI[sha256sum] = "fa7c6941626ff4a40419f9be286f478b0461ac57f4a058035b3e1a9043dfee85"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb
deleted file mode 100644
index eabe4062..00000000
--- a/recipes-qt/qt5/qtgraphicaleffects_5.0.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.0
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "1031f8021a2b2e3a2387d94103e8868e"
-SRC_URI[sha256sum] = "e9cf71b4da1a1e879845f1fb1a532408ff6a0875e407a65d6bb3ce3dff0fe942"
-
diff --git a/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb b/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb
deleted file mode 100644
index b42fbb39..00000000
--- a/recipes-qt/qt5/qtgraphicaleffects_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.1
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "99b1259b992c31ab4c938a4b69bb8c71"
-SRC_URI[sha256sum] = "448c66b45e1744c1470ea839266777c41cc97fa2426b9915b1923c3ef1ae6a82"
diff --git a/recipes-qt/qt5/qtimageformats_5.0.0.bb b/recipes-qt/qt5/qtimageformats_5.0.0.bb
deleted file mode 100644
index 2072116b..00000000
--- a/recipes-qt/qt5/qtimageformats_5.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.0
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "cf2955d48e5674bfad6def4dd3acacca"
-SRC_URI[sha256sum] = "9280f13cdc58b02ab4562538fc381afa36df071564e0404a2ee48ecd0af659c6"
diff --git a/recipes-qt/qt5/qtimageformats_5.0.1.bb b/recipes-qt/qt5/qtimageformats_5.0.1.bb
deleted file mode 100644
index 99227a31..00000000
--- a/recipes-qt/qt5/qtimageformats_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.1
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "c3f357657b68d4c4788f8c7f71be519b"
-SRC_URI[sha256sum] = "145cc3d46a338ee8f28ddbebc031044db7d7a72e8c269d3daf542fc4b0e20018"
diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb
deleted file mode 100644
index e6c04106..00000000
--- a/recipes-qt/qt5/qtjsbackend-native_5.0.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.0 and 5.0.1
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc"
-SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39"
diff --git a/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb b/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb
deleted file mode 100644
index 41b9576e..00000000
--- a/recipes-qt/qt5/qtjsbackend-native_5.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.0 and 5.0.1
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "af5ccb9d5ab589df03eb0b12fb5ab4cd"
-SRC_URI[sha256sum] = "3fc8fca258b8c73f935e509c5c1efdc104725e4b44e240e9031b12901e7b971a"
diff --git a/recipes-qt/qt5/qtjsbackend_5.0.0.bb b/recipes-qt/qt5/qtjsbackend_5.0.0.bb
deleted file mode 100644
index e6c04106..00000000
--- a/recipes-qt/qt5/qtjsbackend_5.0.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.0 and 5.0.1
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "f7a745c09173abdd9cd21851557f76cc"
-SRC_URI[sha256sum] = "277106c4bf9a79ffaa458fbf66844b34dbbec7165b3edf94f98c0922fc1c0f39"
diff --git a/recipes-qt/qt5/qtjsbackend_5.0.1.bb b/recipes-qt/qt5/qtjsbackend_5.0.1.bb
deleted file mode 100644
index 41b9576e..00000000
--- a/recipes-qt/qt5/qtjsbackend_5.0.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.0 and 5.0.1
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "af5ccb9d5ab589df03eb0b12fb5ab4cd"
-SRC_URI[sha256sum] = "3fc8fca258b8c73f935e509c5c1efdc104725e4b44e240e9031b12901e7b971a"
diff --git a/recipes-qt/qt5/qtmultimedia_5.0.0.bb b/recipes-qt/qt5/qtmultimedia_5.0.0.bb
deleted file mode 100644
index 20e12c01..00000000
--- a/recipes-qt/qt5/qtmultimedia_5.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.0
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "bc24e00ded809c0c457ff3480c6d4198"
-SRC_URI[sha256sum] = "55915e30ba089dd6f9cd5e0dfe93e231c4d741da0f85a2e16d5a47f948424cc4"
diff --git a/recipes-qt/qt5/qtmultimedia_5.0.1.bb b/recipes-qt/qt5/qtmultimedia_5.0.1.bb
deleted file mode 100644
index 3b47de08..00000000
--- a/recipes-qt/qt5/qtmultimedia_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.1
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "aee9c86a7ff64dfc905ccaef33f0a967"
-SRC_URI[sha256sum] = "e87fe8fbc1465840458a88de0be10f096374fb7cd0888c703710c0ecc936d414"
diff --git a/recipes-qt/qt5/qtquick1_5.0.0.bb b/recipes-qt/qt5/qtquick1_5.0.0.bb
deleted file mode 100644
index 12d48230..00000000
--- a/recipes-qt/qt5/qtquick1_5.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.0
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "04bc1ae59321676eb0239f8a3f9dcd95"
-SRC_URI[sha256sum] = "3d0236546b1d2bdcfb2aa36091fd4cfbfaa64c89c69df9d6e4b7fa38a4c40504"
diff --git a/recipes-qt/qt5/qtquick1_5.0.1.bb b/recipes-qt/qt5/qtquick1_5.0.1.bb
deleted file mode 100644
index fe762d19..00000000
--- a/recipes-qt/qt5/qtquick1_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.1
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "27820e2447e4c3b7ea75f5d4a16b9149"
-SRC_URI[sha256sum] = "507d02a5ffaa4f045f5b9cc807190d0f9db80c09b12feb4b4aa2fdb62d1bd529"
diff --git a/recipes-qt/qt5/qtscript_5.0.0.bb b/recipes-qt/qt5/qtscript_5.0.0.bb
deleted file mode 100644
index 00b21368..00000000
--- a/recipes-qt/qt5/qtscript_5.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.0
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "0759bd132e46fb6d95451764018f3a92"
-SRC_URI[sha256sum] = "8722e48c5f1f989ae920288fb4f5176ae5563775442d9f0aec1fc2e79869fb5f"
diff --git a/recipes-qt/qt5/qtscript_5.0.1.bb b/recipes-qt/qt5/qtscript_5.0.1.bb
deleted file mode 100644
index a8a97b8f..00000000
--- a/recipes-qt/qt5/qtscript_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.1
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "349691431c3cc1b03e2571bac7c6c852"
-SRC_URI[sha256sum] = "0b5901a78e8bc6853e7d549f2e8109794b2fb03b7ce22963eb3897eb97256f84"
diff --git a/recipes-qt/qt5/qtsvg_5.0.0.bb b/recipes-qt/qt5/qtsvg_5.0.0.bb
deleted file mode 100644
index f37bd5b2..00000000
--- a/recipes-qt/qt5/qtsvg_5.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.0
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "2dbed5aeae30bd492a38ca230e69e038"
-SRC_URI[sha256sum] = "be3674b5b058503ba90ae9138fec8de25c2e67a12059e937b3540e50a1ca08cf"
diff --git a/recipes-qt/qt5/qtsvg_5.0.1.bb b/recipes-qt/qt5/qtsvg_5.0.1.bb
deleted file mode 100644
index d27fc29a..00000000
--- a/recipes-qt/qt5/qtsvg_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.1
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "4bb52d0382d2557781c39cc27f380ce7"
-SRC_URI[sha256sum] = "bd053b808b64aad8bfbd3f5399444adedaff97aa16f03e54de91bb0873c20fd3"
diff --git a/recipes-qt/qt5/qtwebkit_5.0.0.bb b/recipes-qt/qt5/qtwebkit_5.0.0.bb
deleted file mode 100644
index 5cb6cde9..00000000
--- a/recipes-qt/qt5/qtwebkit_5.0.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "11556c74161612fd37ce70277de3baa4"
-SRC_URI[sha256sum] = "45981088d39ec044762861ee67acee8524ca20b13f1543a3045219aa9da21f9f"
-
diff --git a/recipes-qt/qt5/qtwebkit_5.0.1.bb b/recipes-qt/qt5/qtwebkit_5.0.1.bb
deleted file mode 100644
index 7054af98..00000000
--- a/recipes-qt/qt5/qtwebkit_5.0.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "8210ea90902c4ec526e1e5f7e719ad57"
-SRC_URI[sha256sum] = "e1f3a5ff14277a57fa4235d1e3d2ec0029fc888e6e4855b7f7874028ad827cfa"
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb
deleted file mode 100644
index 59438fde..00000000
--- a/recipes-qt/qt5/qtxmlpatterns_5.0.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.0
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "5a76672bc411bb9cd1e0158d86706062"
-SRC_URI[sha256sum] = "689d7d89fe71b8fba53183825294bc769ffe1a60dae4ccf5fa3ee6fe704b5172"
diff --git a/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb b/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb
deleted file mode 100644
index 1e8d3c12..00000000
--- a/recipes-qt/qt5/qtxmlpatterns_5.0.1.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require qt5-${PV}.inc
-require ${PN}.inc
-
-# LICENSE files are missing in 5.0.1
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \
- file://${COMMON_LICENSE_DIR}/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891 \
- file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \
-"
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "de8b08656a0e1496b18a091dfca82e59"
-SRC_URI[sha256sum] = "23cc183f96688992fee46537c8f50bbd20b20e4c92d29fff280e61758c97a59a"