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 3f373c76..28c26603 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 805b338154ed0262a7b8bf5c582ff5b193a55492 Mon Sep 17 00:00:00 2001 | 1 | From e13425e6f1e784b0b016cf68a54dfbae32995b86 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 |
@@ -30,10 +30,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
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 bc18e614d2..579a96d787 100755 | 33 | index 73679de621..5a0eebce50 100755 |
34 | --- a/configure | 34 | --- a/configure |
35 | +++ b/configure | 35 | +++ b/configure |
36 | @@ -1614,7 +1614,7 @@ fi | 36 | @@ -709,7 +709,7 @@ fi |
37 | # is where the resulting variable is written to | 37 | # is where the resulting variable is written to |
38 | setBootstrapVariable() | 38 | setBootstrapVariable() |
39 | { | 39 | { |
@@ -43,10 +43,10 @@ index bc18e614d2..579a96d787 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 4ca7c6ba07..5b5ac13f1d 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 | @@ -44,14 +44,14 @@ defineTest(qtCompileTest) { | 49 | @@ -46,14 +46,14 @@ defineTest(qtCompileTest) { |
50 | } | 50 | } |
51 | 51 | ||
52 | # Clean up after previous run | 52 | # Clean up after previous run |
@@ -64,10 +64,10 @@ index 4ca7c6ba07..5b5ac13f1d 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 999cd18154..2ac91ba519 100644 | 67 | index c00fdb73f8..0cf4de7b49 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 | @@ -67,7 +67,7 @@ defineTest(qtHaveModule) { | 70 | @@ -69,7 +69,7 @@ defineTest(qtHaveModule) { |
71 | defineTest(qtPrepareTool) { | 71 | defineTest(qtPrepareTool) { |
72 | cmd = $$eval(QT_TOOL.$${2}.binary) | 72 | cmd = $$eval(QT_TOOL.$${2}.binary) |
73 | isEmpty(cmd) { | 73 | isEmpty(cmd) { |