summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase-git')
-rw-r--r--recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch6
-rw-r--r--recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch6
-rw-r--r--recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch16
-rw-r--r--recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch6
-rw-r--r--recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch4
-rw-r--r--recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch8
-rw-r--r--recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch29
-rw-r--r--recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch67
-rw-r--r--recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch33
-rw-r--r--recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch61
10 files changed, 213 insertions, 23 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
index 0a0eca43..1b4ed742 100644
--- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
1From 21001bb1c68fdc22ee243c562549f7b3a8a8ed84 Mon Sep 17 00:00:00 2001 1From 0cdd1297e98edd3368a6b923923ff6cf0684d800 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200 3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH 1/6] Add linux-oe-g++ platform 4Subject: [PATCH 01/11] 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
@@ -41,7 +41,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
41 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 41 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
42 42
43diff --git a/configure b/configure 43diff --git a/configure b/configure
44index 55a643a..666576f 100755 44index 9c86fa1..7dea731 100755
45--- a/configure 45--- a/configure
46+++ b/configure 46+++ b/configure
47@@ -284,6 +284,16 @@ getQMakeConf() 47@@ -284,6 +284,16 @@ getQMakeConf()
diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index d1108133..f1447597 100644
--- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,8 +1,8 @@
1From 80cdde4c31e6e5f534ca5e218b9b5cc5fd079b9a Mon Sep 17 00:00:00 2001 1From a256652b730e88566eb04dd7cdc39d5a1281c7fe Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org> 2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200 3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH 2/6] qlibraryinfo: allow to set qt.conf from the outside using 4Subject: [PATCH 02/11] qlibraryinfo: allow to set qt.conf from the outside
5 the environment 5 using the environment
6 6
7Allow to set a qt.conf from the outside using the environment. This allows 7Allow to set a qt.conf from the outside using the environment. This allows
8to inject new prefixes and other paths into qmake. This is needed when using 8to inject new prefixes and other paths into qmake. This is needed when using
diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
index b99eb1cf..e1c56ac3 100644
--- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
@@ -1,7 +1,7 @@
1From e8fe1934151a47fd3ec86fb0054e137237fa69b7 Mon Sep 17 00:00:00 2001 1From c244c6a89f6f70a2443748475f482cc97e3ac118 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH 3/6] Add -external-hostbindir option 4Subject: [PATCH 03/11] 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
@@ -21,7 +21,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
21 8 files changed, 42 insertions(+), 8 deletions(-) 21 8 files changed, 42 insertions(+), 8 deletions(-)
22 22
23diff --git a/configure b/configure 23diff --git a/configure b/configure
24index 666576f..93dbfab 100755 24index 7dea731..65f4d26 100755
25--- a/configure 25--- a/configure
26+++ b/configure 26+++ b/configure
27@@ -1034,6 +1034,7 @@ CFG_GCC_SYSROOT="yes" 27@@ -1034,6 +1034,7 @@ CFG_GCC_SYSROOT="yes"
@@ -98,10 +98,10 @@ index 8cd2473..876f657 100644
98 exists($$eval($$1).bat) { 98 exists($$eval($$1).bat) {
99 $$1 = $$eval($$1).bat 99 $$1 = $$eval($$1).bat
100diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf 100diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
101index 46d031f..5758604 100644 101index 0a58880..c110ea5 100644
102--- a/mkspecs/features/qt_tool.prf 102--- a/mkspecs/features/qt_tool.prf
103+++ b/mkspecs/features/qt_tool.prf 103+++ b/mkspecs/features/qt_tool.prf
104@@ -37,7 +37,7 @@ load(qt_common) 104@@ -16,7 +16,7 @@ CONFIG += console
105 # If we are doing a prefix build, create a "module" pri which enables 105 # If we are doing a prefix build, create a "module" pri which enables
106 # qtPrepareTool() to work with the non-installed build. 106 # qtPrepareTool() to work with the non-installed build.
107 # Non-bootstrapped tools always need this because of the environment setup. 107 # Non-bootstrapped tools always need this because of the environment setup.
@@ -189,10 +189,10 @@ index 1a00a14..7e4829c 100644
189 HostSpecPath, 189 HostSpecPath,
190 LastHostPath = HostSpecPath, 190 LastHostPath = HostSpecPath,
191diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp 191diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
192index dc11c0d..6d79631 100644 192index a18aac3..57409b1 100644
193--- a/tools/configure/configureapp.cpp 193--- a/tools/configure/configureapp.cpp
194+++ b/tools/configure/configureapp.cpp 194+++ b/tools/configure/configureapp.cpp
195@@ -1167,6 +1167,13 @@ void Configure::parseCmdLine() 195@@ -1173,6 +1173,13 @@ void Configure::parseCmdLine()
196 dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i); 196 dictionary[ "QT_HOST_DATA" ] = configCmdLine.at(i);
197 } 197 }
198 198
@@ -206,7 +206,7 @@ index dc11c0d..6d79631 100644
206 else if (configCmdLine.at(i) == "-make-tool") { 206 else if (configCmdLine.at(i) == "-make-tool") {
207 ++i; 207 ++i;
208 if (i == argCount) 208 if (i == argCount)
209@@ -3763,6 +3770,7 @@ void Configure::generateQConfigCpp() 209@@ -3775,6 +3782,7 @@ void Configure::generateQConfigCpp()
210 << " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl 210 << " \"qt_hpfxpath=" << formatPath(dictionary["QT_HOST_PREFIX"]) << "\"," << endl
211 << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl 211 << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
212 << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl 212 << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
diff --git a/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch
index 4b8dd912..285c8a46 100644
--- a/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch
+++ b/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch
@@ -1,7 +1,7 @@
1From 915a980742cd072df6faa386daf3f937f5b5b215 Mon Sep 17 00:00:00 2001 1From d0f322cf4ee9ead48997bb3e3a2c137bba91141b Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net> 2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 29 Oct 2012 20:07:49 -0700 3Date: Mon, 29 Oct 2012 20:07:49 -0700
4Subject: [PATCH 4/6] qmake is already built in qtbase-native 4Subject: [PATCH 04/11] qmake is already built in qtbase-native
5 5
6Ported from OE by: Yu Ke <ke.yu@intel.com> 6Ported from OE by: Yu Ke <ke.yu@intel.com>
7Upstream-Status: Inappropriate [configuration] 7Upstream-Status: Inappropriate [configuration]
@@ -13,7 +13,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/configure b/configure 15diff --git a/configure b/configure
16index 93dbfab..dd5e646 100755 16index 65f4d26..dbf99a9 100755
17--- a/configure 17--- a/configure
18+++ b/configure 18+++ b/configure
19@@ -3938,7 +3938,7 @@ setBootstrapEvalVariable() 19@@ -3938,7 +3938,7 @@ setBootstrapEvalVariable()
diff --git a/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch
index 6cc968bb..b239fd5b 100644
--- a/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch
+++ b/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch
@@ -1,7 +1,7 @@
1From f1246cedac44bfacb5a475d4ed247a3ac00c67d0 Mon Sep 17 00:00:00 2001 1From a6a15ff0150ca685909782f0ca861fa4336f33b3 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Mon, 29 Oct 2012 20:26:36 -0700 3Date: Mon, 29 Oct 2012 20:26:36 -0700
4Subject: [PATCH 5/6] Allow building a separate qmake for the target 4Subject: [PATCH 05/11] Allow building a separate qmake for the target
5 5
6Upstream-Status: Inappropriate [config] 6Upstream-Status: Inappropriate [config]
7 7
diff --git a/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch
index 210e367d..a2b1e5e8 100644
--- a/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch
+++ b/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch
@@ -1,7 +1,7 @@
1From 6d1c296d6df2c5efd8aec3272e7eacae1c093885 Mon Sep 17 00:00:00 2001 1From e356895802c2a1e596882c79161994ebbf361d65 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 17 Apr 2013 18:06:25 +0200 3Date: Wed, 17 Apr 2013 18:06:25 +0200
4Subject: [PATCH 6/6] qt_functions: temporary remove isEmpty check 4Subject: [PATCH 06/11] qt_functions: temporary remove isEmpty check
5 5
6* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value 6* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value
7 7
@@ -29,10 +29,10 @@ index 876f657..0e094a8 100644
29 } 29 }
30 contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { 30 contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) {
31diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf 31diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
32index 5758604..37b50d4 100644 32index c110ea5..34ee9ca 100644
33--- a/mkspecs/features/qt_tool.prf 33--- a/mkspecs/features/qt_tool.prf
34+++ b/mkspecs/features/qt_tool.prf 34+++ b/mkspecs/features/qt_tool.prf
35@@ -36,8 +36,7 @@ load(qt_common) 35@@ -15,8 +15,7 @@ CONFIG += console
36 36
37 # If we are doing a prefix build, create a "module" pri which enables 37 # If we are doing a prefix build, create a "module" pri which enables
38 # qtPrepareTool() to work with the non-installed build. 38 # qtPrepareTool() to work with the non-installed build.
diff --git a/recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
new file mode 100644
index 00000000..90d6f75a
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -0,0 +1,29 @@
1From 6c494ea0e73c9ef60f45e7fdc0de40bb51ad5ac6 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 22:33:33 +0200
4Subject: [PATCH 08/11] configureapp: Prefix default LIBDIRS and INCDIRS with
5 SYSROOT
6
7Change-Id: I464c25888ab8b99ced6bd669b5c6448d491725a8
8---
9 tools/configure/configureapp.cpp | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
13index 57409b1..f443007 100644
14--- a/tools/configure/configureapp.cpp
15+++ b/tools/configure/configureapp.cpp
16@@ -3172,8 +3172,8 @@ void Configure::generateQConfigPri()
17 configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl;
18 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
19 // FIXME: add detection
20- configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl;
21- configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl;
22+ configStream << "QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl;
23+ configStream << "QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl;
24 }
25 if (dictionary["QT_EDITION"].contains("OPENSOURCE"))
26 configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl;
27--
281.8.2.1
29
diff --git a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch
new file mode 100644
index 00000000..67769b33
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch
@@ -0,0 +1,67 @@
1From 72f1087fef0e506b9ab015498f5c7a4b3161c6f3 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement
5
6* in situation like this:
7 QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
8 QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib
9 QT_INSTALL_LIBS/raw:/usr/lib
10 QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib
11
12 I don't want the replacement like this:
13 sed
14 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g"
15 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g"
16 "../../lib/pkgconfig/Qt5Core.pc"
17 >"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc"
18 because that way I'll end with -L/usr/lib in .pc file which is
19 cross-compile unfriendly, keeping ${libdir}/${includedir} works better
20 in my case
21
22Change-Id: Id0f9143c012b7fe7bb7bab0055687f4e0517f653
23Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
24---
25 mkspecs/features/qt_module.prf | 16 ++++++++++++++--
26 1 file changed, 14 insertions(+), 2 deletions(-)
27
28diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
29index 3531d28..1c43972 100644
30--- a/mkspecs/features/qt_module.prf
31+++ b/mkspecs/features/qt_module.prf
32@@ -136,18 +136,30 @@ unix|win32-g++* {
33 rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
34 else: \
35 rplbase = $$MODULE_BASE_OUTDIR
36+ pkgconfig_include_replace.match = $$rplbase/include
37+ pkgconfig_include_replace.replace = "\$$\\{includedir}"
38+ pkgconfig_lib_replace.match = $$rplbase/lib
39+ pkgconfig_lib_replace.replace = "\$$\\{libdir}"
40 include_replace.match = $$rplbase/include
41 include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
42 lib_replace.match = $$rplbase/lib
43 lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
44- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace
45+ lafile_replace.match = $$rplbase
46+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
47+
48+ !isEmpty(SYSROOT): \
49+ rplbase = $$[SYSROOT] \
50+ lafile_replace.match = $$rplbase \
51+ lafile_replace.replace = "=" \
52+
53+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
54 QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
55 }
56
57 unix {
58 CONFIG += create_libtool explicitlib
59 QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw]
60- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
61+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace
62 }
63
64 unix|win32-g++* {
65--
661.8.2.1
67
diff --git a/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch b/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch
new file mode 100644
index 00000000..4fa772cd
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch
@@ -0,0 +1,33 @@
1From 6d816874a95cb85bdf96e06f763e21c098d92b89 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 22:51:54 +0200
4Subject: [PATCH 10/11] qmake/property: rename QT_INSTALL_CONFIGURATION to
5 QT_INSTALL_SETTINGS
6
7* this variable is referenced from configure and configureapp.cpp as QT_INSTALL_SETTINGS
8 property.cpp was only place using name QT_INSTALL_CONFIGURATION
9
10Upstream-Status: Submitted
11https://codereview.qt-project.org/54912
12
13Change-Id: I3ba40d5f8773fe9aea728c5b2418aa55cecc92da
14---
15 qmake/property.cpp | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/qmake/property.cpp b/qmake/property.cpp
19index c1b7a9f..af2eacf 100644
20--- a/qmake/property.cpp
21+++ b/qmake/property.cpp
22@@ -68,7 +68,7 @@ static const struct {
23 { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false },
24 { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false },
25 { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false },
26- { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false },
27+ { "QT_INSTALL_SETTINGS", QLibraryInfo::SettingsPath, false },
28 { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false },
29 { "QT_INSTALL_DEMOS", QLibraryInfo::ExamplesPath, false }, // Just backwards compat
30 { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true },
31--
321.8.2.1
33
diff --git a/recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch
new file mode 100644
index 00000000..65fd4f5e
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch
@@ -0,0 +1,61 @@
1From 57da761a8e1995a20250c6600bc99937a7b203b4 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 28 Apr 2013 12:56:55 +0200
4Subject: [PATCH 11/11] qt_module: Fix paths in .prl files
5
6* qmake does not prefix them with QT_SYSROOT when using them
7 so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE
8 variable, which is unsafe for cross-compilation
9* writting QT_SYSROOT in .prl files is dangerous for sstate when
10 builds are in different directories, so we need
11 SSTATE_SCAN_FILES += "*.pri *.prl"
12 to make them relocateble
13
14Change-Id: I4b66dcad539a3ba876d8e4ee2eb2ccd626cd03ea
15Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16---
17 mkspecs/features/qt_module.prf | 28 +++++++++++++++++-----------
18 1 file changed, 17 insertions(+), 11 deletions(-)
19
20diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
21index 1c43972..feec2d5 100644
22--- a/mkspecs/features/qt_module.prf
23+++ b/mkspecs/features/qt_module.prf
24@@ -140,17 +140,23 @@ unix|win32-g++* {
25 pkgconfig_include_replace.replace = "\$$\\{includedir}"
26 pkgconfig_lib_replace.match = $$rplbase/lib
27 pkgconfig_lib_replace.replace = "\$$\\{libdir}"
28- include_replace.match = $$rplbase/include
29- include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
30- lib_replace.match = $$rplbase/lib
31- lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
32- lafile_replace.match = $$rplbase
33- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
34-
35- !isEmpty(SYSROOT): \
36- rplbase = $$[SYSROOT] \
37- lafile_replace.match = $$rplbase \
38- lafile_replace.replace = "=" \
39+ !exists($$[QT_SYSROOT]) {
40+ include_replace.match = $$rplbase/include
41+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
42+ lib_replace.match = $$rplbase/lib
43+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
44+ lafile_replace.match = $$rplbase
45+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]"
46+ } else {
47+ # include_replace and lib_replace are duplicate, but we don't want to
48+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional
49+ include_replace.match = $$rplbase
50+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
51+ lib_replace.match = $$rplbase
52+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw]
53+ lafile_replace.match = $$rplbase
54+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
55+ }
56
57 QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
58 QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
59--
601.8.2.1
61
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-01 08:18:30 +0000