summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qttools
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-01-26 16:54:50 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-01-26 16:18:39 +0100
commit333949a8239dfa7788b35f1059614733e11a6a25 (patch)
tree420843abad8bfc939484fa34bd6f7da9d432db8d /recipes-qt/qt5/qttools
parentc0ba8ab590ba4e17a2a04925cf48915233d4f493 (diff)
downloadmeta-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/qttools')
-rw-r--r--recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch158
1 files changed, 0 insertions, 158 deletions
diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
deleted file mode 100644
index 94cd0484..00000000
--- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ /dev/null
@@ -1,158 +0,0 @@
1From 68ecc4f25789321fc29ec9e4981fcfa27e706f1c Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.jansa@gmail.com>
3Date: Wed, 11 Sep 2013 18:30:08 +0200
4Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert
5
6This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native
7is built without GUI support (no-png is set) and we still want to build
8native lrelease + lupdate + lconvert tools.
9
10Upstream-Status: Pending
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 examples/examples.pro | 3 ++-
15 src/designer/src/src.pro | 18 ++++++++++--------
16 src/linguist/linguist.pro | 2 +-
17 src/src.pro | 16 +++++++++-------
18 tests/auto/auto.pro | 24 +++++++++++++-----------
19 5 files changed, 35 insertions(+), 28 deletions(-)
20
21diff --git a/examples/examples.pro b/examples/examples.pro
22index 69365d1..da7b38b 100644
23--- a/examples/examples.pro
24+++ b/examples/examples.pro
25@@ -1,4 +1,5 @@
26 TEMPLATE = subdirs
27-qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant
28+!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant
29+qtHaveModule(widgets): SUBDIRS += linguist uitools
30
31 winrt: SUBDIRS -= assistant designer
32diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
33index 6915e34..3ff2eca 100644
34--- a/src/designer/src/src.pro
35+++ b/src/designer/src/src.pro
36@@ -1,13 +1,15 @@
37 TEMPLATE = subdirs
38
39-SUBDIRS = \
40- uiplugin \
41- uitools \
42- lib \
43- components \
44- designer
45+!linguistonly {
46+ SUBDIRS = \
47+ uiplugin \
48+ lib \
49+ components \
50+ designer
51+}
52+SUBDIRS += uitools
53
54-contains(QT_CONFIG, shared): SUBDIRS += plugins
55+!linguistonly:contains(QT_CONFIG, shared): SUBDIRS += plugins
56
57 uitools.depends = uiplugin
58 lib.depends = uiplugin
59@@ -15,7 +17,7 @@ components.depends = lib
60 designer.depends = components
61 plugins.depends = lib
62
63-qtNomakeTools( \
64+!linguistonly:qtNomakeTools( \
65 lib \
66 components \
67 designer \
68diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
69index 3a70580..a977878 100644
70--- a/src/linguist/linguist.pro
71+++ b/src/linguist/linguist.pro
72@@ -3,7 +3,7 @@ SUBDIRS = \
73 lrelease \
74 lupdate \
75 lconvert
76-!no-png:qtHaveModule(widgets): SUBDIRS += linguist
77+!linguistonly:!no-png:qtHaveModule(widgets): SUBDIRS += linguist
78
79 qtNomakeTools( \
80 linguist \
81diff --git a/src/src.pro b/src/src.pro
82index 387d54f..56b7d0c 100644
83--- a/src/src.pro
84+++ b/src/src.pro
85@@ -4,19 +4,21 @@ qtHaveModule(widgets) {
86 no-png {
87 message("Some graphics-related tools are unavailable without PNG support")
88 } else {
89- SUBDIRS = assistant \
90+ !linguistonly {
91+ SUBDIRS = assistant \
92 pixeltool \
93- qtestlib \
94- designer
95+ qtestlib
96+ }
97+ SUBDIRS += designer
98
99 linguist.depends = designer
100 }
101 }
102
103 SUBDIRS += linguist \
104- qdoc \
105 qtplugininfo
106-if(!android|android_app):!ios: SUBDIRS += qtpaths
107+!linguistonly: SUBDIRS += qdoc
108+if(!android|android_app):!ios:!linguistonly: SUBDIRS += qtpaths
109
110 mac {
111 SUBDIRS += macdeployqt
112@@ -26,11 +28,11 @@ android {
113 SUBDIRS += androiddeployqt
114 }
115
116-qtHaveModule(dbus): SUBDIRS += qdbus
117+!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus
118
119 win32|winrt:SUBDIRS += windeployqt
120 winrt:SUBDIRS += winrtrunner
121-qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
122+!linguistonly:qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag
123
124 qtNomakeTools( \
125 pixeltool \
126diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
127index 20b5fec..8a42d1f 100644
128--- a/tests/auto/auto.pro
129+++ b/tests/auto/auto.pro
130@@ -1,15 +1,17 @@
131 TEMPLATE=subdirs
132-SUBDIRS=\
133- linguist \
134- qhelpcontentmodel \
135- qhelpenginecore \
136- qhelpgenerator \
137- qhelpindexmodel \
138- qhelpprojectdata \
139- cmake \
140- installed_cmake \
141- qtdiag \
142- windeployqt
143+!linguistonly {
144+ SUBDIRS=\
145+ linguist \
146+ qhelpcontentmodel \
147+ qhelpenginecore \
148+ qhelpgenerator \
149+ qhelpindexmodel \
150+ qhelpprojectdata \
151+ cmake \
152+ installed_cmake \
153+ qtdiag \
154+ windeployqt
155+}
156
157 installed_cmake.depends = cmake
158