qt5: Upgrade from 5.2.0 to 5.2.1

* qtwayland: Use default LICENSE and LIC_FILES_CHKSUM
  * license texts were added in qtwayland commit 26bdc66fe6c4499332b2ead886a806d09aa07a8a
* qtdeclarative, qtserialport: Update QT_MODULE_BRANCH
  * SHA-1 of v5.2.1 tag is only in release branch

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2014-02-07 04:10:06 +01:00
parent 79944bda32
commit 4b7182a3be
95 changed files with 256 additions and 267 deletions

View File

@ -1,7 +1,7 @@
# Select which version you prefer by defining QT5_VERSION and including this file
# possible values now "5.2.0", "5.2.0+git%"
# possible values now "5.2.1", "5.2.1+git%"
QT5_VERSION ?= "5.2.0"
QT5_VERSION ?= "5.2.1"
PREFERRED_VERSION_qtbase-native = "${QT5_VERSION}"
PREFERRED_VERSION_qtbase = "${QT5_VERSION}"

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1"
SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b"
SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0"

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1"
SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b"
SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5"

View File

@ -4,7 +4,7 @@ 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 = "4820a197cebd5184ab39ef405eb78f6e69ffc5f9"
SRCREV = "d3338a9f7fcac109d7bc7f600d5974ff333782ad"
do_configure_prepend() {
# Temporary hack to get qt3d build for Qt 5.1.0

View File

@ -1,5 +1,5 @@
# Copyright (C) 2012 O.S. Systems Software LTDA.
# Copyright (C) 2013 Martin Jansa <martin.jansa@gmail.com>
# Copyright (C) 2013-2014 Martin Jansa <martin.jansa@gmail.com>
QT_MODULE_BRANCH ?= "stable"
@ -10,7 +10,7 @@ SRC_URI += " \
S = "${WORKDIR}/git"
PV = "5.2.0+git${SRCPV}"
PV = "5.2.1+git${SRCPV}"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"

View File

@ -7,5 +7,5 @@ do_install_append() {
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
}
SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1"
SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628"
SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b"
SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0"

View File

@ -7,4 +7,4 @@ do_install_append() {
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
}
SRCREV = "313a74cc4a9a5d200b2059d3d8767fe1a274c50d"
SRCREV = "000ee3d503906c2c20f789b6b9dd95b8647405d0"

View File

@ -18,7 +18,6 @@ SRC_URI += "\
file://0011-Allow-building-a-separate-qmake-for-the-target.patch \
file://0012-qtbase-allow-build-of-examples.patch \
file://0013-QOpenGLPaintDevice-sub-area-support.patch \
file://0014-enables-tslib-device-to-be-read-from-env-variable.patch \
"
DEPENDS += "qtbase-native"

View File

@ -1,4 +1,4 @@
From f4fd2da9b29db23638ad07bd35f093f793241526 Mon Sep 17 00:00:00 2001
From f883ec8652ee603d9bb9def7eb669ed82c493961 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
@ -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 a330dd6..1b328ae 100755
index aaa59bd..0e74f29 100755
--- a/configure
+++ b/configure
@@ -324,6 +324,16 @@ getQMakeConf()
@ -97,7 +97,7 @@ index a330dd6..1b328ae 100755
SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
for varname in $SYSTEM_VARIABLES; do
qmakevarname="${varname}"
@@ -3344,7 +3376,7 @@ if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then
@@ -3362,7 +3394,7 @@ if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_QGTKSTYLE" = "auto" ]; then
CFG_QGTKSTYLE=no
fi
@ -106,7 +106,7 @@ index a330dd6..1b328ae 100755
TEST_COMPILER=$QMAKE_CONF_COMPILER
@@ -3379,7 +3411,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
@@ -3397,7 +3429,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
exit 1
fi
fi
@ -115,7 +115,7 @@ index a330dd6..1b328ae 100755
GCC_MACHINE_DUMP=
case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
@@ -3860,6 +3892,14 @@ setBootstrapVariable()
@@ -3878,6 +3910,14 @@ setBootstrapVariable()
getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
}
@ -130,7 +130,7 @@ index a330dd6..1b328ae 100755
# build qmake
if true; then ###[ '!' -f "$outpath/bin/qmake" ];
echo "Creating qmake..."
@@ -3898,11 +3938,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
@@ -3916,11 +3956,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.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From c6c1e780ed6a443a0c68c3200aeea9ced76f444c Mon Sep 17 00:00:00 2001
From 841d1f06f3fd2f59f6b18067b02d5fcfc93aaa7a 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
@ -32,5 +32,5 @@ index 1c3b09f..c647a16 100644
if(!QFile::exists(qtconfig))
qtconfig = qt_libraryInfoFile();
--
1.8.5.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From 21c595fd0e386bea1a2e2b19323dc517bb2c7333 Mon Sep 17 00:00:00 2001
From 3648eeddaed0cf31fba226ec713d2321f398974f 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
@ -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 1b328ae..46f7230 100755
index 0e74f29..7f3f2f0 100755
--- a/configure
+++ b/configure
@@ -785,6 +785,7 @@ QT_HOST_BINS=
@@ -788,6 +788,7 @@ QT_HOST_BINS=
QT_HOST_LIBS=
QT_HOST_DATA=
QT_EXT_PREFIX=
@ -39,7 +39,7 @@ index 1b328ae..46f7230 100755
#flags for SQL drivers
QT_CFLAGS_PSQL=
@@ -905,6 +906,7 @@ while [ "$#" -gt 0 ]; do
@@ -907,6 +908,7 @@ while [ "$#" -gt 0 ]; do
-testsdir| \
-hostdatadir| \
-hostbindir| \
@ -47,7 +47,7 @@ index 1b328ae..46f7230 100755
-hostlibdir| \
-extprefix| \
-sysroot| \
@@ -1118,6 +1120,9 @@ while [ "$#" -gt 0 ]; do
@@ -1120,6 +1122,9 @@ while [ "$#" -gt 0 ]; do
extprefix)
QT_EXT_PREFIX="$VAL"
;;
@ -57,7 +57,7 @@ index 1b328ae..46f7230 100755
pkg-config)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_PKGCONFIG="$VAL"
@@ -2226,6 +2231,10 @@ Installation options:
@@ -2236,6 +2241,10 @@ Installation options:
-hostdatadir <dir> . Data used by qmake will be installed to <dir>
(default HOSTPREFIX)
@ -68,7 +68,7 @@ index 1b328ae..46f7230 100755
Configure options:
The defaults (*) are usually acceptable. A plus (+) denotes a default value
@@ -3133,6 +3142,11 @@ fi
@@ -3151,6 +3160,11 @@ fi
# command line and environment validation
#-------------------------------------------------------------------------------
@ -80,7 +80,7 @@ index 1b328ae..46f7230 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
@@ -3820,6 +3834,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
@@ -3838,6 +3852,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,7 +135,7 @@ index e50485c..71291ad 100644
{ "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
};
diff --git a/qtbase.pro b/qtbase.pro
index 7576db7..d51af0e 100644
index 140a137..4e01d5b 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -70,16 +70,22 @@ CONFIG -= qt
@ -198,7 +198,7 @@ index 17864b5..a14bc0f 100644
HostSpecPath,
LastHostPath = HostSpecPath,
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index e2fef2c..ab475c3 100644
index 5ab413a..50a192b 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1186,6 +1186,13 @@ void Configure::parseCmdLine()
@ -224,5 +224,5 @@ index e2fef2c..ab475c3 100644
<< " \"qt_hostspec=" << hostSpec << "\"," << endl
<< "#endif" << endl
--
1.8.5.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From 925a8c67fef4bfa56bdc3c1c7cd87e21defc3d94 Mon Sep 17 00:00:00 2001
From 698f073fb8cc6dc1ced277b6ae2056cb9d02f2d5 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
@ -10,7 +10,7 @@ Upstream-Status: Pending
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index ab475c3..68cd43d 100644
index 50a192b..46eabe4 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3213,8 +3213,8 @@ void Configure::generateQConfigPri()
@ -25,5 +25,5 @@ index ab475c3..68cd43d 100644
configStream << "}" << endl;
if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
--
1.8.5.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From 33bbb10c66df59abfad9f4576462f63dfb500149 Mon Sep 17 00:00:00 2001
From 1f9449f851f7ec288948ec8e83f2fe4b0b37e789 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
@ -33,13 +33,13 @@ Content-Transfer-Encoding: 8bit
* 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>
Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
@ -113,5 +113,5 @@ index 11509ee..2f95684 100644
unix|win32-g++* {
--
1.8.5.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From ce1afee66a6310f362644e71d17f8d1eb3f848da Mon Sep 17 00:00:00 2001
From ebd38fc708cf7190e47a75754235f56fa5d86300 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
@ -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 46f7230..96c56c8 100755
index 7f3f2f0..13dd619 100755
--- a/configure
+++ b/configure
@@ -581,20 +581,6 @@ fi'`
@ -39,5 +39,5 @@ index 46f7230..96c56c8 100755
mkdir -p "$outpath/config.tests"
rm -f "$outpath/config.tests/.qmake.cache"
--
1.8.5.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From 7846422a1d4ca37583fbbd10d768e34ddf84d233 Mon Sep 17 00:00:00 2001
From 828eecd8f361cb965bd40f535435efa91665c8e5 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
@ -33,5 +33,5 @@ index 39144e7..de48b07 100644
msg = "test $$1 succeeded"
write_file($$QMAKE_CONFIG_LOG, msg, append)
--
1.8.5.2
1.8.5.3

View File

@ -1,9 +1,12 @@
From 9bb1bbebd644c243413650defa08a99eb4678a87 Mon Sep 17 00:00:00 2001
From 3923edc900d1b3dd23e0a6af3a32255707cd497c 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
configurable option
Allows disabling pulseaudio, alsa, freetype support at configure time
making builds more deterministic.
Upstream-Status: Pending
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
@ -13,10 +16,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 file changed, 21 insertions(+)
diff --git a/configure b/configure
index 96c56c8..b3854aa 100755
index 13dd619..66c2ae0 100755
--- a/configure
+++ b/configure
@@ -1801,6 +1801,27 @@ while [ "$#" -gt 0 ]; do
@@ -1810,6 +1810,27 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
@ -45,5 +48,5 @@ index 96c56c8..b3854aa 100755
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_QGTKSTYLE="$VAL"
--
1.8.5.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From b70eabc4050a5e7621511403dcbf7a650b3ef9fc Mon Sep 17 00:00:00 2001
From acbd622d1b91c1aa9ec8c48d10d91354d175345c 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
@ -15,7 +15,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
index 1e00c74..a99b5bf 100644
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)
@ -46,7 +46,7 @@ index 1e00c74..a99b5bf 100644
_qt5_Core_check_file_exists(${imported_location})
diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
index 1d94715..301af8f 100644
index 1d94715..617efa8 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.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From 1ea3afc37eba9ea4b1bee3916abd1bcf6abf97ba Mon Sep 17 00:00:00 2001
From 8a10c6d053fe438aec007e4a73b60ac59716ccd4 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
@ -34,5 +34,5 @@ index b7887a6..8801544 100644
\ No newline at end of file
+QMAKE_EXTRA_TARGETS = sub-tools
--
1.8.5.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From 96a18197ac6d9960fd00654acffd6a81bafa0320 Mon Sep 17 00:00:00 2001
From 77a18a9fe2d0e4a1dcd95e2d78c85eb37452bc73 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
@ -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 b3854aa..15c89c7 100755
index 66c2ae0..ac836aa 100755
--- a/configure
+++ b/configure
@@ -3923,7 +3923,7 @@ setBootstrapEvalVariable()
@@ -3941,7 +3941,7 @@ setBootstrapEvalVariable()
# build qmake
@ -26,5 +26,5 @@ index b3854aa..15c89c7 100755
mkdir -p "$outpath/qmake" || exit
--
1.8.5.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From 69c6d0ccc6097da0479fddc905dd8aa69cb1d0e2 Mon Sep 17 00:00:00 2001
From dd14f3eda61669c66c95dbcbca3afbd61f9aa746 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
@ -26,5 +26,5 @@ index 89d6ea5..7c605b9 100644
VPATH += \
../src/corelib/global \
--
1.8.5.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From 6f42a9e1422f3aba3e2bddb8ef6d470841224ab1 Mon Sep 17 00:00:00 2001
From 441b2ebc41013505b9f5b6a4db43526506f84e47 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
@ -13,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
1 file changed, 2 insertions(+)
diff --git a/configure b/configure
index b3854aa..20836a6 100755
index 66c2ae0..d423cce 100755
--- a/configure
+++ b/configure
@@ -4067,6 +4067,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
@@ -4085,6 +4085,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
(cd "$outpath/qmake"; "$MAKE") || exit 2
fi # Build qmake
@ -26,5 +26,5 @@ index b3854aa..20836a6 100755
echo "Running configuration tests..."
--
1.8.5.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From f9db024119ab11177629311101313cfee0fbcbc8 Mon Sep 17 00:00:00 2001
From 63313ba681ad5bb0ef83c3b8908387939c2b41d5 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
@ -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 20836a6..50661f4 100755
index d423cce..1ea4102 100755
--- a/configure
+++ b/configure
@@ -3805,7 +3805,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
@@ -3823,7 +3823,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 20836a6..50661f4 100755
"qt_prfxpath=$QT_SYSROOT_PREFIX",
"qt_docspath=$QT_SYSROOT_DOCS",
--
1.8.5.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From 962bbe70b1f87afa820bd4cee49fcccfb6190341 Mon Sep 17 00:00:00 2001
From 6e5e22110b4731b4324d309bc579393f422ba99d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
Date: Sat, 25 May 2013 17:34:32 +0200
Subject: [PATCH 12/14] qtbase: allow build of examples
@ -44,5 +44,5 @@ index 2db752c..ca1b0c7 100644
- }
}
--
1.8.5.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From 4a169ec0dffdb2dc501533a4bca3648ba3a220bf Mon Sep 17 00:00:00 2001
From 2fad0a6fa3c06577995ac44ed0a2a12eaef819c2 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
@ -150,5 +150,5 @@ index 3b62d1d..a5d1f7e 100644
} else {
m_blitProgram->disableAttributeArray(int(QT_VERTEX_COORDS_ATTR));
--
1.8.5.2
1.8.5.3

View File

@ -1,35 +0,0 @@
From 2af1da07715288bf7fc7308e2d11aef3171c9590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
Date: Mon, 27 May 2013 18:32:37 +0200
Subject: [PATCH 14/14] enables tslib device to be read from env variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
from :
https://github.com/prabindh/qt-configs/blob/master/qt5_1.0_Feb13/tslib.patch
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
src/plugins/generic/tslib/qtslib.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/generic/tslib/qtslib.cpp b/src/plugins/generic/tslib/qtslib.cpp
index 6986fd5..2ed4a69 100644
--- a/src/plugins/generic/tslib/qtslib.cpp
+++ b/src/plugins/generic/tslib/qtslib.cpp
@@ -64,7 +64,9 @@ QTsLibMouseHandler::QTsLibMouseHandler(const QString &key,
qDebug() << "QTsLibMouseHandler" << key << specification;
setObjectName(QLatin1String("TSLib Mouse Handler"));
- QByteArray device = "/dev/input/event1";
+ QByteArray device = qgetenv("TSLIB_TSDEVICE");
+ if(device.isEmpty())
+ device = "/dev/input/event1";
if (specification.startsWith("/dev/"))
device = specification.toLocal8Bit();
--
1.8.5.2

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "c94bbaf1bb7f0f4a32d2caa7501416e1"
SRC_URI[sha256sum] = "51556cd2562a6d4bbb70ffcc93e8ef83ec79b170753aac6e4b195957c61cb628"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "fa005301a2000b92b61b63edc042567b"
SRC_URI[sha256sum] = "acdfd1aa2548ebea1d922e8e24e5c59f5fc3b2beae7c8003ba47d773bfcc94c0"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "313a74cc4a9a5d200b2059d3d8767fe1a274c50d"
SRCREV = "000ee3d503906c2c20f789b6b9dd95b8647405d0"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "cb2ef624b28b6ba61d6a467b8b3c314a"
SRC_URI[sha256sum] = "ec31e1c3cd5aea4d7dff946802a7fde2599bb8a1931d4bb49cb0854371cf1223"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${BPN}.inc
SRCREV = "3016e7fb6d5e00616fa75d2d2eeafa266382f953"
SRCREV = "2f2985b03f5202a9ab329f89de7317585af8c250"

View File

@ -1,7 +1,7 @@
From ea698b0a2588585356d1ea5139ca6feb7110611a Mon Sep 17 00:00:00 2001
From 6e3f95ab76c4de1333eab1625b507c09ad52d340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
Date: Sun, 26 May 2013 14:26:19 +0200
Subject: [PATCH 1/3] qmltestexample: fix link
Subject: [PATCH 1/2] qmltestexample: fix link
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@ -13,9 +13,8 @@ Upstream-Status: Inappropriate
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
examples/qmltest/qmltest/qmltest.pro | 2 +-
tools/qmltestrunner/qmltestrunner.pro | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
examples/qmltest/qmltest/qmltest.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
index b5893c5..1b00e6c 100644
@ -42,5 +41,5 @@ index 5184c1f..668cf17 100644
load(qt_tool)
--
1.8.3.2
1.8.5.3

View File

@ -1,4 +1,4 @@
From 3919fe89e7adbc9f163eabce9269a924273c64ec Mon Sep 17 00:00:00 2001
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
@ -24,10 +24,10 @@ Change-Id: I136ae4484278d14f796613505e3f38c65ec51ebe
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index a6dabee..290f283 100644
index d7b9847..a54d282 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -1815,7 +1815,7 @@ void QQuickItemViewPrivate::layout()
@@ -1835,7 +1835,7 @@ void QQuickItemViewPrivate::layout()
prepareVisibleItemTransitions();
@ -37,5 +37,5 @@ index a6dabee..290f283 100644
it != releasePendingTransition.end(); ) {
FxViewItem *item = *it;
--
1.8.3.2
1.8.5.3

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "0f7714c5c91b8eb7cdc1071f0a51c202"
SRC_URI[sha256sum] = "b81bd480216fda8ff1d96610e710ff5ca17e0d711c8e40753264f91a4e8f6d19"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "a23fba03a4b48f36fe8b51d326d08acc"
SRC_URI[sha256sum] = "7e32b8d6e1d64ca4bdfa92d15f9b4217a1b24239ef40e8826eeccbe918866690"

View File

@ -1,4 +1,5 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "f95fdacb3a12e4f0d37d3c32b34326f2bd1536de"
QT_MODULE_BRANCH = "release"
SRCREV = "96e4f00db3bfd222146780251013501cfdd8baaa"

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "85e94989bbc624f676102f0ea343b6dd"
SRC_URI[sha256sum] = "b28cefa95578cf5ed1dfcbc81da1cbec427400e56edf0ce81323b3f25e2a558d"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "8dde8593750e33a79f49c5a2f03caf0c"
SRC_URI[sha256sum] = "5abb17ee60d68cf49c4f8f0b69c3f1e4d0a2f7b32cda8d6901d9c35447cc3482"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "c640a496d63036ead177dd006ef56b9b12d962bb"
SRCREV = "740fbcf28012ade59087df945b4c6b8ae05b7a68"

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "fe9898272b3952e3d97eacbaca484b55"
SRC_URI[sha256sum] = "632aacdac40717bf1bbc6861dc2e2d7d2825d68f40b7c1ae04636dafa20b0210"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "9b88aa6f3888c7c7f5253c147ae4bf8f"
SRC_URI[sha256sum] = "a6a0454769566fec1757fb09b1f33c9fc70d4016acbb04ebc6e493ddedfef124"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "d507c358b803cd40ec13ed19e00eced80b732571"
SRCREV = "8548d1fe0985b3b680acef3135646aa4e876175c"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "4de8ca8ac1a3e5db20a903286fb78840"
SRC_URI[sha256sum] = "9543fcdcab5cf02be60e395e8145e1ec87d03a3d1f129a0dde92102283a9b536"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "c4d3b333a1ec0de5ef1389569b9b65467453e382"
SRCREV = "a74b31c16b4baeeb8047e1958eb1b6787dc885e8"

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "2d0f9403f607f617bcc13d4814f41365"
SRC_URI[sha256sum] = "dc37d21db1d4d8cdc2808ee24c7354643bc0b2ff71f9631bd8cfded388a4d9ac"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "26dc22c59fbbad9fdf0699d5f887166a"
SRC_URI[sha256sum] = "62688cb7d8daa4d7050353fe39536c5edd97228a10185b9662a29b8c8cff1fa2"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "ea9f9788d502d4a4307a464d87a00be198df09ad"
SRCREV = "658ad524f8ba9cbcae797aefbdf498ef9d364067"

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "4535ff78b5a9a18ffba702298a48e22e"
SRC_URI[sha256sum] = "ae868892a586cd0622a558fda6ebada8edadb575edf3b50e5569fd7115b6e805"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "6abbf131adffdf3cba63704d5d35f921"
SRC_URI[sha256sum] = "8b2bb3250b9e09a4c568069bc4c7cfeddbdcda50b24f0bfecc7f85df3120ff65"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "2866c00375313d1726cc0473b6b7bfc87b984c78"
SRCREV = "3384daf6d1ab1fc15908866e2743f060a7461daa"

View File

@ -1,6 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "748ab947f59fb104db2ac1fefa073d81"
SRC_URI[sha256sum] = "c778c364d8d438ff7939c540f56ea741e4b5b957b620b194c2e881c775ab582c"

View File

@ -0,0 +1,6 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "027bc7d05fe740b21284dc909c9f11ac"
SRC_URI[sha256sum] = "eb03a69402576984d588923e994c3cb672d8479ac9b68ed90da15d0c2fd82aac"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "1d684b38a4fb0b8ce33401fa9c8f415eba6097bf"
SRCREV = "c7540702126251ca5f7cc78e685b970d06e48ce8"

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "37d32c983c3fdf5b29f932265046f2e3"
SRC_URI[sha256sum] = "ea717e633c9a586dc66b435aad50c9870d6f0c4d1bc185f91144b002bd060294"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "b8af09bb297d4c62e64df5418fe99dc9"
SRC_URI[sha256sum] = "6621350d5eff65cb6f9853247246f30a2d4cdb465c14923ff7ccbd8c3a9cdefa"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "15bb30b0e90c628cc3812627923d1d459d461505"
SRCREV = "3aadb5c9894d5fe92923cc6c5dd2a71949a49927"

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "718606a6f76afa20c6cd2e0433356ac2"
SRC_URI[sha256sum] = "5934651affead2b7e70fd7a3dedcbfbf7ef3d7b64a9ac4142622f7afff578446"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "045f98acba9fba0358a6a50356be0841"
SRC_URI[sha256sum] = "09403e7e088f30da828e452559a6904d7c43420d423a429d6529285f99b1e407"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "8b501195f623fbcf31b591a1414e1726dbb7ce84"
SRCREV = "832136829ece18885ef7ac35f4527d1d314aaea8"

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "7b90e0707b698331226e662bd39945e9"
SRC_URI[sha256sum] = "c7d5bb58d6c574275102d088159d0323aac40a639ceb4224aa06c34d2fe8d292"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "2993ad7e92a0b6b41e3cb0e0e345d251"
SRC_URI[sha256sum] = "f5754e4ba61843b7dfdf946a91b7d857a5cb470608b840f92452e72f24c67347"

View File

@ -1,4 +1,5 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "97bbe2acd8b4c14315653a3d9dc5757d6518220e"
QT_MODULE_BRANCH = "release"
SRCREV = "29e526ad5c1e2fe0996ba0a776d83ec86f7197d7"

View File

@ -1,6 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "3f6132475f6edcd7b6cfb57650846185"
SRC_URI[sha256sum] = "bad23ebcebf8e91cc727b229a3f87f95829edfd2a7653d47e97b154aac687c59"

View File

@ -0,0 +1,6 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "3f5487fe2bd5024f18f63a8d0eb4294d"
SRC_URI[sha256sum] = "788f69557ff6d28073d6ef2b3300b42b987fba1d122f7884ba0269023cab44ef"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "b719b93770393bbf20251e1dffc70498061e612c"
SRCREV = "ef1c298cc27e15dd6f6bba95b605471d95bead6b"

View File

@ -1,9 +1,9 @@
require qt5-git.inc
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.0
# qtsystems 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
QT_MODULE_BRANCH = "dev"
SRCREV = "d6104a92321c2e72b140156fddf0378c9795cdb4"
SRCREV = "aa651c73bf7bc57c1b6b1bfcfa9afe901884a102"

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1"
SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b"
SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "a60aa90f5ca00e32a1271a476f5da650dddebfda"
SRCREV = "70e06f2cdbcd16cbbae3f577701ff44bf5765cdb"

View File

@ -1,7 +1,7 @@
From a4af5dd2b0449df19271b22a62a03f70598106f0 Mon Sep 17 00:00:00 2001
From a5150c9701d5b2e6c77e521544034ea732d2266b 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] Allow to build only lrelease + lupdate + lconvert
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
@ -134,5 +134,5 @@ index eaf440b..1778ad1 100644
installed_cmake.depends = cmake
--
1.8.4.3
1.8.5.3

View File

@ -1,7 +1,7 @@
From 26228d3ed02a4a244d01b3cc2bf3633f25797bb7 Mon Sep 17 00:00:00 2001
From 6837c212d388a3b679b7420c5f1c98ef85d04a39 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] assistant/help: fix linking of dependent libraries
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
@ -28,5 +28,5 @@ index ed75c37..a2c55c7 100644
+
+LIBS += -lQt5CLucene
--
1.8.3.1
1.8.5.3

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "76a0992967b6d02220ecb69a5ba04ef1"
SRC_URI[sha256sum] = "ff331510ecb776b3059953e216e9fa7a4c0736eeb148c4cf11acc8150811b7f0"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "f56b2e6c537f6853d9bf10380c39418b"
SRC_URI[sha256sum] = "ff2f850f63798441aaaa0b18c741460acdd62c74d6a9e6a76521956e4bcb27d5"

View File

@ -0,0 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "70e06f2cdbcd16cbbae3f577701ff44bf5765cdb"

View File

@ -1,10 +1,5 @@
require qt5-native.inc
LICENSE = "BSD & LGPL-2.1 | GPL-3.0"
LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenode.cpp;endline=40;md5=e38eccd7e9a6a149c9e31b6fb47daac1 \
file://${S}/src/compositor/compositor_api/qwaylandcompositor.cpp;endline=39;md5=8897abe415f27031e4237f09db7b9a36 \
"
QT_MODULE = "${BPN}"
DEPENDS = "qtbase-native wayland-native"

View File

@ -2,7 +2,6 @@ require qt5-git.inc
require ${PN}.inc
# qtwayland wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
# this PV is only to indicate that this recipe is compatible with qt5 5.2.0
PV = "5.2.0+git${SRCPV}"
# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1
SRCREV = "3e9412e2fd91e64a565ed8ddbef76f57ca9413d5"
SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e"

View File

@ -1,10 +1,5 @@
require qt5.inc
LICENSE = "BSD & LGPL-2.1 | GPL-3.0"
LIC_FILES_CHKSUM = "file://${S}/src/compositor/compositor_api/qwaylandsurfacenode.cpp;endline=40;md5=e38eccd7e9a6a149c9e31b6fb47daac1 \
file://${S}/src/compositor/compositor_api/qwaylandcompositor.cpp;endline=39;md5=8897abe415f27031e4237f09db7b9a36 \
"
# wayland-native is already in wayland DEPENDS, but add it here
# explicitly, because it's native wayland-scanner we're looking for
# libxkbcommon isn't mandatory make it easier to remove by .bbappend

View File

@ -2,6 +2,6 @@ require qt5-git.inc
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.0
# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1
SRCREV = "3e9412e2fd91e64a565ed8ddbef76f57ca9413d5"
SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e"

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "8431a8476213b3a3587e04b023a2435f"
SRC_URI[sha256sum] = "80e7eb55ea6c4a4e92f44eb1d3cd7c9ecd85f9d5e48e682a31473633fa46a64e"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "ddad7d00ebd201a750242bd67b20ecf3"
SRC_URI[sha256sum] = "d5ecff99b4d35bc5f184503cabc394a554be48c368aba140f95019501645a7f5"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "634cddbfef6a40b991bcdf8e68e5329747f43c57"
SRCREV = "0d6e9989eb2a15d130b2a132ddc196835a33c9b6"

View File

@ -14,7 +14,7 @@ EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}"
# remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it conflicts with ${PN} from separate webkit-examples recipe
PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale ${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
SRC_URI += "file://fix-rpath.patch"
SRC_URI += "file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch"
# make sure rb files are used from sysroot, not from host
# ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed s/i.86/i386/`

View File

@ -0,0 +1,31 @@
From 89c132829d1a93d662f617c2a7be75c5e6eaa33a Mon Sep 17 00:00:00 2001
From: Trevor Woerner <trevor.woerner@linaro.org>
Date: Fri, 7 Feb 2014 04:07:17 +0100
Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
Building qtwebkit causes a QA issue such that QtWebPluginProcess and
QtWebProcess contain bad RPATHs which point into the build location. This fix
adds a patch to not include the rpath.prf which causes this problem.
Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
Tools/qmake/mkspecs/features/unix/default_post.prf | 2 --
1 file changed, 2 deletions(-)
diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf
index 79b7208..6dff72b 100644
--- a/Tools/qmake/mkspecs/features/unix/default_post.prf
+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
@@ -58,8 +58,6 @@ linux-*g++* {
QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions
}
-contains(TEMPLATE, app): CONFIG += rpath
-
CONFIG(debug, debug|release)|force_debug_info|separate_debug_info {
# Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
!force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory
--
1.8.5.3

View File

@ -1,13 +0,0 @@
Index: qtwebkit-opensource-src-5.1.0/Tools/qmake/mkspecs/features/unix/default_post.prf
===================================================================
--- qtwebkit-opensource-src-5.1.0.orig/Tools/qmake/mkspecs/features/unix/default_post.prf
+++ qtwebkit-opensource-src-5.1.0/Tools/qmake/mkspecs/features/unix/default_post.prf
@@ -32,8 +32,6 @@ linux-*g++* {
QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions
}
-contains(TEMPLATE, app): CONFIG += rpath
-
isEqual(QT_ARCH,i386):CONFIG(debug, debug|release) {
# Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "1378e18aecd8cc223deb729c8f0a735d"
SRC_URI[sha256sum] = "390e16e719e41bcc94fd79866a0909b70235513778063c5e47227b8b9876e0cf"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "a20d99a1c2afbd6a7c6f54e615f1bd63"
SRC_URI[sha256sum] = "ac089723489ee9146020bd8fc715358249d8cea7f2a2e92a692e2a5595a46b5c"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "4c86230bfe563ef1e3ef493b870203761bc9f32d"
SRCREV = "3dd07419f3f627ffd0a9efc3f7253cef145f14e5"

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "1a11c4bb67503e2a5ef10b96bbe11b61"
SRC_URI[sha256sum] = "98e4d82a6e349fb6f4cba29a37d74b9955db340772c8d8810617a85fbb10eec4"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "ad94a2f14afc3f2dfe9743027860c28a"
SRC_URI[sha256sum] = "4f62647772d37d27921a77caf6e02c51fb207c5a1d604b0b3047a92d0163d4b9"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "120c2267e1960c03a22531c2d5bfe1d87d401ad9"
SRCREV = "766eaface63b98a248d49d6b70f367e9eebb8f95"

View File

@ -1,5 +0,0 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "7c3e94cd04603c3f81e50d47daf5bbc7"
SRC_URI[sha256sum] = "a8192ee70d8d3e9944a8d8f03521e3abf6beb7f6de1bf2d80871dfc4d9bd2a2a"

View File

@ -0,0 +1,5 @@
require qt5-${PV}.inc
require ${PN}.inc
SRC_URI[md5sum] = "d01c6b837db4a6dee69a3f0352b37e18"
SRC_URI[sha256sum] = "bed7b5edd8efc3d5b45c60b5ed949aec6a4daadb5f3bd9029467e90c4ef566d2"

View File

@ -1,4 +1,4 @@
require qt5-git.inc
require ${PN}.inc
SRCREV = "97f266a006d82cc8554915cba6bf767b93d71a06"
SRCREV = "f73a75f92a2e6036bbc183d7f63bfd8f42e8abc6"