diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-01-26 16:54:50 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-01-26 16:18:39 +0100 |
commit | 333949a8239dfa7788b35f1059614733e11a6a25 (patch) | |
tree | 420843abad8bfc939484fa34bd6f7da9d432db8d /recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch | |
parent | c0ba8ab590ba4e17a2a04925cf48915233d4f493 (diff) | |
download | meta-qt5-333949a8239dfa7788b35f1059614733e11a6a25.tar.gz |
Upgrade to Qt 5.8
The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain
the contents of an environment value when qmake is run instead of when
Makefile is processed. All OE_QMAKE_xxx variables need to be exported
for qmake to find them. configure's setBootstrapVariable function needs
to change $$(..) to normal $(...) operator to work with qmake's Makefile.
qt.conf generation for qtbase recipes is not needed, as configure will
generate its own version based on configure arguments. Skip running
qmake, since configure is now automatically invoked when it's run in
qtbase's root folder.
Update PACKAGECONFIGs for qtbase to match current configure options.
The new Qt configuration system [1] can be used with a new variable
EXTRA_QMAKEVARS_CONFIGURE, which takes both command line and feature
arguments.
Merge the two qtwayland recipes to one that supports all three targets
(target, native, nativesdk) without need for additional patch.
Recipes for new Qt modules: QtSCXML, QtNetworkAuth, QtGamepad.
Removes qtdeclarative-render2d
[1] https://www.mail-archive.com/development@qt-project.org/msg25257.html
Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch | 131 |
1 files changed, 0 insertions, 131 deletions
diff --git a/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch deleted file mode 100644 index 1ab8abef..00000000 --- a/recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch +++ /dev/null | |||
@@ -1,131 +0,0 @@ | |||
1 | From cb66a3193b1b1b8b402548b615c3675c4adcf13a Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sat, 6 Apr 2013 13:15:07 +0200 | ||
4 | Subject: [PATCH] Add -external-hostbindir option for native(sdk) | ||
5 | |||
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 | ||
8 | |||
9 | * this way we can skip bootstraping tools we already have | ||
10 | |||
11 | * qt_functions: temporary remove isEmpty check | ||
12 | * now we assume that every build will provide QT_EXTERNAL_HOST_BINS value | ||
13 | * isEmpty works correctly only with qmake variables (e.g. $$FOO - | ||
14 | isEmpty(FOO)), but doesn't work with system properties like $$[FOO]. | ||
15 | |||
16 | * cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries | ||
17 | |||
18 | Upstream-Status: Pending | ||
19 | is a lot better for upstreaming (and it was already sort of approved by | ||
20 | Oswald) but in 5.2.0 I've noticed that he added something similar for | ||
21 | android builds | ||
22 | |||
23 | Change-Id: I4f6e634bf0b2cb96065ee5c38b9cd8a224c3bd37 | ||
24 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
25 | Signed-off-by: Simon Busch <morphis@gravedo.de> | ||
26 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
27 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
28 | |||
29 | Conflicts: | ||
30 | tools/configure/configureapp.cpp | ||
31 | --- | ||
32 | configure | 1 + | ||
33 | qmake/property.cpp | 1 + | ||
34 | src/corelib/global/qlibraryinfo.cpp | 3 ++- | ||
35 | src/corelib/global/qlibraryinfo.h | 1 + | ||
36 | tools/configure/configureapp.cpp | 11 +++++++++++ | ||
37 | 5 files changed, 16 insertions(+), 1 deletion(-) | ||
38 | |||
39 | diff --git a/configure b/configure | ||
40 | index 14f348c..61f22e8 100755 | ||
41 | --- a/configure | ||
42 | +++ b/configure | ||
43 | @@ -3839,6 +3839,7 @@ fi | ||
44 | addConfStr "$QT_REL_HOST_BINS" | ||
45 | addConfStr "$QT_REL_HOST_LIBS" | ||
46 | addConfStr "$QT_REL_HOST_DATA" | ||
47 | +addConfStr "$QT_EXTERNAL_HOST_BINS" | ||
48 | addConfStr "$shortxspec" | ||
49 | addConfStr "$shortspec" | ||
50 | |||
51 | diff --git a/qmake/property.cpp b/qmake/property.cpp | ||
52 | index 9ee08f4..e6ecf92 100644 | ||
53 | --- a/qmake/property.cpp | ||
54 | +++ b/qmake/property.cpp | ||
55 | @@ -63,6 +63,7 @@ static const struct { | ||
56 | { "QT_HOST_DATA", QLibraryInfo::HostDataPath, true }, | ||
57 | { "QT_HOST_BINS", QLibraryInfo::HostBinariesPath, true }, | ||
58 | { "QT_HOST_LIBS", QLibraryInfo::HostLibrariesPath, true }, | ||
59 | + { "QT_EXTERNAL_HOST_BINS", QLibraryInfo::ExternalHostBinariesPath, true }, | ||
60 | { "QMAKE_SPEC", QLibraryInfo::HostSpecPath, true }, | ||
61 | { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, | ||
62 | }; | ||
63 | diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp | ||
64 | index ff65ef9..3726831 100644 | ||
65 | --- a/src/corelib/global/qlibraryinfo.cpp | ||
66 | +++ b/src/corelib/global/qlibraryinfo.cpp | ||
67 | @@ -381,7 +381,7 @@ QLibraryInfo::isDebugBuild() | ||
68 | */ | ||
69 | |||
70 | static const struct { | ||
71 | - char key[19], value[13]; | ||
72 | + char key[21], value[13]; | ||
73 | } qtConfEntries[] = { | ||
74 | { "Prefix", "." }, | ||
75 | { "Documentation", "doc" }, // should be ${Data}/doc | ||
76 | @@ -406,6 +406,7 @@ static const struct { | ||
77 | { "HostBinaries", "bin" }, | ||
78 | { "HostLibraries", "lib" }, | ||
79 | { "HostData", "." }, | ||
80 | + { "ExternalHostBinaries", "" }, | ||
81 | { "TargetSpec", "" }, | ||
82 | { "HostSpec", "" }, | ||
83 | { "HostPrefix", "" }, | ||
84 | diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h | ||
85 | index 362d47d..a2326e2 100644 | ||
86 | --- a/src/corelib/global/qlibraryinfo.h | ||
87 | +++ b/src/corelib/global/qlibraryinfo.h | ||
88 | @@ -87,6 +87,7 @@ public: | ||
89 | HostBinariesPath, | ||
90 | HostLibrariesPath, | ||
91 | HostDataPath, | ||
92 | + ExternalHostBinariesPath, | ||
93 | TargetSpecPath, | ||
94 | HostSpecPath, | ||
95 | HostPrefixPath, | ||
96 | diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp | ||
97 | index 0fa205b..2921e2b 100644 | ||
98 | --- a/tools/configure/configureapp.cpp | ||
99 | +++ b/tools/configure/configureapp.cpp | ||
100 | @@ -1219,6 +1219,13 @@ void Configure::parseCmdLine() | ||
101 | dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); | ||
102 | } | ||
103 | |||
104 | + else if (configCmdLine.at(i) == "-external-hostbindir") { | ||
105 | + ++i; | ||
106 | + if (i == argCount) | ||
107 | + break; | ||
108 | + dictionary[ "QT_EXTERNAL_HOST_BINS" ] = configCmdLine.at(i); | ||
109 | + } | ||
110 | + | ||
111 | else if (configCmdLine.at(i) == "-make-tool") { | ||
112 | ++i; | ||
113 | if (i == argCount) | ||
114 | @@ -4171,6 +4178,9 @@ void Configure::generateQConfigCpp() | ||
115 | |||
116 | if (dictionary["QT_REL_HOST_DATA"].isEmpty()) | ||
117 | dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; | ||
118 | + | ||
119 | + if (dictionary["QT_EXTERNAL_HOST_BINS"].isEmpty()) | ||
120 | + dictionary["QT_EXTERNAL_HOST_BINS"] = haveHpx ? "bin" : dictionary["QT_REL_INSTALL_BINS"]; | ||
121 | |||
122 | confStringOff = 0; | ||
123 | addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); | ||
124 | @@ -4190,6 +4200,7 @@ void Configure::generateQConfigCpp() | ||
125 | addConfStr(1, dictionary["QT_REL_HOST_BINS"]); | ||
126 | addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); | ||
127 | addConfStr(1, dictionary["QT_REL_HOST_DATA"]); | ||
128 | + addConfStr(1, dictionary["QT_EXTERNAL_HOST_BINS"]); | ||
129 | addConfStr(1, targSpec); | ||
130 | addConfStr(1, hostSpec); | ||
131 | |||