diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-16 13:15:26 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-08-18 12:07:34 +0200 |
commit | 18741e483851e1a6aae79992b130aee34ad48879 (patch) | |
tree | c6523af371af79a48d726578217d6b3b1570beb0 /recipes-qt/qt5/qtbase | |
parent | d2c05c81e8230358dca80cf9df67e49f9f672a29 (diff) | |
download | meta-qt5-18741e483851e1a6aae79992b130aee34ad48879.tar.gz |
recipes-git: upgrade to 5.5
* based on my WIP patch + fixes from John Mullen
* I was trying to get rhid of 0003-Add-external-hostbindir-option.patch
and 0010-Add-external-hostbindir-option-for-native-sdk.patch by using
upstream configure parameter added in some previous version, but I've
failed, so now good-old -external-hostbindir parameter is back
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
15 files changed, 175 insertions, 298 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 0f6bcbe7..1997d0db 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ec414ca0df1ec459b5abd753cf0d730572715e17 Mon Sep 17 00:00:00 2001 | 1 | From b8b9732948ede2b27304eed7f1d78aed16a4eeb7 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH 01/12] Add linux-oe-g++ platform | 4 | Subject: [PATCH 1/7] Add linux-oe-g++ platform |
5 | 5 | ||
6 | * This qmake.conf unlike other platforms reads most variables from | 6 | * This qmake.conf unlike other platforms reads most variables from |
7 | shell environment, because it's easier for qt recipes to export | 7 | shell environment, because it's easier for qt recipes to export |
@@ -43,19 +43,19 @@ Upstream-Status: Inappropriate [embedded specific] | |||
43 | Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c | 43 | Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c |
44 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 44 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
45 | --- | 45 | --- |
46 | configure | 66 ++++++++++++++++------- | 46 | configure | 70 +++++++++++++++--------- |
47 | mkspecs/features/configure.prf | 4 +- | 47 | mkspecs/features/configure.prf | 4 +- |
48 | mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ | 48 | mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++ |
49 | mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ | 49 | mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ |
50 | 4 files changed, 188 insertions(+), 22 deletions(-) | 50 | 4 files changed, 186 insertions(+), 28 deletions(-) |
51 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf | 51 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf |
52 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h | 52 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h |
53 | 53 | ||
54 | diff --git a/configure b/configure | 54 | diff --git a/configure b/configure |
55 | index 6ce6753..0a00d6d 100755 | 55 | index 7251e8e..8093782 100755 |
56 | --- a/configure | 56 | --- a/configure |
57 | +++ b/configure | 57 | +++ b/configure |
58 | @@ -316,6 +316,16 @@ getQMakeConf() | 58 | @@ -342,6 +342,16 @@ getQMakeConf() |
59 | getSingleQMakeVariable "$1" "$specvals" | 59 | getSingleQMakeVariable "$1" "$specvals" |
60 | } | 60 | } |
61 | 61 | ||
@@ -72,7 +72,7 @@ index 6ce6753..0a00d6d 100755 | |||
72 | getXQMakeConf() | 72 | getXQMakeConf() |
73 | { | 73 | { |
74 | if [ -z "$xspecvals" ]; then | 74 | if [ -z "$xspecvals" ]; then |
75 | @@ -325,6 +335,16 @@ getXQMakeConf() | 75 | @@ -351,6 +361,16 @@ getXQMakeConf() |
76 | getSingleQMakeVariable "$1" "$xspecvals" | 76 | getSingleQMakeVariable "$1" "$xspecvals" |
77 | } | 77 | } |
78 | 78 | ||
@@ -89,37 +89,38 @@ index 6ce6753..0a00d6d 100755 | |||
89 | compilerSupportsFlag() | 89 | compilerSupportsFlag() |
90 | { | 90 | { |
91 | cat >conftest.cpp <<EOF | 91 | cat >conftest.cpp <<EOF |
92 | @@ -541,21 +561,19 @@ fi | 92 | @@ -564,24 +584,14 @@ fi |
93 | # initalize variables | 93 | # initalize variables |
94 | #------------------------------------------------------------------------------- | 94 | #------------------------------------------------------------------------------- |
95 | 95 | ||
96 | -SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" | 96 | -SYSTEM_VARIABLES="AR RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" |
97 | -for varname in $SYSTEM_VARIABLES; do | 97 | -for varname in $SYSTEM_VARIABLES; do |
98 | +# Export all OE variables for qmake.conf from shell env to QMakeVars | 98 | +# Export all OE variables for qmake.conf from shell env to QMakeVars |
99 | +OE_VARIABLES="AR CC CFLAGS COMPILER CXX CXXFLAGS LDFLAGS LINK QT_CONFIG STRIP" | 99 | +OE_VARIABLES="AR CC CFLAGS COMPILER CXX CXXFLAGS LDFLAGS LINK QT_CONFIG STRIP" |
100 | +for varname in $OE_VARIABLES; do | 100 | +for varname in $OE_VARIABLES; do |
101 | qmakevarname="${varname}" | 101 | qmakevarname="${varname}" |
102 | - qmakecmdargs="" | ||
102 | - # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS | 103 | - # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS |
103 | - if [ "${varname}" = "LDFLAGS" ]; then | 104 | - if [ "${varname}" = "LDFLAGS" ]; then |
104 | - qmakevarname="LFLAGS" | 105 | - qmakevarname="LFLAGS" |
105 | - elif [ "${varname}" = "LD" ]; then | 106 | - elif [ "${varname}" = "LD" ]; then |
106 | - qmakevarname="LINK" | 107 | - qmakevarname="LINK" |
108 | - elif [ "${varname}" = "AR" ]; then | ||
109 | - # QMAKE_AR needs to be set to "/path/to/ar cqs" but the | ||
110 | - # environment variable will be set to the command only so we | ||
111 | - # need to append " cqs" for autoconf compatibility | ||
112 | - qmakecmdargs=" cqs" | ||
107 | - fi | 113 | - fi |
108 | cmd=`echo \ | 114 | cmd=`echo \ |
109 | -'if [ -n "\$'${varname}'" ]; then | 115 | -'if [ -n "\$'${varname}'" ]; then |
110 | - QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" | 116 | - QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}${qmakecmdargs}'" |
111 | +'if [ -n "\$OE_QMAKE_'${varname}'" ]; then | 117 | +'if [ -n "\$OE_QMAKE_'${varname}'" ]; then |
112 | + QMakeVar set OE_QMAKE_'${qmakevarname}' "\$OE_QMAKE_'${varname}'" | 118 | + QMakeVar set OE_QMAKE_'${qmakevarname}' "\$OE_QMAKE_'${varname}'" |
113 | +# echo "Exporting OE_QMAKE_'${qmakevarname}' value=\"\$OE_QMAKE_'${varname}'\"" >&2 | 119 | +# echo "Exporting OE_QMAKE_'${qmakevarname}' value=\"\$OE_QMAKE_'${varname}'\"" >&2 |
114 | fi'` | 120 | fi'` |
115 | eval "$cmd" | 121 | eval "$cmd" |
116 | done | 122 | done |
117 | + | 123 | @@ -3335,7 +3345,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then |
118 | +SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" | ||
119 | # Use CC/CXX to run config.tests | ||
120 | mkdir -p "$outpath/config.tests" | ||
121 | rm -f "$outpath/config.tests/.qmake.cache" | ||
122 | @@ -3178,7 +3196,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then | ||
123 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no | 124 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no |
124 | fi | 125 | fi |
125 | 126 | ||
@@ -128,7 +129,7 @@ index 6ce6753..0a00d6d 100755 | |||
128 | 129 | ||
129 | TEST_COMPILER=$QMAKE_CONF_COMPILER | 130 | TEST_COMPILER=$QMAKE_CONF_COMPILER |
130 | 131 | ||
131 | @@ -3216,7 +3234,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then | 132 | @@ -3392,7 +3402,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then |
132 | exit 1 | 133 | exit 1 |
133 | fi | 134 | fi |
134 | fi | 135 | fi |
@@ -137,7 +138,7 @@ index 6ce6753..0a00d6d 100755 | |||
137 | 138 | ||
138 | GCC_MACHINE_DUMP= | 139 | GCC_MACHINE_DUMP= |
139 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac | 140 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac |
140 | @@ -3687,6 +3705,14 @@ setBootstrapVariable() | 141 | @@ -3894,6 +3904,14 @@ setBootstrapVariable() |
141 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" | 142 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" |
142 | } | 143 | } |
143 | 144 | ||
@@ -152,7 +153,7 @@ index 6ce6753..0a00d6d 100755 | |||
152 | # build qmake | 153 | # build qmake |
153 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 154 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
154 | echo "Creating qmake..." | 155 | echo "Creating qmake..." |
155 | @@ -3725,14 +3751,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 156 | @@ -3932,14 +3950,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
156 | fi | 157 | fi |
157 | 158 | ||
158 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= | 159 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= |
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 69e3fdb9..93571abd 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From f681cc3a7cb36e2bcc5e26e767236e86a5d49841 Mon Sep 17 00:00:00 2001 | 1 | From c8d9a59b03bf53838118f0ddf599d554a4fcf4c6 Mon Sep 17 00:00:00 2001 |
2 | From: Holger Freyther <zecke@selfish.org> | 2 | From: Holger Freyther <zecke@selfish.org> |
3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 | 3 | Date: Wed, 26 Sep 2012 17:22:30 +0200 |
4 | Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside | 4 | Subject: [PATCH 2/7] qlibraryinfo: allow to set qt.conf from the outside using |
5 | using the environment | 5 | the environment |
6 | 6 | ||
7 | Allow to set a qt.conf from the outside using the environment. This allows | 7 | Allow to set a qt.conf from the outside using the environment. This allows |
8 | to inject new prefixes and other paths into qmake. This is needed when using | 8 | to inject new prefixes and other paths into qmake. This is needed when using |
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
19 | 1 file changed, 4 insertions(+), 1 deletion(-) | 19 | 1 file changed, 4 insertions(+), 1 deletion(-) |
20 | 20 | ||
21 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | 21 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp |
22 | index d66007b..91ca643 100644 | 22 | index 2912e68..f663c88 100644 |
23 | --- a/src/corelib/global/qlibraryinfo.cpp | 23 | --- a/src/corelib/global/qlibraryinfo.cpp |
24 | +++ b/src/corelib/global/qlibraryinfo.cpp | 24 | +++ b/src/corelib/global/qlibraryinfo.cpp |
25 | @@ -138,7 +138,10 @@ QLibrarySettings::QLibrarySettings() | 25 | @@ -157,7 +157,10 @@ void QLibrarySettings::load() |
26 | 26 | ||
27 | QSettings *QLibraryInfoPrivate::findConfiguration() | 27 | QSettings *QLibraryInfoPrivate::findConfiguration() |
28 | { | 28 | { |
@@ -31,9 +31,9 @@ index d66007b..91ca643 100644 | |||
31 | + QString qtconfig = QFile::decodeName(config); | 31 | + QString qtconfig = QFile::decodeName(config); |
32 | + if(!QFile::exists(qtconfig)) | 32 | + if(!QFile::exists(qtconfig)) |
33 | + qtconfig = QStringLiteral(":/qt/etc/qt.conf"); | 33 | + qtconfig = QStringLiteral(":/qt/etc/qt.conf"); |
34 | #ifdef QT_BOOTSTRAPPED | 34 | if (QFile::exists(qtconfig)) |
35 | if(!QFile::exists(qtconfig)) | 35 | return new QSettings(qtconfig, QSettings::IniFormat); |
36 | qtconfig = qt_libraryInfoFile(); | 36 | #ifdef QT_BUILD_QMAKE |
37 | -- | 37 | -- |
38 | 2.4.2 | 38 | 2.4.2 |
39 | 39 | ||
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index af224060..4a8cdbbd 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 47b88e13ed8f4bb3bd34ac24dcf4b908dcba6753 Mon Sep 17 00:00:00 2001 | 1 | From d2212dd3c5acf7d3541f19470e688095a20d956c Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH 03/12] Add -external-hostbindir option | 4 | Subject: Add -external-hostbindir option |
5 | 5 | ||
6 | * when cross-compiling it's sometimes useful to use existing tools from machine | 6 | * when cross-compiling it's sometimes useful to use existing tools from machine |
7 | (or in OpenEmbedded built with separate native recipe) when building for target | 7 | (or in OpenEmbedded built with separate native recipe) when building for target |
@@ -23,21 +23,24 @@ Upstream-Status: Pending | |||
23 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 23 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
24 | Signed-off-by: Simon Busch <morphis@gravedo.de> | 24 | Signed-off-by: Simon Busch <morphis@gravedo.de> |
25 | Signed-off-by: Jonathan Liu <net147@gmail.com> | 25 | Signed-off-by: Jonathan Liu <net147@gmail.com> |
26 | |||
27 | Conflicts: | ||
28 | configure | ||
26 | --- | 29 | --- |
27 | configure | 15 +++++++++++++++ | 30 | configure | 14 ++++++++++++++ |
28 | mkspecs/features/qt_functions.prf | 6 +++++- | 31 | mkspecs/features/qt_functions.prf | 6 +++++- |
29 | mkspecs/features/qt_tool.prf | 4 ++-- | 32 | mkspecs/features/qt_tool.prf | 4 ++-- |
30 | qtbase.pro | 13 ++++++++++--- | 33 | qtbase.pro | 13 ++++++++++--- |
31 | src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- | 34 | src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- |
32 | src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- | 35 | src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- |
33 | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- | 36 | src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- |
34 | 7 files changed, 38 insertions(+), 12 deletions(-) | 37 | 7 files changed, 37 insertions(+), 12 deletions(-) |
35 | 38 | ||
36 | diff --git a/configure b/configure | 39 | diff --git a/configure b/configure |
37 | index 0a00d6d..ad5f4cd 100755 | 40 | index 43c4dab..ffb69df 100755 |
38 | --- a/configure | 41 | --- a/configure |
39 | +++ b/configure | 42 | +++ b/configure |
40 | @@ -770,6 +770,7 @@ QT_HOST_BINS= | 43 | @@ -806,6 +806,7 @@ QT_HOST_BINS= |
41 | QT_HOST_LIBS= | 44 | QT_HOST_LIBS= |
42 | QT_HOST_DATA= | 45 | QT_HOST_DATA= |
43 | QT_EXT_PREFIX= | 46 | QT_EXT_PREFIX= |
@@ -45,7 +48,7 @@ index 0a00d6d..ad5f4cd 100755 | |||
45 | 48 | ||
46 | #flags for SQL drivers | 49 | #flags for SQL drivers |
47 | QT_CFLAGS_PSQL= | 50 | QT_CFLAGS_PSQL= |
48 | @@ -889,6 +890,7 @@ while [ "$#" -gt 0 ]; do | 51 | @@ -925,6 +926,7 @@ while [ "$#" -gt 0 ]; do |
49 | -testsdir| \ | 52 | -testsdir| \ |
50 | -hostdatadir| \ | 53 | -hostdatadir| \ |
51 | -hostbindir| \ | 54 | -hostbindir| \ |
@@ -53,7 +56,7 @@ index 0a00d6d..ad5f4cd 100755 | |||
53 | -hostlibdir| \ | 56 | -hostlibdir| \ |
54 | -extprefix| \ | 57 | -extprefix| \ |
55 | -sysroot| \ | 58 | -sysroot| \ |
56 | @@ -1107,6 +1109,9 @@ while [ "$#" -gt 0 ]; do | 59 | @@ -1154,6 +1156,9 @@ while [ "$#" -gt 0 ]; do |
57 | extprefix) | 60 | extprefix) |
58 | QT_EXT_PREFIX="$VAL" | 61 | QT_EXT_PREFIX="$VAL" |
59 | ;; | 62 | ;; |
@@ -63,7 +66,7 @@ index 0a00d6d..ad5f4cd 100755 | |||
63 | pkg-config) | 66 | pkg-config) |
64 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then | 67 | if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then |
65 | CFG_PKGCONFIG="$VAL" | 68 | CFG_PKGCONFIG="$VAL" |
66 | @@ -2270,6 +2275,10 @@ Installation options: | 69 | @@ -2380,6 +2385,10 @@ Installation options: |
67 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> | 70 | -hostdatadir <dir> . Data used by qmake will be installed to <dir> |
68 | (default HOSTPREFIX) | 71 | (default HOSTPREFIX) |
69 | 72 | ||
@@ -74,7 +77,7 @@ index 0a00d6d..ad5f4cd 100755 | |||
74 | Configure options: | 77 | Configure options: |
75 | 78 | ||
76 | The defaults (*) are usually acceptable. A plus (+) denotes a default value | 79 | The defaults (*) are usually acceptable. A plus (+) denotes a default value |
77 | @@ -2949,6 +2958,11 @@ fi | 80 | @@ -3095,6 +3104,11 @@ fi |
78 | # command line and environment validation | 81 | # command line and environment validation |
79 | #------------------------------------------------------------------------------- | 82 | #------------------------------------------------------------------------------- |
80 | 83 | ||
@@ -86,16 +89,8 @@ index 0a00d6d..ad5f4cd 100755 | |||
86 | # update QT_CONFIG to show our current predefined configuration | 89 | # update QT_CONFIG to show our current predefined configuration |
87 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h | 90 | CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h |
88 | case "$CFG_QCONFIG" in | 91 | case "$CFG_QCONFIG" in |
89 | @@ -3649,6 +3663,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { | ||
90 | "qt_hbinpath=$QT_HOST_BINS", | ||
91 | "qt_hlibpath=$QT_HOST_LIBS", | ||
92 | "qt_hdatpath=$QT_HOST_DATA", | ||
93 | + "qt_ebinpath=$QT_EXTERNAL_HOST_BINS", | ||
94 | "qt_targspec=$shortxspec", | ||
95 | "qt_hostspec=$shortspec", | ||
96 | #endif | ||
97 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 92 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
98 | index 79b4eab..8c6913e 100644 | 93 | index a1c4996..fca679c 100644 |
99 | --- a/mkspecs/features/qt_functions.prf | 94 | --- a/mkspecs/features/qt_functions.prf |
100 | +++ b/mkspecs/features/qt_functions.prf | 95 | +++ b/mkspecs/features/qt_functions.prf |
101 | @@ -198,7 +198,11 @@ defineTest(qtAddRpathLink) { | 96 | @@ -198,7 +198,11 @@ defineTest(qtAddRpathLink) { |
@@ -130,10 +125,10 @@ index 1d3e88c..9b26adf 100644 | |||
130 | 125 | ||
131 | !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) | 126 | !host_build|!force_bootstrap: MODULE_DEPENDS = $$replace(QT, -private$, _private) |
132 | diff --git a/qtbase.pro b/qtbase.pro | 127 | diff --git a/qtbase.pro b/qtbase.pro |
133 | index 6d0de44..ddf7478 100644 | 128 | index 51e8fb8..9806769 100644 |
134 | --- a/qtbase.pro | 129 | --- a/qtbase.pro |
135 | +++ b/qtbase.pro | 130 | +++ b/qtbase.pro |
136 | @@ -69,18 +69,25 @@ CONFIG -= qt | 131 | @@ -37,12 +37,16 @@ CONFIG -= qt |
137 | 132 | ||
138 | ### installations #### | 133 | ### installations #### |
139 | 134 | ||
@@ -153,6 +148,7 @@ index 6d0de44..ddf7478 100644 | |||
153 | } | 148 | } |
154 | INSTALLS += qmake | 149 | INSTALLS += qmake |
155 | 150 | ||
151 | @@ -54,6 +58,9 @@ exists($$licheck.files): INSTALLS += licheck | ||
156 | #syncqt | 152 | #syncqt |
157 | syncqt.path = $$[QT_HOST_BINS] | 153 | syncqt.path = $$[QT_HOST_BINS] |
158 | syncqt.files = $$PWD/bin/syncqt.pl | 154 | syncqt.files = $$PWD/bin/syncqt.pl |
@@ -163,7 +159,7 @@ index 6d0de44..ddf7478 100644 | |||
163 | 159 | ||
164 | # If we are doing a prefix build, create a "module" pri which enables | 160 | # If we are doing a prefix build, create a "module" pri which enables |
165 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in | 161 | diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in |
166 | index 65fd1f9..457518b 100644 | 162 | index 48d5f21..6482022 100644 |
167 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in | 163 | --- a/src/corelib/Qt5CoreConfigExtras.cmake.in |
168 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in | 164 | +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in |
169 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) | 165 | @@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) |
@@ -229,5 +225,5 @@ index 99d87e2..5621dc0 100644 | |||
229 | _qt5_Widgets_check_file_exists(${imported_location}) | 225 | _qt5_Widgets_check_file_exists(${imported_location}) |
230 | 226 | ||
231 | -- | 227 | -- |
232 | 2.4.2 | 228 | 2.2.2 |
233 | 229 | ||
diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index 0cd6296b..4bc6fdd8 100644 --- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 3f0f3ded0b4a85a04a0c492e33d8517e598ae08e Mon Sep 17 00:00:00 2001 | 1 | From 3b289cf76a5ce78d94ee022af7d92152f5875372 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 | 3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 |
4 | Subject: [PATCH 04/12] qt_module: Fix pkgconfig and libtool replacements | 4 | Subject: [PATCH 3/7] qt_module: Fix pkgconfig and libtool replacements |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -63,29 +63,29 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
63 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | 63 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> |
64 | --- | 64 | --- |
65 | mkspecs/features/qt_common.prf | 2 +- | 65 | mkspecs/features/qt_common.prf | 2 +- |
66 | mkspecs/features/qt_module.prf | 15 +++++++++++++++ | 66 | mkspecs/features/qt_module.prf | 10 ++++++++++ |
67 | 2 files changed, 16 insertions(+), 1 deletion(-) | 67 | 2 files changed, 11 insertions(+), 1 deletion(-) |
68 | 68 | ||
69 | diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf | 69 | diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf |
70 | index eb65e73..4db40d0 100644 | 70 | index 5861941..474827c 100644 |
71 | --- a/mkspecs/features/qt_common.prf | 71 | --- a/mkspecs/features/qt_common.prf |
72 | +++ b/mkspecs/features/qt_common.prf | 72 | +++ b/mkspecs/features/qt_common.prf |
73 | @@ -33,7 +33,7 @@ contains(TEMPLATE, .*lib) { | 73 | @@ -36,7 +36,7 @@ contains(TEMPLATE, .*lib) { |
74 | lib_replace.replace = | 74 | lib_replace.replace = |
75 | } else { | 75 | } else { |
76 | lib_replace.match = $$rplbase/lib | 76 | lib_replace.match = $$rplbase/lib |
77 | - lib_replace.replace = $$qt_libdir | 77 | - lib_replace.replace = $$qqt_libdir |
78 | + lib_replace.replace = "\$$\\{libdir}" | 78 | + lib_replace.replace = "\$$\\{libdir}" |
79 | } | 79 | } |
80 | lib_replace.CONFIG = path | 80 | lib_replace.CONFIG = path |
81 | QMAKE_PRL_INSTALL_REPLACE += lib_replace | 81 | QMAKE_PRL_INSTALL_REPLACE += lib_replace |
82 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf | 82 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf |
83 | index 2437efe..2e1f014 100644 | 83 | index 5412f37..5ab348a 100644 |
84 | --- a/mkspecs/features/qt_module.prf | 84 | --- a/mkspecs/features/qt_module.prf |
85 | +++ b/mkspecs/features/qt_module.prf | 85 | +++ b/mkspecs/features/qt_module.prf |
86 | @@ -192,10 +192,25 @@ unix|mingw { | 86 | @@ -214,6 +214,11 @@ unix|mingw { |
87 | QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module | 87 | pclib_replace.CONFIG = path |
88 | QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace | 88 | QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace |
89 | 89 | ||
90 | + pkgconfig_include_replace.match = $$rplbase/include | 90 | + pkgconfig_include_replace.match = $$rplbase/include |
91 | + pkgconfig_include_replace.replace = "\$$\\{includedir}" | 91 | + pkgconfig_include_replace.replace = "\$$\\{includedir}" |
@@ -94,13 +94,11 @@ index 2437efe..2e1f014 100644 | |||
94 | + | 94 | + |
95 | unix { | 95 | unix { |
96 | CONFIG += create_libtool explicitlib | 96 | CONFIG += create_libtool explicitlib |
97 | QMAKE_LIBTOOL_LIBDIR = $$qt_libdir | 97 | host_build: \ |
98 | QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace | 98 | @@ -225,6 +230,11 @@ unix|mingw { |
99 | + # add '=' as sysroot in .la files | 99 | ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR |
100 | + lafile_replace.match = "-L\$${libdir}" | 100 | ltlib_replace.CONFIG = path |
101 | + lafile_replace.replace = "-L=\$$\\{libdir}" | 101 | QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace |
102 | + lafile_replace.CONFIG = path | ||
103 | + QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace | ||
104 | + # drop -L/usr/lib in .prl files | 102 | + # drop -L/usr/lib in .prl files |
105 | + prl_replace.match = "-L\$${libdir}" | 103 | + prl_replace.match = "-L\$${libdir}" |
106 | + prl_replace.replace = "" | 104 | + prl_replace.replace = "" |
diff --git a/recipes-qt/qt5/qtbase/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch deleted file mode 100644 index c373a7f2..00000000 --- a/recipes-qt/qt5/qtbase/0005-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch +++ /dev/null | |||
@@ -1,97 +0,0 @@ | |||
1 | From 9c07ef1c5a56deda170a3946a7c285d534d59fda Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Mon, 21 Apr 2014 19:22:04 +0200 | ||
4 | Subject: [PATCH 05/12] Revert "eglfs: Print the chosen config in debug mode" | ||
5 | |||
6 | With this change the build is failing with: | ||
7 | | In file included from /OE/build/oe-core/tmp-glibc/sysroots/qemux86-64/usr/include/EGL/eglplatform.h:118:0, | ||
8 | | from /OE/build/oe-core/tmp-glibc/sysroots/qemux86-64/usr/include/EGL/egl.h:36, | ||
9 | | from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformcontext_p.h:51, | ||
10 | | from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformcontext.cpp:34: | ||
11 | | ../../include/QtCore/../../../git/src/corelib/io/qtextstream.h:72:10: error: expected identifier before 'int' | ||
12 | | enum Status { | ||
13 | | ^ | ||
14 | | In file included from ../../include/QtCore/qtextstream.h:1:0, | ||
15 | | from ../../include/QtCore/../../../git/src/corelib/io/qdebug.h:42, | ||
16 | | from ../../include/QtCore/qdebug.h:1, | ||
17 | | from ../../include/QtCore/QDebug:1, | ||
18 | | from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformcontext.cpp:40: | ||
19 | | ../../include/QtCore/../../../git/src/corelib/io/qtextstream.h:72:17: error: expected unqualified-id before '{' token | ||
20 | | enum Status { | ||
21 | | ^ | ||
22 | | Makefile:3896: recipe for target '.obj/qeglplatformcontext.o' failed | ||
23 | | make[2]: *** [.obj/qeglplatformcontext.o] Error 1 | ||
24 | | make[2]: *** Waiting for unfinished jobs.... | ||
25 | | /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformintegration.cpp:196:5: error: 'Display' redeclared as different kind of symbol | ||
26 | | Display | ||
27 | | ^ | ||
28 | | In file included from /OE/build/oe-core/tmp-glibc/sysroots/qemux86-64/usr/include/EGL/eglplatform.h:118:0, | ||
29 | | from /OE/build/oe-core/tmp-glibc/sysroots/qemux86-64/usr/include/EGL/egl.h:36, | ||
30 | | from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformintegration_p.h:51, | ||
31 | | from /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformintegration.cpp:55: | ||
32 | | /OE/build/oe-core/tmp-glibc/sysroots/qemux86-64/usr/include/X11/Xlib.h:499:26: note: previous declaration 'typedef struct _XDisplay Display' | ||
33 | | typedef struct _XDisplay Display; | ||
34 | | ^ | ||
35 | | /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformintegration.cpp: In member function 'virtual void* QEGLPlatformIntegration::nativeResourceForScreen(const QByteArray&, QScreen*)': | ||
36 | | /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/qtbase/5.3.0+5.4.0-alpha1+gitAUTOINC+8456adf0ee-r0/git/src/platformsupport/eglconvenience/qeglplatformintegration.cpp:239:17: error: expected primary-expression before ':' token | ||
37 | | case Display: | ||
38 | | ^ | ||
39 | | Makefile:5486: recipe for target '.obj/qeglplatformintegration.o' failed | ||
40 | |||
41 | This reverts commit dc685cf6331f5fb46285cf10d6464c2ecf41f73e. | ||
42 | |||
43 | Will be partially resolved in newer revision with: | ||
44 | https://codereview.qt-project.org/96220 | ||
45 | |||
46 | Change-Id: I7a6a926b7525d4f137824c71f2ec8cd089c21f13 | ||
47 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
48 | --- | ||
49 | src/platformsupport/eglconvenience/qeglconvenience.cpp | 4 +++- | ||
50 | src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 7 ------- | ||
51 | 2 files changed, 3 insertions(+), 8 deletions(-) | ||
52 | |||
53 | diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp | ||
54 | index c1a491c..7a0fc87 100644 | ||
55 | --- a/src/platformsupport/eglconvenience/qeglconvenience.cpp | ||
56 | +++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp | ||
57 | @@ -443,9 +443,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) | ||
58 | for (index = 0; attrs[index].attr != -1; ++index) { | ||
59 | EGLint value; | ||
60 | if (eglGetConfigAttrib(display, config, attrs[index].attr, &value)) { | ||
61 | - qDebug("\t%s: %d", attrs[index].name, (int)value); | ||
62 | + qWarning("\t%s: %d\n", attrs[index].name, (int)value); | ||
63 | } | ||
64 | } | ||
65 | + | ||
66 | + qWarning("\n"); | ||
67 | } | ||
68 | |||
69 | #ifdef Q_OS_UNIX | ||
70 | diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp | ||
71 | index 7cc3300..ccbd974a 100644 | ||
72 | --- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp | ||
73 | +++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp | ||
74 | @@ -37,7 +37,6 @@ | ||
75 | #include <qpa/qplatformwindow.h> | ||
76 | #include <QOpenGLContext> | ||
77 | #include <QtPlatformHeaders/QEGLNativeContext> | ||
78 | -#include <QDebug> | ||
79 | |||
80 | QT_BEGIN_NAMESPACE | ||
81 | |||
82 | @@ -181,12 +180,6 @@ void QEGLPlatformContext::init(const QSurfaceFormat &format, QPlatformOpenGLCont | ||
83 | return; | ||
84 | } | ||
85 | |||
86 | - static const bool printConfig = qgetenv("QT_QPA_EGLFS_DEBUG").toInt(); | ||
87 | - if (printConfig) { | ||
88 | - qDebug() << "Created context for format" << format << "with config:"; | ||
89 | - q_printEglConfig(m_eglDisplay, m_eglConfig); | ||
90 | - } | ||
91 | - | ||
92 | updateFormatFromGL(); | ||
93 | } | ||
94 | |||
95 | -- | ||
96 | 2.4.2 | ||
97 | |||
diff --git a/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch index 6a056df8..8d1ed4ea 100644 --- a/recipes-qt/qt5/qtbase/0006-qeglplatformintegration-Undefine-CursorShape-from-X..patch +++ b/recipes-qt/qt5/qtbase/0005-qeglplatformintegration-Undefine-CursorShape-from-X..patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 4699b5b9af628e120db9ab26e25bc7069d35562a Mon Sep 17 00:00:00 2001 | 1 | From 232e2913168fd150bab4071bd57f8fef8d431eb4 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Wed, 19 Mar 2014 18:32:28 +0100 | 3 | Date: Wed, 19 Mar 2014 18:32:28 +0100 |
4 | Subject: [PATCH 06/12] qeglplatformintegration: Undefine CursorShape from X.h | 4 | Subject: [PATCH 4/7] qeglplatformintegration: Undefine CursorShape from X.h |
5 | 5 | ||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
7 | --- | 7 | --- |
@@ -9,7 +9,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
9 | 1 file changed, 6 insertions(+) | 9 | 1 file changed, 6 insertions(+) |
10 | 10 | ||
11 | diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 11 | diff --git a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h |
12 | index 2b5d5f5..a0aab03 100644 | 12 | index 42fbf8c..8950f2d 100644 |
13 | --- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 13 | --- a/src/platformsupport/eglconvenience/qeglplatformintegration_p.h |
14 | +++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h | 14 | +++ b/src/platformsupport/eglconvenience/qeglplatformintegration_p.h |
15 | @@ -50,6 +50,12 @@ | 15 | @@ -50,6 +50,12 @@ |
@@ -24,7 +24,7 @@ index 2b5d5f5..a0aab03 100644 | |||
24 | + | 24 | + |
25 | QT_BEGIN_NAMESPACE | 25 | QT_BEGIN_NAMESPACE |
26 | 26 | ||
27 | class QEGLPlatformScreen; | 27 | class QEGLPlatformWindow; |
28 | -- | 28 | -- |
29 | 2.4.2 | 29 | 2.4.2 |
30 | 30 | ||
diff --git a/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch new file mode 100644 index 00000000..0a6b92d4 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0006-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 7b080f568fac5001f272a11f56968a3c65793077 Mon Sep 17 00:00:00 2001 | ||
2 | From: Denys Dmytriyenko <denys@ti.com> | ||
3 | Date: Mon, 11 Nov 2013 20:27:30 -0500 | ||
4 | Subject: [PATCH 5/7] configure: bump path length from 256 to 512 characters | ||
5 | |||
6 | Increase the path length that gets hardcoded into generated config.cpp file | ||
7 | from 256 to 512 characters, as nativesdk path can be quite long. | ||
8 | |||
9 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | ||
10 | --- | ||
11 | configure | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/configure b/configure | ||
15 | index 8093782..43c4dab 100755 | ||
16 | --- a/configure | ||
17 | +++ b/configure | ||
18 | @@ -3834,7 +3834,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ | ||
19 | static const char qt_configure_installation [12+11] = "qt_instdate=2012-12-20"; | ||
20 | |||
21 | /* Installation Info */ | ||
22 | -static const char qt_configure_prefix_path_str [256 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; | ||
23 | +static const char qt_configure_prefix_path_str [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX"; | ||
24 | #ifdef QT_BUILD_QMAKE | ||
25 | static const char qt_configure_ext_prefix_path_str [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX"; | ||
26 | static const char qt_configure_host_prefix_path_str [256 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX"; | ||
27 | -- | ||
28 | 2.4.2 | ||
29 | |||
diff --git a/recipes-qt/qt5/qtbase/0007-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0007-configure-bump-path-length-from-256-to-512-character.patch deleted file mode 100644 index 4cdad004..00000000 --- a/recipes-qt/qt5/qtbase/0007-configure-bump-path-length-from-256-to-512-character.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 6ddd04ae7fc935b91384d99bf1c16532b91ac76b Mon Sep 17 00:00:00 2001 | ||
2 | From: Denys Dmytriyenko <denys@ti.com> | ||
3 | Date: Mon, 11 Nov 2013 20:27:30 -0500 | ||
4 | Subject: [PATCH 07/12] configure: bump path length from 256 to 512 characters | ||
5 | |||
6 | Increase the path length that gets hardcoded into generated config.cpp file | ||
7 | from 256 to 512 characters, as nativesdk path can be quite long. | ||
8 | |||
9 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | ||
10 | --- | ||
11 | configure | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/configure b/configure | ||
15 | index ad5f4cd..c19ff6a 100755 | ||
16 | --- a/configure | ||
17 | +++ b/configure | ||
18 | @@ -3627,7 +3627,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ | ||
19 | static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`"; | ||
20 | |||
21 | /* Installation Info */ | ||
22 | -static const char qt_configure_prefix_path_strs[][256 + 12] = { | ||
23 | +static const char qt_configure_prefix_path_strs[][512 + 12] = { | ||
24 | #ifndef QT_BUILD_QMAKE | ||
25 | "qt_prfxpath=$QT_SYSROOT_PREFIX", | ||
26 | "qt_docspath=$QT_SYSROOT_DOCS", | ||
27 | -- | ||
28 | 2.4.2 | ||
29 | |||
diff --git a/recipes-qt/qt5/qtbase/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch index 7f4171d4..dabbc1c3 100644 --- a/recipes-qt/qt5/qtbase/0008-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch +++ b/recipes-qt/qt5/qtbase/0007-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 5c0a8f073e7412d01e7f2ef05bbe06954fd39eaa Mon Sep 17 00:00:00 2001 | 1 | From 30d26b494bd5b77be6c4e4b41d8df7af5487ee4b Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Wed, 5 Feb 2014 18:35:08 +0100 | 3 | Date: Wed, 5 Feb 2014 18:35:08 +0100 |
4 | Subject: [PATCH 08/12] eglfs: fix egl error for platforms only supporting one | 4 | Subject: [PATCH 6/7] eglfs: fix egl error for platforms only supporting one |
5 | window/surface | 5 | window/surface |
6 | MIME-Version: 1.0 | 6 | MIME-Version: 1.0 |
7 | Content-Type: text/plain; charset=UTF-8 | 7 | Content-Type: text/plain; charset=UTF-8 |
@@ -27,10 +27,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
27 | 1 file changed, 15 insertions(+), 1 deletion(-) | 27 | 1 file changed, 15 insertions(+), 1 deletion(-) |
28 | 28 | ||
29 | diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp | 29 | diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp |
30 | index 39a3ef9..2c05979 100644 | 30 | index c0d51c9..bb4dc00 100644 |
31 | --- a/src/plugins/platforms/eglfs/qeglfswindow.cpp | 31 | --- a/src/plugins/platforms/eglfs/qeglfswindow.cpp |
32 | +++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp | 32 | +++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp |
33 | @@ -68,6 +68,15 @@ void QEglFSWindow::create() | 33 | @@ -69,6 +69,15 @@ void QEglFSWindow::create() |
34 | 34 | ||
35 | m_flags = Created; | 35 | m_flags = Created; |
36 | 36 | ||
@@ -46,7 +46,7 @@ index 39a3ef9..2c05979 100644 | |||
46 | if (window()->type() == Qt::Desktop) | 46 | if (window()->type() == Qt::Desktop) |
47 | return; | 47 | return; |
48 | 48 | ||
49 | @@ -81,7 +90,7 @@ void QEglFSWindow::create() | 49 | @@ -83,7 +92,7 @@ void QEglFSWindow::create() |
50 | return; | 50 | return; |
51 | } | 51 | } |
52 | 52 | ||
@@ -55,7 +55,7 @@ index 39a3ef9..2c05979 100644 | |||
55 | // We can have either a single OpenGL window or multiple raster windows. | 55 | // We can have either a single OpenGL window or multiple raster windows. |
56 | // Other combinations cannot work. | 56 | // Other combinations cannot work. |
57 | qFatal("EGLFS: OpenGL windows cannot be mixed with others."); | 57 | qFatal("EGLFS: OpenGL windows cannot be mixed with others."); |
58 | @@ -101,6 +110,11 @@ void QEglFSWindow::create() | 58 | @@ -103,6 +112,11 @@ void QEglFSWindow::create() |
59 | 59 | ||
60 | resetSurface(); | 60 | resetSurface(); |
61 | 61 | ||
diff --git a/recipes-qt/qt5/qtbase/0009-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0008-QOpenGLPaintDevice-sub-area-support.patch index 05110eac..c6cbaf69 100644 --- a/recipes-qt/qt5/qtbase/0009-QOpenGLPaintDevice-sub-area-support.patch +++ b/recipes-qt/qt5/qtbase/0008-QOpenGLPaintDevice-sub-area-support.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 3483a580cb9e5509cb59cd18b13a24c1a47a9224 Mon Sep 17 00:00:00 2001 | 1 | From fbcda470b5b64ab49a7a4c647e19bda623ce95b7 Mon Sep 17 00:00:00 2001 |
2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> | 2 | From: Jani Hautakangas <jani.hautakangas@ixonos.com> |
3 | Date: Thu, 16 May 2013 09:52:07 +0300 | 3 | Date: Thu, 16 May 2013 09:52:07 +0300 |
4 | Subject: [PATCH 09/12] QOpenGLPaintDevice sub-area support | 4 | Subject: [PATCH 7/7] QOpenGLPaintDevice sub-area support |
5 | 5 | ||
6 | Allows creating QOpenGLPaintDevice targetting sub-area | 6 | Allows creating QOpenGLPaintDevice targetting sub-area |
7 | of binded framebuffer. | 7 | of binded framebuffer. |
@@ -21,7 +21,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
21 | 6 files changed, 23 insertions(+), 3 deletions(-) | 21 | 6 files changed, 23 insertions(+), 3 deletions(-) |
22 | 22 | ||
23 | diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp | 23 | diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp |
24 | index a08d26f..cff3155 100644 | 24 | index c0657fe..395ec14 100644 |
25 | --- a/src/gui/opengl/qopenglpaintdevice.cpp | 25 | --- a/src/gui/opengl/qopenglpaintdevice.cpp |
26 | +++ b/src/gui/opengl/qopenglpaintdevice.cpp | 26 | +++ b/src/gui/opengl/qopenglpaintdevice.cpp |
27 | @@ -135,6 +135,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) | 27 | @@ -135,6 +135,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) |
@@ -50,7 +50,7 @@ index a08d26f..cff3155 100644 | |||
50 | Returns the pixel size of the paint device. | 50 | Returns the pixel size of the paint device. |
51 | 51 | ||
52 | diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h | 52 | diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h |
53 | index 10cee84..a6683c5 100644 | 53 | index 804e485..88b481a 100644 |
54 | --- a/src/gui/opengl/qopenglpaintdevice.h | 54 | --- a/src/gui/opengl/qopenglpaintdevice.h |
55 | +++ b/src/gui/opengl/qopenglpaintdevice.h | 55 | +++ b/src/gui/opengl/qopenglpaintdevice.h |
56 | @@ -53,12 +53,14 @@ public: | 56 | @@ -53,12 +53,14 @@ public: |
@@ -69,7 +69,7 @@ index 10cee84..a6683c5 100644 | |||
69 | void setSize(const QSize &size); | 69 | void setSize(const QSize &size); |
70 | void setDevicePixelRatio(qreal devicePixelRatio); | 70 | void setDevicePixelRatio(qreal devicePixelRatio); |
71 | diff --git a/src/gui/opengl/qopenglpaintdevice_p.h b/src/gui/opengl/qopenglpaintdevice_p.h | 71 | diff --git a/src/gui/opengl/qopenglpaintdevice_p.h b/src/gui/opengl/qopenglpaintdevice_p.h |
72 | index 0b01129..211f2f3 100644 | 72 | index 57d93ee..5b5c0d9 100644 |
73 | --- a/src/gui/opengl/qopenglpaintdevice_p.h | 73 | --- a/src/gui/opengl/qopenglpaintdevice_p.h |
74 | +++ b/src/gui/opengl/qopenglpaintdevice_p.h | 74 | +++ b/src/gui/opengl/qopenglpaintdevice_p.h |
75 | @@ -65,6 +65,7 @@ public: | 75 | @@ -65,6 +65,7 @@ public: |
@@ -81,10 +81,10 @@ index 0b01129..211f2f3 100644 | |||
81 | 81 | ||
82 | qreal dpmx; | 82 | qreal dpmx; |
83 | diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp | 83 | diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp |
84 | index 8eeaa31..e17520e 100644 | 84 | index a9a4ada..de3c518 100644 |
85 | --- a/src/gui/opengl/qopenglpaintengine.cpp | 85 | --- a/src/gui/opengl/qopenglpaintengine.cpp |
86 | +++ b/src/gui/opengl/qopenglpaintengine.cpp | 86 | +++ b/src/gui/opengl/qopenglpaintengine.cpp |
87 | @@ -2080,7 +2080,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) | 87 | @@ -2091,7 +2091,10 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev) |
88 | for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) | 88 | for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) |
89 | d->vertexAttributeArraysEnabledState[i] = false; | 89 | d->vertexAttributeArraysEnabledState[i] = false; |
90 | 90 | ||
@@ -95,7 +95,7 @@ index 8eeaa31..e17520e 100644 | |||
95 | d->width = sz.width(); | 95 | d->width = sz.width(); |
96 | d->height = sz.height(); | 96 | d->height = sz.height(); |
97 | d->mode = BrushDrawingMode; | 97 | d->mode = BrushDrawingMode; |
98 | @@ -2167,7 +2170,7 @@ void QOpenGL2PaintEngineEx::ensureActive() | 98 | @@ -2178,7 +2181,7 @@ void QOpenGL2PaintEngineEx::ensureActive() |
99 | d->device->ensureActiveTarget(); | 99 | d->device->ensureActiveTarget(); |
100 | 100 | ||
101 | d->transferMode(BrushDrawingMode); | 101 | d->transferMode(BrushDrawingMode); |
@@ -104,7 +104,7 @@ index 8eeaa31..e17520e 100644 | |||
104 | d->needsSync = false; | 104 | d->needsSync = false; |
105 | d->shaderManager->setDirty(); | 105 | d->shaderManager->setDirty(); |
106 | d->syncGlState(); | 106 | d->syncGlState(); |
107 | @@ -2209,6 +2212,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() | 107 | @@ -2220,6 +2223,7 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() |
108 | if (bounds == QRect(0, 0, width, height)) { | 108 | if (bounds == QRect(0, 0, width, height)) { |
109 | funcs.glDisable(GL_SCISSOR_TEST); | 109 | funcs.glDisable(GL_SCISSOR_TEST); |
110 | } else { | 110 | } else { |
@@ -112,7 +112,7 @@ index 8eeaa31..e17520e 100644 | |||
112 | funcs.glEnable(GL_SCISSOR_TEST); | 112 | funcs.glEnable(GL_SCISSOR_TEST); |
113 | setScissor(bounds); | 113 | setScissor(bounds); |
114 | } | 114 | } |
115 | @@ -2217,12 +2221,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() | 115 | @@ -2228,12 +2232,13 @@ void QOpenGL2PaintEngineExPrivate::updateClipScissorTest() |
116 | 116 | ||
117 | void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) | 117 | void QOpenGL2PaintEngineExPrivate::setScissor(const QRect &rect) |
118 | { | 118 | { |
@@ -128,7 +128,7 @@ index 8eeaa31..e17520e 100644 | |||
128 | 128 | ||
129 | funcs.glScissor(left, bottom, width, height); | 129 | funcs.glScissor(left, bottom, width, height); |
130 | diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h | 130 | diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h |
131 | index 9722ea3..07e3163 100644 | 131 | index 17be72b..43e88f6 100644 |
132 | --- a/src/gui/opengl/qopenglpaintengine_p.h | 132 | --- a/src/gui/opengl/qopenglpaintengine_p.h |
133 | +++ b/src/gui/opengl/qopenglpaintengine_p.h | 133 | +++ b/src/gui/opengl/qopenglpaintengine_p.h |
134 | @@ -264,6 +264,7 @@ public: | 134 | @@ -264,6 +264,7 @@ public: |
@@ -140,7 +140,7 @@ index 9722ea3..07e3163 100644 | |||
140 | QOpenGLContext *ctx; | 140 | QOpenGLContext *ctx; |
141 | EngineMode mode; | 141 | EngineMode mode; |
142 | diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp | 142 | diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp |
143 | index cd268cd..997bc35 100644 | 143 | index c179143..fad68d5 100644 |
144 | --- a/src/gui/opengl/qopengltextureglyphcache.cpp | 144 | --- a/src/gui/opengl/qopengltextureglyphcache.cpp |
145 | +++ b/src/gui/opengl/qopengltextureglyphcache.cpp | 145 | +++ b/src/gui/opengl/qopengltextureglyphcache.cpp |
146 | @@ -310,7 +310,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) | 146 | @@ -310,7 +310,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) |
diff --git a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch index b9d45178..dc802a78 100644 --- a/recipes-qt/qt5/qtbase/0011-Always-build-uic.patch +++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 14c4785ac0f01fa1d89d63601b9132add4ab1c2f Mon Sep 17 00:00:00 2001 | 1 | From 8fb793a4a8e715f0c418df9ab17e39d103d59d3d Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 | 3 | Date: Sat, 16 Nov 2013 00:32:30 +0100 |
4 | Subject: [PATCH 11/13] Always build uic | 4 | Subject: [PATCH 8/9] Always build uic |
5 | 5 | ||
6 | Even if we are not building gui or widgets. This tool is needed later | 6 | Even if we are not building gui or widgets. This tool is needed later |
7 | as a native tool when compiling the target. | 7 | as a native tool when compiling the target. |
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/src/src.pro b/src/src.pro | 16 | diff --git a/src/src.pro b/src/src.pro |
17 | index 83f7587..9dbcf70 100644 | 17 | index b4d62aa..5e19215 100644 |
18 | --- a/src/src.pro | 18 | --- a/src/src.pro |
19 | +++ b/src/src.pro | 19 | +++ b/src/src.pro |
20 | @@ -163,7 +163,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent | 20 | @@ -182,7 +182,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent |
21 | } | 21 | } |
22 | } | 22 | } |
23 | } | 23 | } |
diff --git a/recipes-qt/qt5/qtbase/0013-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase/0009-configure-preserve-built-qmake-and-swap-with-native-.patch index ea90305c..4cc9bf0e 100644 --- a/recipes-qt/qt5/qtbase/0013-configure-preserve-built-qmake-and-swap-with-native-.patch +++ b/recipes-qt/qt5/qtbase/0009-configure-preserve-built-qmake-and-swap-with-native-.patch | |||
@@ -1,8 +1,7 @@ | |||
1 | From d34774dc7447ff0d566b3281407c0998173a85e0 Mon Sep 17 00:00:00 2001 | 1 | From abbd6ce89977ff1854c7eb6a5864568ee81a6ccd Mon Sep 17 00:00:00 2001 |
2 | From: Denys Dmytriyenko <denys@ti.com> | 2 | From: Denys Dmytriyenko <denys@ti.com> |
3 | Date: Mon, 11 Nov 2013 20:22:34 -0500 | 3 | Date: Mon, 11 Nov 2013 20:22:34 -0500 |
4 | Subject: [PATCH 13/13] configure: preserve built qmake and swap with native | 4 | Subject: [PATCH 9/9] configure: preserve built qmake and swap with native one |
5 | one | ||
6 | 5 | ||
7 | Let configure script build the real qmake, but right after it's built, swap | 6 | Let configure script build the real qmake, but right after it's built, swap |
8 | it with a native qmake for further internal use, preserving the real one. | 7 | it with a native qmake for further internal use, preserving the real one. |
@@ -13,12 +12,12 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> | |||
13 | 1 file changed, 2 insertions(+) | 12 | 1 file changed, 2 insertions(+) |
14 | 13 | ||
15 | diff --git a/configure b/configure | 14 | diff --git a/configure b/configure |
16 | index c19ff6a..2d920e3 100755 | 15 | index 43c4dab..69e6f46 100755 |
17 | --- a/configure | 16 | --- a/configure |
18 | +++ b/configure | 17 | +++ b/configure |
19 | @@ -3879,6 +3879,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 18 | @@ -4082,6 +4082,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
20 | 19 | echo "Done." | |
21 | (cd "$outpath/qmake"; "$MAKE") || exit 2 | 20 | fi |
22 | fi # Build qmake | 21 | fi # Build qmake |
23 | +mv "$outpath/bin/qmake" "$outpath/bin/qmake-real" | 22 | +mv "$outpath/bin/qmake" "$outpath/bin/qmake-real" |
24 | +mv "$outpath/bin/qmake-native" "$outpath/bin/qmake" | 23 | +mv "$outpath/bin/qmake-native" "$outpath/bin/qmake" |
diff --git a/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase/0009-qmake-don-t-build-it-in-configure-but-allow-to-build.patch index f5f2a23a..f5f2a23a 100644 --- a/recipes-qt/qt5/qtbase/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch +++ b/recipes-qt/qt5/qtbase/0009-qmake-don-t-build-it-in-configure-but-allow-to-build.patch | |||
diff --git a/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch index 383b7880..546e954b 100644 --- a/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch +++ b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d56aef32b8c9d1be04c047a16a55e84af71e25dd Mon Sep 17 00:00:00 2001 | 1 | From 45bdf5ff770fe17634f216c3f533645bfd450f04 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | 3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 |
4 | Subject: [PATCH 12/13] Add -external-hostbindir option for native(sdk) | 4 | Subject: [PATCH 9/9] Add -external-hostbindir option for native(sdk) |
5 | 5 | ||
6 | * when cross-compiling it's sometimes useful to use existing tools from machine | 6 | * when cross-compiling it's sometimes useful to use existing tools from machine |
7 | (or in OpenEmbedded built with separate native recipe) when building for target | 7 | (or in OpenEmbedded built with separate native recipe) when building for target |
@@ -25,18 +25,33 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
25 | Signed-off-by: Simon Busch <morphis@gravedo.de> | 25 | Signed-off-by: Simon Busch <morphis@gravedo.de> |
26 | Signed-off-by: Jonathan Liu <net147@gmail.com> | 26 | Signed-off-by: Jonathan Liu <net147@gmail.com> |
27 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 27 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
28 | |||
29 | Conflicts: | ||
30 | tools/configure/configureapp.cpp | ||
28 | --- | 31 | --- |
29 | qmake/property.cpp | 1 + | 32 | qmake/property.cpp | 1 + |
30 | src/corelib/global/qlibraryinfo.cpp | 3 ++- | 33 | src/corelib/global/qlibraryinfo.cpp | 3 ++- |
31 | src/corelib/global/qlibraryinfo.h | 1 + | 34 | src/corelib/global/qlibraryinfo.h | 1 + |
32 | tools/configure/configureapp.cpp | 8 ++++++++ | 35 | tools/configure/configureapp.cpp | 11 +++++++++++ |
33 | 4 files changed, 12 insertions(+), 1 deletion(-) | 36 | 4 files changed, 15 insertions(+), 1 deletion(-) |
34 | 37 | ||
38 | diff --git a/configure b/configure | ||
39 | index ffb69df..aa46774 100755 | ||
40 | --- a/configure | ||
41 | +++ b/configure | ||
42 | @@ -3831,6 +3831,7 @@ addConfStr "$CFG_SYSROOT" | ||
43 | addConfStr "$QT_REL_HOST_BINS" | ||
44 | addConfStr "$QT_REL_HOST_LIBS" | ||
45 | addConfStr "$QT_REL_HOST_DATA" | ||
46 | +addConfStr "$QT_EXTERNAL_HOST_BINS" | ||
47 | addConfStr "$shortxspec" | ||
48 | addConfStr "$shortspec" | ||
49 | |||
35 | diff --git a/qmake/property.cpp b/qmake/property.cpp | 50 | diff --git a/qmake/property.cpp b/qmake/property.cpp |
36 | index 051e056..50da6ed 100644 | 51 | index 817ae95..c69539f 100644 |
37 | --- a/qmake/property.cpp | 52 | --- a/qmake/property.cpp |
38 | +++ b/qmake/property.cpp | 53 | +++ b/qmake/property.cpp |
39 | @@ -67,6 +67,7 @@ static const struct { | 54 | @@ -68,6 +68,7 @@ static const struct { |
40 | { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, | 55 | { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, |
41 | { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, | 56 | { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, |
42 | { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true }, | 57 | { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true }, |
@@ -45,10 +60,10 @@ index 051e056..50da6ed 100644 | |||
45 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, | 60 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, |
46 | }; | 61 | }; |
47 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | 62 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp |
48 | index 91ca643..7a567fa 100644 | 63 | index f663c88..675bd4c 100644 |
49 | --- a/src/corelib/global/qlibraryinfo.cpp | 64 | --- a/src/corelib/global/qlibraryinfo.cpp |
50 | +++ b/src/corelib/global/qlibraryinfo.cpp | 65 | +++ b/src/corelib/global/qlibraryinfo.cpp |
51 | @@ -348,7 +348,7 @@ QLibraryInfo::isDebugBuild() | 66 | @@ -373,7 +373,7 @@ QLibraryInfo::isDebugBuild() |
52 | */ | 67 | */ |
53 | 68 | ||
54 | static const struct { | 69 | static const struct { |
@@ -57,31 +72,31 @@ index 91ca643..7a567fa 100644 | |||
57 | } qtConfEntries[] = { | 72 | } qtConfEntries[] = { |
58 | { "Prefix", "." }, | 73 | { "Prefix", "." }, |
59 | { "Documentation", "doc" }, // should be ${Data}/doc | 74 | { "Documentation", "doc" }, // should be ${Data}/doc |
60 | @@ -374,6 +374,7 @@ static const struct { | 75 | @@ -398,6 +398,7 @@ static const struct { |
61 | { "HostBinaries", "bin" }, | 76 | { "HostBinaries", "bin" }, |
62 | { "HostLibraries", "lib" }, | 77 | { "HostLibraries", "lib" }, |
63 | { "HostData", "." }, | 78 | { "HostData", "." }, |
64 | + { "ExternalHostBinaries", "" }, | 79 | + { "ExternalHostBinaries", "" }, |
65 | { "TargetSpec", "" }, | 80 | { "TargetSpec", "" }, |
66 | { "HostSpec", "" }, | 81 | { "HostSpec", "" }, |
67 | #endif | 82 | { "HostPrefix", "" }, |
68 | diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h | 83 | diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h |
69 | index 543c4b3..a02e03a 100644 | 84 | index 1ad7637..5a8b127 100644 |
70 | --- a/src/corelib/global/qlibraryinfo.h | 85 | --- a/src/corelib/global/qlibraryinfo.h |
71 | +++ b/src/corelib/global/qlibraryinfo.h | 86 | +++ b/src/corelib/global/qlibraryinfo.h |
72 | @@ -80,6 +80,7 @@ public: | 87 | @@ -81,6 +81,7 @@ public: |
73 | HostBinariesPath, | 88 | HostBinariesPath, |
74 | HostLibrariesPath, | 89 | HostLibrariesPath, |
75 | HostDataPath, | 90 | HostDataPath, |
76 | + ExternalHostBinariesPath, | 91 | + ExternalHostBinariesPath, |
77 | TargetSpecPath, | 92 | TargetSpecPath, |
78 | HostSpecPath, | 93 | HostSpecPath, |
79 | LastHostPath = HostSpecPath, | 94 | HostPrefixPath, |
80 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | 95 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp |
81 | index 6e9d4aa..0ca4daf 100644 | 96 | index 3bf0546..53bf146 100644 |
82 | --- a/tools/configure/configureapp.cpp | 97 | --- a/tools/configure/configureapp.cpp |
83 | +++ b/tools/configure/configureapp.cpp | 98 | +++ b/tools/configure/configureapp.cpp |
84 | @@ -1191,6 +1191,13 @@ void Configure::parseCmdLine() | 99 | @@ -1217,6 +1217,13 @@ void Configure::parseCmdLine() |
85 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); | 100 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); |
86 | } | 101 | } |
87 | 102 | ||
@@ -95,14 +110,21 @@ index 6e9d4aa..0ca4daf 100644 | |||
95 | else if (configCmdLine.at(i) == "-make-tool") { | 110 | else if (configCmdLine.at(i) == "-make-tool") { |
96 | ++i; | 111 | ++i; |
97 | if (i == argCount) | 112 | if (i == argCount) |
98 | @@ -4004,6 +4011,7 @@ void Configure::generateQConfigCpp() | 113 | @@ -4101,6 +4108,9 @@ void Configure::generateQConfigCpp() |
99 | << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl | 114 | |
100 | << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl | 115 | if (dictionary["QT_REL_HOST_DATA"].isEmpty()) |
101 | << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl | 116 | dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; |
102 | + << " \"qt_ebinpath=" << formatPath(dictionary["QT_EXTERNAL_HOST_BINS"]) << "\"," << endl | 117 | + |
103 | << " \"qt_targspec=" << targSpec << "\"," << endl | 118 | + if (dictionary["QT_EXTERNAL_HOST_BINS"].isEmpty()) |
104 | << " \"qt_hostspec=" << hostSpec << "\"," << endl | 119 | + dictionary["QT_EXTERNAL_HOST_BINS"] = haveHpx ? "bin" : dictionary["QT_REL_INSTALL_BINS"]; |
105 | << "#endif" << endl | 120 | |
106 | -- | 121 | confStringOff = 0; |
107 | 2.4.2 | 122 | addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); |
108 | 123 | @@ -4120,6 +4130,7 @@ void Configure::generateQConfigCpp() | |
124 | addConfStr(1, dictionary["QT_REL_HOST_BINS"]); | ||
125 | addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); | ||
126 | addConfStr(1, dictionary["QT_REL_HOST_DATA"]); | ||
127 | + addConfStr(1, dictionary["QT_EXTERNAL_HOST_BINS"]); | ||
128 | addConfStr(1, targSpec); | ||
129 | addConfStr(1, hostSpec); | ||
130 | |||
diff --git a/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch b/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch deleted file mode 100644 index 184b2d8e..00000000 --- a/recipes-qt/qt5/qtbase/0010-Make-Qt5GuiConfigExtras.cmake-find-gl-es-include-dir.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From d5308f1a78e24402b16201846378917473d02873 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Thu, 18 Dec 2014 13:41:09 +0100 | ||
4 | Subject: [PATCH 10/12] Make Qt5GuiConfigExtras.cmake find gl(es) include dir | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | In configure QMAKE_INCDIR_OPENGL is set with pkg-config. Without | ||
10 | PKG_CONFIG_ALLOW_SYSTEM_CFLAGS set, pkg-config returns paths outside | ||
11 | /usr/include only (in my case /usr/include/libdrm). With NO_DEFAULT_PATH set | ||
12 | gl(es) include directories cannot be found. Cmake builds depending on | ||
13 | Qt5Gui error out with | ||
14 | |||
15 | | Failed to find "GLES2/gl2.h" in "/usr/include/libdrm" | ||
16 | |||
17 | Upstream-Status: submitted [1] | ||
18 | |||
19 | [1] https://bugreports.qt-project.org/browse/QTBUG-43445 | ||
20 | |||
21 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
22 | --- | ||
23 | src/gui/Qt5GuiConfigExtras.cmake.in | 3 --- | ||
24 | 1 file changed, 3 deletions(-) | ||
25 | |||
26 | diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in | ||
27 | index 9a846d4..07869ef 100644 | ||
28 | --- a/src/gui/Qt5GuiConfigExtras.cmake.in | ||
29 | +++ b/src/gui/Qt5GuiConfigExtras.cmake.in | ||
30 | @@ -57,9 +57,6 @@ set(Qt5Gui_OPENGL_LIBRARIES Qt5::Gui_GLESv2) | ||
31 | set(_GL_INCDIRS $$CMAKE_GL_INCDIRS) | ||
32 | find_path(_qt5gui_OPENGL_INCLUDE_DIR $$CMAKE_GL_HEADER_NAME | ||
33 | PATHS ${_GL_INCDIRS} | ||
34 | -!!IF !mac | ||
35 | - NO_DEFAULT_PATH | ||
36 | -!!ENDIF | ||
37 | ) | ||
38 | if (NOT _qt5gui_OPENGL_INCLUDE_DIR) | ||
39 | message(FATAL_ERROR \"Failed to find \\\"$$CMAKE_GL_HEADER_NAME\\\" in \\\"${_GL_INCDIRS}\\\".\") | ||
40 | -- | ||
41 | 2.4.2 | ||
42 | |||