summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch14
-rw-r--r--recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch2
3 files changed, 11 insertions, 11 deletions
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 acc532e3..3f35e7dd 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,4 +1,4 @@
1From 3701cce26ce6f90e4b5e4c71c73d333d43b5ac08 Mon Sep 17 00:00:00 2001 1From 5a9a1e8da67d2bf1672982f087995c8e0e8b3577 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] Add linux-oe-g++ platform 4Subject: [PATCH] Add linux-oe-g++ platform
@@ -31,7 +31,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
31 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 31 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
32 32
33diff --git a/configure b/configure 33diff --git a/configure b/configure
34index ef7bad1bfc..dcca0f9135 100755 34index ef7bad1bfce..dcca0f91359 100755
35--- a/configure 35--- a/configure
36+++ b/configure 36+++ b/configure
37@@ -712,7 +712,7 @@ fi 37@@ -712,7 +712,7 @@ fi
@@ -44,7 +44,7 @@ index ef7bad1bfc..dcca0f9135 100755
44 44
45 # build qmake 45 # build qmake
46diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 46diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
47index 934a18a924..0f5b1b6333 100644 47index 934a18a9249..0f5b1b63334 100644
48--- a/mkspecs/features/configure.prf 48--- a/mkspecs/features/configure.prf
49+++ b/mkspecs/features/configure.prf 49+++ b/mkspecs/features/configure.prf
50@@ -46,14 +46,14 @@ defineTest(qtCompileTest) { 50@@ -46,14 +46,14 @@ defineTest(qtCompileTest) {
@@ -65,7 +65,7 @@ index 934a18a924..0f5b1b6333 100644
65 msg = "test $$1 succeeded" 65 msg = "test $$1 succeeded"
66 write_file($$QMAKE_CONFIG_LOG, msg, append) 66 write_file($$QMAKE_CONFIG_LOG, msg, append)
67diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf 67diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
68index d16b3cf1be..df219ce34c 100644 68index 90e318e2a48..3e8568ed675 100644
69--- a/mkspecs/features/qt.prf 69--- a/mkspecs/features/qt.prf
70+++ b/mkspecs/features/qt.prf 70+++ b/mkspecs/features/qt.prf
71@@ -147,7 +147,7 @@ import_plugins:qtConfig(static) { 71@@ -147,7 +147,7 @@ import_plugins:qtConfig(static) {
@@ -89,7 +89,7 @@ index d16b3cf1be..df219ce34c 100644
89 # run qmlimportscanner 89 # run qmlimportscanner
90 qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) 90 qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system)
91diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 91diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
92index 1903e509c8..c093dd4592 100644 92index 1903e509c8e..c093dd4592d 100644
93--- a/mkspecs/features/qt_functions.prf 93--- a/mkspecs/features/qt_functions.prf
94+++ b/mkspecs/features/qt_functions.prf 94+++ b/mkspecs/features/qt_functions.prf
95@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { 95@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
@@ -103,7 +103,7 @@ index 1903e509c8..c093dd4592 100644
103 cmd = perl -w $$system_path($${cmd}.pl) 103 cmd = perl -w $$system_path($${cmd}.pl)
104diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 104diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
105new file mode 100644 105new file mode 100644
106index 0000000000..c202c47fa1 106index 00000000000..c202c47fa15
107--- /dev/null 107--- /dev/null
108+++ b/mkspecs/linux-oe-g++/qmake.conf 108+++ b/mkspecs/linux-oe-g++/qmake.conf
109@@ -0,0 +1,39 @@ 109@@ -0,0 +1,39 @@
@@ -148,7 +148,7 @@ index 0000000000..c202c47fa1
148+load(qt_config) 148+load(qt_config)
149diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h 149diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h
150new file mode 100644 150new file mode 100644
151index 0000000000..5d22fb4101 151index 00000000000..5d22fb41013
152--- /dev/null 152--- /dev/null
153+++ b/mkspecs/linux-oe-g++/qplatformdefs.h 153+++ b/mkspecs/linux-oe-g++/qplatformdefs.h
154@@ -0,0 +1 @@ 154@@ -0,0 +1 @@
diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
index fe5746e2..5a9eb404 100644
--- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
+++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
@@ -1,4 +1,4 @@
1From 4486a9740b07aa7902f638efe23a51ee619f9600 Mon Sep 17 00:00:00 2001 1From 289f366363eeca03c27fd718c8b3ae53dcc28586 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 3 Sep 2017 09:11:44 -0700 3Date: Sun, 3 Sep 2017 09:11:44 -0700
4Subject: [PATCH] Add OE specific specs for clang compiler 4Subject: [PATCH] Add OE specific specs for clang compiler
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 13
14diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf 14diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf
15new file mode 100644 15new file mode 100644
16index 0000000000..db02ab5215 16index 00000000000..db02ab5215f
17--- /dev/null 17--- /dev/null
18+++ b/mkspecs/linux-oe-clang/qmake.conf 18+++ b/mkspecs/linux-oe-clang/qmake.conf
19@@ -0,0 +1,39 @@ 19@@ -0,0 +1,39 @@
@@ -58,7 +58,7 @@ index 0000000000..db02ab5215
58+load(qt_config) 58+load(qt_config)
59diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h 59diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h
60new file mode 100644 60new file mode 100644
61index 0000000000..880c927b21 61index 00000000000..880c927b218
62--- /dev/null 62--- /dev/null
63+++ b/mkspecs/linux-oe-clang/qplatformdefs.h 63+++ b/mkspecs/linux-oe-clang/qplatformdefs.h
64@@ -0,0 +1 @@ 64@@ -0,0 +1 @@
diff --git a/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
index 552c7513..68cca92a 100644
--- a/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
+++ b/recipes-qt/qt5/qtbase/0015-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch
@@ -1,4 +1,4 @@
1From ec343b946779a13d77ec1740605f6f5fe75077f3 Mon Sep 17 00:00:00 2001 1From f39cf06f1242fc8391561bbbfb0741fbd58194f1 Mon Sep 17 00:00:00 2001
2From: Max Krummenacher <max.krummenacher@toradex.com> 2From: Max Krummenacher <max.krummenacher@toradex.com>
3Date: Sat, 27 Oct 2018 12:29:31 +0000 3Date: Sat, 27 Oct 2018 12:29:31 +0000
4Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to 4Subject: [PATCH] Qt5GuiConfigExtras.cmake.in: cope with variable path to