diff options
author | Jonathan Liu <net147@gmail.com> | 2014-12-11 15:52:18 +1100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-11 13:24:22 +0100 |
commit | 6566f728ab3d14a4908516fb13ad555dbfe04471 (patch) | |
tree | d73319dd12e71d434c01b25d04f9b5c84a5c83cc /recipes-qt/qt5/qttools | |
parent | c9a1041cb956d94c04cbf635b00ca19725ffc129 (diff) | |
download | meta-qt5-6566f728ab3d14a4908516fb13ad555dbfe04471.tar.gz |
recipes: upgrade from 5.3.2 to 5.4.0
MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM
MJ: qtwebkit: move leveldb dependency to .inc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qttools')
3 files changed, 15 insertions, 14 deletions
diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch index 5cebe258..e4ad2210 100644 --- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch +++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7bd3f1feea0ec1121a73faa1214e72702954b317 Mon Sep 17 00:00:00 2001 | 1 | From ff3f521648906d07ddc1e1aecaddadb95b0314f3 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: Wed, 11 Sep 2013 18:30:08 +0200 | 3 | Date: Wed, 11 Sep 2013 18:30:08 +0200 |
4 | Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert | 4 | Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert |
@@ -11,23 +11,24 @@ Upstream-Status: Pending | |||
11 | 11 | ||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
13 | --- | 13 | --- |
14 | examples/examples.pro | 4 ++-- | 14 | examples/examples.pro | 3 ++- |
15 | src/designer/src/src.pro | 16 +++++++++------- | 15 | src/designer/src/src.pro | 16 +++++++++------- |
16 | src/linguist/linguist.pro | 2 +- | 16 | src/linguist/linguist.pro | 2 +- |
17 | src/src.pro | 14 ++++++++------ | 17 | src/src.pro | 14 ++++++++------ |
18 | tests/auto/auto.pro | 24 +++++++++++++----------- | 18 | tests/auto/auto.pro | 24 +++++++++++++----------- |
19 | 5 files changed, 33 insertions(+), 27 deletions(-) | 19 | 5 files changed, 33 insertions(+), 26 deletions(-) |
20 | 20 | ||
21 | diff --git a/examples/examples.pro b/examples/examples.pro | 21 | diff --git a/examples/examples.pro b/examples/examples.pro |
22 | index 4955969..8e86419 100644 | 22 | index 69365d1..da7b38b 100644 |
23 | --- a/examples/examples.pro | 23 | --- a/examples/examples.pro |
24 | +++ b/examples/examples.pro | 24 | +++ b/examples/examples.pro |
25 | @@ -1,3 +1,3 @@ | 25 | @@ -1,4 +1,5 @@ |
26 | TEMPLATE = subdirs | 26 | TEMPLATE = subdirs |
27 | -qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant | 27 | -qtHaveModule(widgets): SUBDIRS += help designer linguist uitools assistant |
28 | - | ||
29 | +!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant | 28 | +!linguistonly:qtHaveModule(widgets): SUBDIRS += help designer assistant |
30 | +qtHaveModule(widgets): SUBDIRS += linguist uitools | 29 | +qtHaveModule(widgets): SUBDIRS += linguist uitools |
30 | |||
31 | winrt: SUBDIRS -= assistant designer | ||
31 | diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro | 32 | diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro |
32 | index e02ca8e..49527c5 100644 | 33 | index e02ca8e..49527c5 100644 |
33 | --- a/src/designer/src/src.pro | 34 | --- a/src/designer/src/src.pro |
@@ -74,7 +75,7 @@ index 3a70580..a977878 100644 | |||
74 | qtNomakeTools( \ | 75 | qtNomakeTools( \ |
75 | linguist \ | 76 | linguist \ |
76 | diff --git a/src/src.pro b/src/src.pro | 77 | diff --git a/src/src.pro b/src/src.pro |
77 | index a486d65..3aeac1e 100644 | 78 | index 722b32e..9453152 100644 |
78 | --- a/src/src.pro | 79 | --- a/src/src.pro |
79 | +++ b/src/src.pro | 80 | +++ b/src/src.pro |
80 | @@ -4,10 +4,12 @@ qtHaveModule(widgets) { | 81 | @@ -4,10 +4,12 @@ qtHaveModule(widgets) { |
@@ -110,14 +111,14 @@ index a486d65..3aeac1e 100644 | |||
110 | +!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus | 111 | +!linguistonly:qtHaveModule(dbus): SUBDIRS += qdbus |
111 | 112 | ||
112 | win32|winrt:SUBDIRS += windeployqt | 113 | win32|winrt:SUBDIRS += windeployqt |
113 | winrt:SUBDIRS += winrtrunner qtd3dservice | 114 | winrt:SUBDIRS += winrtrunner |
114 | -qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag | 115 | -qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag |
115 | +!linguistonly:qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag | 116 | +!linguistonly:qtHaveModule(gui):!android:!ios:!qnx:!wince*:!winrt*:SUBDIRS += qtdiag |
116 | 117 | ||
117 | qtNomakeTools( \ | 118 | qtNomakeTools( \ |
118 | pixeltool \ | 119 | pixeltool \ |
119 | diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro | 120 | diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro |
120 | index c3acfe3..f2f88f7 100644 | 121 | index df240e3..27ee687 100644 |
121 | --- a/tests/auto/auto.pro | 122 | --- a/tests/auto/auto.pro |
122 | +++ b/tests/auto/auto.pro | 123 | +++ b/tests/auto/auto.pro |
123 | @@ -1,15 +1,17 @@ | 124 | @@ -1,15 +1,17 @@ |
@@ -150,5 +151,5 @@ index c3acfe3..f2f88f7 100644 | |||
150 | installed_cmake.depends = cmake | 151 | installed_cmake.depends = cmake |
151 | 152 | ||
152 | -- | 153 | -- |
153 | 2.1.1 | 154 | 2.1.3 |
154 | 155 | ||
diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch index d25904e6..5cc317ce 100644 --- a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch +++ b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a74f00b2a64dde326a78f7523f875d7e14ee45f5 Mon Sep 17 00:00:00 2001 | 1 | From 20dd8d70eb3db17173eb3965e757711cc694de2a Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 | 3 | Date: Fri, 17 Jan 2014 14:33:19 +0100 |
4 | Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries | 4 | Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries |
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644 | |||
28 | + | 28 | + |
29 | +LIBS += -lQt5CLucene | 29 | +LIBS += -lQt5CLucene |
30 | -- | 30 | -- |
31 | 2.1.1 | 31 | 2.1.3 |
32 | 32 | ||
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index 98a0bc69..bf5957bc 100644 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 7388296f5219725801aeb9d8b0a2f4ba01a7ca6d Mon Sep 17 00:00:00 2001 | 1 | From 1d8bf41acc2235528f1d08505cf2dc8afd793aef Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 | 3 | Date: Wed, 4 Jun 2014 11:28:16 +0200 |
4 | Subject: [PATCH 3/3] add noqtwebkit configuration | 4 | Subject: [PATCH 3/3] add noqtwebkit configuration |
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644 | |||
47 | win32: qtHaveModule(axcontainer): SUBDIRS += activeqt | 47 | win32: qtHaveModule(axcontainer): SUBDIRS += activeqt |
48 | qtHaveModule(quickwidgets): SUBDIRS += qquickwidget | 48 | qtHaveModule(quickwidgets): SUBDIRS += qquickwidget |
49 | -- | 49 | -- |
50 | 2.1.1 | 50 | 2.1.3 |
51 | 51 | ||