summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/qmake5_base.bbclass3
-rw-r--r--recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch14
-rw-r--r--recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch45
-rw-r--r--recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch14
-rw-r--r--recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch81
-rw-r--r--recipes-qt/qt5/qtbase-native.inc1
-rw-r--r--recipes-qt/qt5/qtbase.inc1
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch14
-rw-r--r--recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch45
9 files changed, 200 insertions, 18 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 42c3e9ae..97faad9f 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -35,9 +35,12 @@ export OE_QMAKE_LINK = "${CXX}"
35export OE_QMAKE_LDFLAGS = "${LDFLAGS}" 35export OE_QMAKE_LDFLAGS = "${LDFLAGS}"
36export OE_QMAKE_AR = "${AR}" 36export OE_QMAKE_AR = "${AR}"
37export OE_QMAKE_STRIP = "echo" 37export OE_QMAKE_STRIP = "echo"
38export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner"
38export QT_CONF_PATH = "${WORKDIR}/qt.conf" 39export QT_CONF_PATH = "${WORKDIR}/qt.conf"
39export QT_DIR_NAME ?= "qt5" 40export QT_DIR_NAME ?= "qt5"
40 41
42EXTRA_QMAKEVARS_PRE += "OE_QMAKE_WAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner"
43
41OE_QMAKE_PATH_PREFIX = "${prefix}" 44OE_QMAKE_PATH_PREFIX = "${prefix}"
42OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" 45OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}"
43OE_QMAKE_PATH_LIBS = "${libdir}" 46OE_QMAKE_PATH_LIBS = "${libdir}"
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch
index 7a6b1e74..1cd7dd60 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
1From 9de9d0ccfacbac39d3eb171efe3e8c74a2417ae3 Mon Sep 17 00:00:00 2001 1From 231e94888c257da84bd39b138f5010c255387ae3 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 01/11] Add linux-oe-g++ platform 4Subject: [PATCH 01/12] 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
@@ -31,12 +31,13 @@ Subject: [PATCH 01/11] Add linux-oe-g++ platform
31 31
32Upstream-Status: Pending 32Upstream-Status: Pending
33 33
34Change-Id: I464fe8f17fa4ed4c80165183daf79b08fc491697
34Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 35Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
35--- 36---
36 configure | 54 ++++++++++++++++--- 37 configure | 54 ++++++++++++++++---
37 mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++ 38 mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++
38 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ 39 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
39 3 files changed, 186 insertions(+), 7 deletions(-) 40 3 files changed, 187 insertions(+), 7 deletions(-)
40 create mode 100644 mkspecs/linux-oe-g++/qmake.conf 41 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
41 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 42 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
42 43
@@ -149,10 +150,10 @@ index 2ea1ea4..6db4577 100755
149 EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION" 150 EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION"
150diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 151diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
151new file mode 100644 152new file mode 100644
152index 0000000..42966fe 153index 0000000..ca26b10
153--- /dev/null 154--- /dev/null
154+++ b/mkspecs/linux-oe-g++/qmake.conf 155+++ b/mkspecs/linux-oe-g++/qmake.conf
155@@ -0,0 +1,39 @@ 156@@ -0,0 +1,40 @@
156+# 157+#
157+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded 158+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
158+# 159+#
@@ -166,6 +167,7 @@ index 0000000..42966fe
166+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip 167+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip
167+QMAKE_AR = $(OE_QMAKE_AR) cqs 168+QMAKE_AR = $(OE_QMAKE_AR) cqs
168+QMAKE_STRIP = $(OE_QMAKE_STRIP) 169+QMAKE_STRIP = $(OE_QMAKE_STRIP)
170+QMAKE_WAYLAND_SCANNER = $(OE_QMAKE_WAYLAND_SCANNER)
169+ 171+
170+include(../common/gcc-base-unix.conf) 172+include(../common/gcc-base-unix.conf)
171+ 173+
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch
new file mode 100644
index 00000000..1d2d35e5
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch
@@ -0,0 +1,45 @@
1From a74a1b5bc86553863b8dcbea7a7fde5642e73115 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 5 May 2013 11:18:34 +0200
4Subject: [PATCH 12/12] wayland-scanner: disable silent rules
5
6* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
7
8Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 mkspecs/features/wayland-scanner.prf | 6 +++---
12 1 file changed, 3 insertions(+), 3 deletions(-)
13
14diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf
15index 90e1e0f..0750849 100644
16--- a/mkspecs/features/wayland-scanner.prf
17+++ b/mkspecs/features/wayland-scanner.prf
18@@ -10,7 +10,7 @@ wayland-server-header.variable_out = HEADERS
19 wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
20 wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
21
22-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
23+#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
24 QMAKE_EXTRA_COMPILERS += wayland-server-header
25
26 wayland-client-header.name = wayland ${QMAKE_FILE_BASE}
27@@ -19,7 +19,7 @@ wayland-client-header.variable_out = HEADERS
28 wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
29 wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
30
31-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
32+#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
33 QMAKE_EXTRA_COMPILERS += wayland-client-header
34
35 wayland-code.name = wayland ${QMAKE_FILE_BASE}
36@@ -28,5 +28,5 @@ wayland-code.variable_out = SOURCES
37 wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c
38 wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
39
40-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
41+#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
42 QMAKE_EXTRA_COMPILERS += wayland-code
43--
441.8.2.1
45
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 1b4ed742..1f328977 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 0cdd1297e98edd3368a6b923923ff6cf0684d800 Mon Sep 17 00:00:00 2001 1From 853b6920e9f10a29c5619b4239e960ad33080e8e 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 01/11] Add linux-oe-g++ platform 4Subject: [PATCH 01/12] 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
@@ -31,12 +31,13 @@ Subject: [PATCH 01/11] Add linux-oe-g++ platform
31 31
32Upstream-Status: Pending 32Upstream-Status: Pending
33 33
34Change-Id: Ie1eb097efe289179b86d5d11740274114e50639d
34Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 35Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
35--- 36---
36 configure | 54 ++++++++++++++++--- 37 configure | 54 ++++++++++++++++---
37 mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++ 38 mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++
38 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ 39 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
39 3 files changed, 186 insertions(+), 7 deletions(-) 40 3 files changed, 187 insertions(+), 7 deletions(-)
40 create mode 100644 mkspecs/linux-oe-g++/qmake.conf 41 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
41 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 42 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
42 43
@@ -149,10 +150,10 @@ index 9c86fa1..7dea731 100755
149 setBootstrapVariable QMAKE_CFLAGS_RELEASE 150 setBootstrapVariable QMAKE_CFLAGS_RELEASE
150diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 151diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
151new file mode 100644 152new file mode 100644
152index 0000000..42966fe 153index 0000000..ca26b10
153--- /dev/null 154--- /dev/null
154+++ b/mkspecs/linux-oe-g++/qmake.conf 155+++ b/mkspecs/linux-oe-g++/qmake.conf
155@@ -0,0 +1,39 @@ 156@@ -0,0 +1,40 @@
156+# 157+#
157+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded 158+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
158+# 159+#
@@ -166,6 +167,7 @@ index 0000000..42966fe
166+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip 167+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip
167+QMAKE_AR = $(OE_QMAKE_AR) cqs 168+QMAKE_AR = $(OE_QMAKE_AR) cqs
168+QMAKE_STRIP = $(OE_QMAKE_STRIP) 169+QMAKE_STRIP = $(OE_QMAKE_STRIP)
170+QMAKE_WAYLAND_SCANNER = $(OE_QMAKE_WAYLAND_SCANNER)
169+ 171+
170+include(../common/gcc-base-unix.conf) 172+include(../common/gcc-base-unix.conf)
171+ 173+
diff --git a/recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch
new file mode 100644
index 00000000..ca55e625
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch
@@ -0,0 +1,81 @@
1From db28b82f5a0deb14f57dcfe5c2743ec6b844b9aa Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 5 May 2013 11:18:34 +0200
4Subject: [PATCH 12/12] wayland-scanner: disable silent rules
5
6* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
7
8Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 mkspecs/features/wayland-scanner.prf | 14 +++++++-------
12 1 file changed, 7 insertions(+), 7 deletions(-)
13
14diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf
15index 2ec064f..847d0f7 100644
16--- a/mkspecs/features/wayland-scanner.prf
17+++ b/mkspecs/features/wayland-scanner.prf
18@@ -10,7 +10,7 @@ wayland-server-header.input = WAYLANDSERVERSOURCES
19 wayland-server-header.variable_out = HEADERS
20 wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
21 wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
22-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
23+#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
24 QMAKE_EXTRA_COMPILERS += wayland-server-header
25
26 wayland-client-header.name = wayland ${QMAKE_FILE_BASE}
27@@ -18,7 +18,7 @@ wayland-client-header.input = WAYLANDCLIENTSOURCES
28 wayland-client-header.variable_out = HEADERS
29 wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
30 wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
31-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
32+#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
33 QMAKE_EXTRA_COMPILERS += wayland-client-header
34
35 wayland-code.name = wayland ${QMAKE_FILE_BASE}
36@@ -26,7 +26,7 @@ wayland-code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES
37 wayland-code.variable_out = SOURCES
38 wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c
39 wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
40-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
41+#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
42 QMAKE_EXTRA_COMPILERS += wayland-code
43
44 qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner)
45@@ -37,7 +37,7 @@ qtwayland-client-header.variable_out = HEADERS
46 qtwayland-client-header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
47 qtwayland-client-header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
48 qtwayland-client-header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
49-silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands
50+#silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands
51 QMAKE_EXTRA_COMPILERS += qtwayland-client-header
52
53 qtwayland-client-code.name = qtwayland ${QMAKE_FILE_BASE}
54@@ -46,7 +46,7 @@ qtwayland-client-code.variable_out = SOURCES
55 qtwayland-client-code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
56 qtwayland-client-code.output = qwayland-${QMAKE_FILE_BASE}.cpp
57 qtwayland-client-code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
58-silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands
59+#silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands
60 QMAKE_EXTRA_COMPILERS += qtwayland-client-code
61
62 qtwayland-server-header.name = qtwayland ${QMAKE_FILE_BASE}
63@@ -55,7 +55,7 @@ qtwayland-server-header.variable_out = HEADERS
64 qtwayland-server-header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
65 qtwayland-server-header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
66 qtwayland-server-header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
67-silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands
68+#silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands
69 QMAKE_EXTRA_COMPILERS += qtwayland-server-header
70
71 qtwayland-server-code.name = qtwayland ${QMAKE_FILE_BASE}
72@@ -64,5 +64,5 @@ qtwayland-server-code.variable_out = SOURCES
73 qtwayland-server-code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)}
74 qtwayland-server-code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp
75 qtwayland-server-code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
76-silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands
77+#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands
78 QMAKE_EXTRA_COMPILERS += qtwayland-server-code
79--
801.8.2.1
81
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc
index f34e71cf..9f7b0f71 100644
--- a/recipes-qt/qt5/qtbase-native.inc
+++ b/recipes-qt/qt5/qtbase-native.inc
@@ -18,6 +18,7 @@ SRC_URI += " \
18 file://0009-qt_module-Fix-pkgconfig-replacement.patch \ 18 file://0009-qt_module-Fix-pkgconfig-replacement.patch \
19 file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \ 19 file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \
20 file://0011-qt_module-Fix-paths-in-.prl-files.patch \ 20 file://0011-qt_module-Fix-paths-in-.prl-files.patch \
21 file://0012-wayland-scanner-disable-silent-rules.patch \
21" 22"
22 23
23SEPB = "${WORKDIR}/build" 24SEPB = "${WORKDIR}/build"
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 500482ce..80ce22f1 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -11,6 +11,7 @@ SRC_URI += " \
11 file://0009-qt_module-Fix-pkgconfig-replacement.patch \ 11 file://0009-qt_module-Fix-pkgconfig-replacement.patch \
12 file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \ 12 file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \
13 file://0011-qt_module-Fix-paths-in-.prl-files.patch \ 13 file://0011-qt_module-Fix-paths-in-.prl-files.patch \
14 file://0012-wayland-scanner-disable-silent-rules.patch \
14" 15"
15 16
16DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev" 17DEPENDS += "qtbase-native virtual/libgl freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev"
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 49244bef..5907490c 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 @@
1From f5d5c9778031fbb807753c67133ddda35f9a0e30 Mon Sep 17 00:00:00 2001 1From ccf2e79173cfd0fee9f1e603107792dd5aa8e775 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 01/11] Add linux-oe-g++ platform 4Subject: [PATCH 01/12] 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
@@ -31,12 +31,13 @@ Subject: [PATCH 01/11] Add linux-oe-g++ platform
31 31
32Upstream-Status: Pending 32Upstream-Status: Pending
33 33
34Change-Id: Ia0cc6a6b00ec78442d80ed2a3cf40b604588a0f6
34Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 35Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
35--- 36---
36 configure | 54 ++++++++++++++++--- 37 configure | 54 ++++++++++++++++---
37 mkspecs/linux-oe-g++/qmake.conf | 39 ++++++++++++++ 38 mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++
38 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++ 39 mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++++++++++++++++++++++++++++++++++
39 3 files changed, 186 insertions(+), 7 deletions(-) 40 3 files changed, 187 insertions(+), 7 deletions(-)
40 create mode 100644 mkspecs/linux-oe-g++/qmake.conf 41 create mode 100644 mkspecs/linux-oe-g++/qmake.conf
41 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 42 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
42 43
@@ -149,10 +150,10 @@ index 89246c8..0ab8eee 100755
149 EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION" 150 EXTRA_CFLAGS="$EXTRA_CFLAGS -DQMAKE_OPENSOURCE_EDITION"
150diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 151diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
151new file mode 100644 152new file mode 100644
152index 0000000..42966fe 153index 0000000..ca26b10
153--- /dev/null 154--- /dev/null
154+++ b/mkspecs/linux-oe-g++/qmake.conf 155+++ b/mkspecs/linux-oe-g++/qmake.conf
155@@ -0,0 +1,39 @@ 156@@ -0,0 +1,40 @@
156+# 157+#
157+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded 158+# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
158+# 159+#
@@ -166,6 +167,7 @@ index 0000000..42966fe
166+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip 167+# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip
167+QMAKE_AR = $(OE_QMAKE_AR) cqs 168+QMAKE_AR = $(OE_QMAKE_AR) cqs
168+QMAKE_STRIP = $(OE_QMAKE_STRIP) 169+QMAKE_STRIP = $(OE_QMAKE_STRIP)
170+QMAKE_WAYLAND_SCANNER = $(OE_QMAKE_WAYLAND_SCANNER)
169+ 171+
170+include(../common/gcc-base-unix.conf) 172+include(../common/gcc-base-unix.conf)
171+ 173+
diff --git a/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch
new file mode 100644
index 00000000..9431e79e
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch
@@ -0,0 +1,45 @@
1From 41a352655485234eda87b150154001ce89496505 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sun, 5 May 2013 11:18:34 +0200
4Subject: [PATCH 12/12] wayland-scanner: disable silent rules
5
6* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands
7
8Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 mkspecs/features/wayland-scanner.prf | 6 +++---
12 1 file changed, 3 insertions(+), 3 deletions(-)
13
14diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf
15index 90e1e0f..0750849 100644
16--- a/mkspecs/features/wayland-scanner.prf
17+++ b/mkspecs/features/wayland-scanner.prf
18@@ -10,7 +10,7 @@ wayland-server-header.variable_out = HEADERS
19 wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)}
20 wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
21
22-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
23+#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands
24 QMAKE_EXTRA_COMPILERS += wayland-server-header
25
26 wayland-client-header.name = wayland ${QMAKE_FILE_BASE}
27@@ -19,7 +19,7 @@ wayland-client-header.variable_out = HEADERS
28 wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)}
29 wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
30
31-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
32+#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands
33 QMAKE_EXTRA_COMPILERS += wayland-client-header
34
35 wayland-code.name = wayland ${QMAKE_FILE_BASE}
36@@ -28,5 +28,5 @@ wayland-code.variable_out = SOURCES
37 wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c
38 wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
39
40-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
41+#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands
42 QMAKE_EXTRA_COMPILERS += wayland-code
43--
441.8.2.1
45
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-05 01:12:02 +0000