diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 11:12:46 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 18:28:08 +0100 |
commit | 4d4a34c5d29ef7b730eb9da87b39f91352ef66fa (patch) | |
tree | 8df0894830a43956bbf1c629dc3938f3f41ca10a /recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | |
parent | fa521467249da68e89c762a178550c8109bccae3 (diff) | |
download | meta-qt5-4d4a34c5d29ef7b730eb9da87b39f91352ef66fa.tar.gz |
recipes: Refresh patches to match git recipes
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch')
-rw-r--r-- | recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index bf5957bc..2e3349ba 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 1d8bf41acc2235528f1d08505cf2dc8afd793aef Mon Sep 17 00:00:00 2001 | 1 | From e3aba30a9cece54dd6a7edfcb39cbb1805b3dcac 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 |
@@ -16,7 +16,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
16 | 2 files changed, 3 insertions(+), 3 deletions(-) | 16 | 2 files changed, 3 insertions(+), 3 deletions(-) |
17 | 17 | ||
18 | diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro | 18 | diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro |
19 | index 5f96377..71acdfc 100644 | 19 | index 6e82b07..56df78c 100644 |
20 | --- a/src/assistant/assistant/assistant.pro | 20 | --- a/src/assistant/assistant/assistant.pro |
21 | +++ b/src/assistant/assistant/assistant.pro | 21 | +++ b/src/assistant/assistant/assistant.pro |
22 | @@ -1,4 +1,4 @@ | 22 | @@ -1,4 +1,4 @@ |
@@ -25,7 +25,7 @@ index 5f96377..71acdfc 100644 | |||
25 | QT += webkitwidgets | 25 | QT += webkitwidgets |
26 | } else { | 26 | } else { |
27 | DEFINES += QT_NO_WEBKIT | 27 | DEFINES += QT_NO_WEBKIT |
28 | @@ -72,7 +72,7 @@ SOURCES += aboutdialog.cpp \ | 28 | @@ -71,7 +71,7 @@ SOURCES += aboutdialog.cpp \ |
29 | openpageswidget.cpp \ | 29 | openpageswidget.cpp \ |
30 | openpagesmanager.cpp \ | 30 | openpagesmanager.cpp \ |
31 | openpagesswitcher.cpp | 31 | openpagesswitcher.cpp |
@@ -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.3 | 50 | 2.3.1 |
51 | 51 | ||