diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 16 |
1 files changed, 8 insertions, 8 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 dbb0b9dc..c2a0d04d 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 @@ | |||
1 | From 6a84c4a36742716b5db715c2538901f37ff8b1c5 Mon Sep 17 00:00:00 2001 | 1 | From 0152f09dc119c93cc92bc2bb9de38c64fb0a854e Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH] Add linux-oe-g++ platform | 4 | Subject: [PATCH] Add linux-oe-g++ platform |
@@ -21,16 +21,16 @@ Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c | |||
21 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 21 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
22 | --- | 22 | --- |
23 | configure | 2 +- | 23 | configure | 2 +- |
24 | mkspecs/features/configure.prf | 4 ++-- | 24 | mkspecs/features/configure.prf | 4 +-- |
25 | mkspecs/features/qt_functions.prf | 2 +- | 25 | mkspecs/features/qt_functions.prf | 2 +- |
26 | mkspecs/linux-oe-g++/qmake.conf | 42 ++++++++++++++++++++++++++++++++++++ | 26 | mkspecs/linux-oe-g++/qmake.conf | 42 ++++++++++++++++++++++++++++ |
27 | mkspecs/linux-oe-g++/qplatformdefs.h | 1 + | 27 | mkspecs/linux-oe-g++/qplatformdefs.h | 1 + |
28 | 5 files changed, 47 insertions(+), 4 deletions(-) | 28 | 5 files changed, 47 insertions(+), 4 deletions(-) |
29 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf | 29 | create mode 100644 mkspecs/linux-oe-g++/qmake.conf |
30 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h | 30 | create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h |
31 | 31 | ||
32 | diff --git a/configure b/configure | 32 | diff --git a/configure b/configure |
33 | index 2830a1b..6445dc2 100755 | 33 | index 2830a1b189..6445dc2d5a 100755 |
34 | --- a/configure | 34 | --- a/configure |
35 | +++ b/configure | 35 | +++ b/configure |
36 | @@ -712,7 +712,7 @@ fi | 36 | @@ -712,7 +712,7 @@ fi |
@@ -43,7 +43,7 @@ index 2830a1b..6445dc2 100755 | |||
43 | 43 | ||
44 | # build qmake | 44 | # build qmake |
45 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf | 45 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf |
46 | index 934a18a..0f5b1b6 100644 | 46 | index 934a18a924..0f5b1b6333 100644 |
47 | --- a/mkspecs/features/configure.prf | 47 | --- a/mkspecs/features/configure.prf |
48 | +++ b/mkspecs/features/configure.prf | 48 | +++ b/mkspecs/features/configure.prf |
49 | @@ -46,14 +46,14 @@ defineTest(qtCompileTest) { | 49 | @@ -46,14 +46,14 @@ defineTest(qtCompileTest) { |
@@ -64,7 +64,7 @@ index 934a18a..0f5b1b6 100644 | |||
64 | msg = "test $$1 succeeded" | 64 | msg = "test $$1 succeeded" |
65 | write_file($$QMAKE_CONFIG_LOG, msg, append) | 65 | write_file($$QMAKE_CONFIG_LOG, msg, append) |
66 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 66 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
67 | index 1903e50..c093dd4 100644 | 67 | index 1903e509c8..c093dd4592 100644 |
68 | --- a/mkspecs/features/qt_functions.prf | 68 | --- a/mkspecs/features/qt_functions.prf |
69 | +++ b/mkspecs/features/qt_functions.prf | 69 | +++ b/mkspecs/features/qt_functions.prf |
70 | @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { | 70 | @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { |
@@ -78,7 +78,7 @@ index 1903e50..c093dd4 100644 | |||
78 | cmd = perl -w $$system_path($${cmd}.pl) | 78 | cmd = perl -w $$system_path($${cmd}.pl) |
79 | diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf | 79 | diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf |
80 | new file mode 100644 | 80 | new file mode 100644 |
81 | index 0000000..30d31ed | 81 | index 0000000000..30d31ed16d |
82 | --- /dev/null | 82 | --- /dev/null |
83 | +++ b/mkspecs/linux-oe-g++/qmake.conf | 83 | +++ b/mkspecs/linux-oe-g++/qmake.conf |
84 | @@ -0,0 +1,42 @@ | 84 | @@ -0,0 +1,42 @@ |
@@ -126,7 +126,7 @@ index 0000000..30d31ed | |||
126 | +load(qt_config) | 126 | +load(qt_config) |
127 | diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h | 127 | diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h |
128 | new file mode 100644 | 128 | new file mode 100644 |
129 | index 0000000..5d22fb4 | 129 | index 0000000000..5d22fb4101 |
130 | --- /dev/null | 130 | --- /dev/null |
131 | +++ b/mkspecs/linux-oe-g++/qplatformdefs.h | 131 | +++ b/mkspecs/linux-oe-g++/qplatformdefs.h |
132 | @@ -0,0 +1 @@ | 132 | @@ -0,0 +1 @@ |