summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch51
-rw-r--r--recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch51
-rw-r--r--recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch51
3 files changed, 132 insertions, 21 deletions
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
index 275f53e6..9419b81b 100644
--- a/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
+++ b/recipes-qt/qt5/qtbase-5.0.2/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
@@ -1,18 +1,20 @@
1From 27465c65419c1b5bdc8ed50e56428ff5fd64f62b Mon Sep 17 00:00:00 2001 1From 0e6b7bcb1c02750368722d1770b0098ce9b28327 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de> 2From: Simon Busch <morphis@gravedo.de>
3Date: Mon, 22 Jul 2013 21:09:41 +0000 3Date: Mon, 22 Jul 2013 21:09:41 +0000
4Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path 4Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to
5 to host binaries 5 host binaries
6 6
7Upstream-Status: Inappropiate (configuration) 7Upstream-Status: Inappropiate (configuration)
8 8
9Signed-off-by: Simon Busch <morphis@gravedo.de> 9Signed-off-by: Simon Busch <morphis@gravedo.de>
10--- 10---
11 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- 11 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
12 1 file changed, 3 insertions(+), 3 deletions(-) 12 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
13 src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
14 3 files changed, 6 insertions(+), 6 deletions(-)
13 15
14diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in 16diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
15index 4e0fcda..2bbb54c 100644 17index 4e0fcda..925a335 100644
16--- a/src/corelib/Qt5CoreConfigExtras.cmake.in 18--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
17+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in 19+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
18@@ -6,7 +6,7 @@ if (NOT TARGET Qt5::qmake) 20@@ -6,7 +6,7 @@ if (NOT TARGET Qt5::qmake)
@@ -42,6 +44,41 @@ index 4e0fcda..2bbb54c 100644
42 !!ENDIF 44 !!ENDIF
43 ) 45 )
44 endif() 46 endif()
47diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
48index 8ecf7ce..af86a88 100644
49--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
50+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
51@@ -6,7 +6,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
52 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
53 IMPORTED_LOCATION \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\"
54 !!ELSE
55- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\"
56+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\"
57 !!ENDIF
58 )
59 endif()
60@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
61 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
62 IMPORTED_LOCATION \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\"
63 !!ELSE
64- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\"
65+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\"
66 !!ENDIF
67 )
68 endif()
69diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
70index d9abb45..ca17862 100644
71--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
72+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
73@@ -6,7 +6,7 @@ if (NOT TARGET Qt5::uic)
74 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
75 IMPORTED_LOCATION \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\"
76 !!ELSE
77- IMPORTED_LOCATION \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\"
78+ IMPORTED_LOCATION \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\"
79 !!ENDIF
80 )
81 endif()
45-- 82--
461.8.3.2 831.8.1.2
47 84
diff --git a/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
index 2b937849..7ca5e808 100644
--- a/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
+++ b/recipes-qt/qt5/qtbase-5.1.0/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
@@ -1,18 +1,20 @@
1From 26ea6bec700ebe345113558c334389cb408780c4 Mon Sep 17 00:00:00 2001 1From ac4f17fd4c9145c54d9b10aa794cabe0d044b4fc Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de> 2From: Simon Busch <morphis@gravedo.de>
3Date: Mon, 22 Jul 2013 21:09:41 +0000 3Date: Mon, 22 Jul 2013 21:09:41 +0000
4Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path 4Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to
5 to host binaries 5 host binaries
6 6
7Upstream-Status: Inappropiate (configuration) 7Upstream-Status: Inappropiate (configuration)
8 8
9Signed-off-by: Simon Busch <morphis@gravedo.de> 9Signed-off-by: Simon Busch <morphis@gravedo.de>
10--- 10---
11 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- 11 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
12 1 file changed, 3 insertions(+), 3 deletions(-) 12 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
13 src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
14 3 files changed, 6 insertions(+), 6 deletions(-)
13 15
14diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in 16diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
15index a804278..a1f8492 100644 17index a804278..b6fbbea 100644
16--- a/src/corelib/Qt5CoreConfigExtras.cmake.in 18--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
17+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in 19+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
18@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) 20@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
@@ -42,6 +44,41 @@ index a804278..a1f8492 100644
42 !!ENDIF 44 !!ENDIF
43 _qt5_Core_check_file_exists(${imported_location}) 45 _qt5_Core_check_file_exists(${imported_location})
44 46
47diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
48index 1d94715..3209e42 100644
49--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
50+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
51@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
52 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
53 set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
54 !!ELSE
55- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
56+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
57 !!ENDIF
58 _qt5_DBus_check_file_exists(${imported_location})
59
60@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
61 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
62 set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
63 !!ELSE
64- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
65+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
66 !!ENDIF
67 _qt5_DBus_check_file_exists(${imported_location})
68
69diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
70index e5650ff..7fb8b21 100644
71--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
72+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
73@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)
74 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
75 set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
76 !!ELSE
77- set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
78+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\")
79 !!ENDIF
80 _qt5_Widgets_check_file_exists(${imported_location})
81
45-- 82--
461.8.3.2 831.8.1.2
47 84
diff --git a/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch b/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
index 061ed656..7ca5e808 100644
--- a/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
+++ b/recipes-qt/qt5/qtbase-git/0024-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch
@@ -1,18 +1,20 @@
1From 03ff55ff67ef7ab929d9b323484da382f6318df2 Mon Sep 17 00:00:00 2001 1From ac4f17fd4c9145c54d9b10aa794cabe0d044b4fc Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de> 2From: Simon Busch <morphis@gravedo.de>
3Date: Mon, 22 Jul 2013 21:09:41 +0000 3Date: Mon, 22 Jul 2013 21:09:41 +0000
4Subject: [PATCH 24/24] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path 4Subject: [PATCH] Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to
5 to host binaries 5 host binaries
6 6
7Upstream-Status: Inappropiate (configuration) 7Upstream-Status: Inappropiate (configuration)
8 8
9Signed-off-by: Simon Busch <morphis@gravedo.de> 9Signed-off-by: Simon Busch <morphis@gravedo.de>
10--- 10---
11 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- 11 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
12 1 file changed, 3 insertions(+), 3 deletions(-) 12 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
13 src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
14 3 files changed, 6 insertions(+), 6 deletions(-)
13 15
14diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in 16diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
15index e01b448..2f6b8ea 100644 17index a804278..b6fbbea 100644
16--- a/src/corelib/Qt5CoreConfigExtras.cmake.in 18--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
17+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in 19+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
18@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake) 20@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qmake)
@@ -42,6 +44,41 @@ index e01b448..2f6b8ea 100644
42 !!ENDIF 44 !!ENDIF
43 _qt5_Core_check_file_exists(${imported_location}) 45 _qt5_Core_check_file_exists(${imported_location})
44 46
47diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
48index 1d94715..3209e42 100644
49--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
50+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
51@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
52 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
53 set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
54 !!ELSE
55- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
56+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\")
57 !!ENDIF
58 _qt5_DBus_check_file_exists(${imported_location})
59
60@@ -20,7 +20,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp)
61 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
62 set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
63 !!ELSE
64- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
65+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")
66 !!ENDIF
67 _qt5_DBus_check_file_exists(${imported_location})
68
69diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
70index e5650ff..7fb8b21 100644
71--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
72+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
73@@ -5,7 +5,7 @@ if (NOT TARGET Qt5::uic)
74 !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
75 set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
76 !!ELSE
77- set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
78+ set(imported_location \"${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic$$CMAKE_BIN_SUFFIX\")
79 !!ENDIF
80 _qt5_Widgets_check_file_exists(${imported_location})
81
45-- 82--
461.8.3.2 831.8.1.2
47 84
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-03 04:04:55 +0000