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 | 14 |
1 files changed, 7 insertions, 7 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 976b3001..a793ab49 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 542b69b5534214e9d0ddb4ba328325d0bfcccb50 Mon Sep 17 00:00:00 2001 | 1 | From 4c54d7c45a47a9a63530e821468f7bc76dd78f77 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 |
@@ -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 | ||
33 | diff --git a/configure b/configure | 33 | diff --git a/configure b/configure |
34 | index 2830a1b1897..6445dc2d5a0 100755 | 34 | index 2830a1b189..6445dc2d5a 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 2830a1b1897..6445dc2d5a0 100755 | |||
44 | 44 | ||
45 | # build qmake | 45 | # build qmake |
46 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf | 46 | diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf |
47 | index 934a18a9249..0f5b1b63334 100644 | 47 | index 934a18a924..0f5b1b6333 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 934a18a9249..0f5b1b63334 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) |
67 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf | 67 | diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf |
68 | index b57afcf72d7..afa1c39b3e9 100644 | 68 | index b57afcf72d..afa1c39b3e 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 b57afcf72d7..afa1c39b3e9 100644 | |||
89 | # run qmlimportscanner | 89 | # run qmlimportscanner |
90 | qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) | 90 | qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) |
91 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf | 91 | diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf |
92 | index 1903e509c8e..c093dd4592d 100644 | 92 | index 1903e509c8..c093dd4592 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 1903e509c8e..c093dd4592d 100644 | |||
103 | cmd = perl -w $$system_path($${cmd}.pl) | 103 | cmd = perl -w $$system_path($${cmd}.pl) |
104 | diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf | 104 | diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf |
105 | new file mode 100644 | 105 | new file mode 100644 |
106 | index 00000000000..d90dfeb4482 | 106 | index 0000000000..d90dfeb448 |
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,40 @@ | 109 | @@ -0,0 +1,40 @@ |
@@ -149,7 +149,7 @@ index 00000000000..d90dfeb4482 | |||
149 | +load(qt_config) | 149 | +load(qt_config) |
150 | diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h | 150 | diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h |
151 | new file mode 100644 | 151 | new file mode 100644 |
152 | index 00000000000..5d22fb41013 | 152 | index 0000000000..5d22fb4101 |
153 | --- /dev/null | 153 | --- /dev/null |
154 | +++ b/mkspecs/linux-oe-g++/qplatformdefs.h | 154 | +++ b/mkspecs/linux-oe-g++/qplatformdefs.h |
155 | @@ -0,0 +1 @@ | 155 | @@ -0,0 +1 @@ |