diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-19 17:02:29 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-22 17:33:38 +0200 |
commit | 9c7507ef155d9c248b6d9b12349c52fa1410e482 (patch) | |
tree | af4e914fe7582afcdf38fcf9223ea4e429fd1513 /recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch | |
parent | 2d14d9956f21f3f096bdda7df1d1ba99cca4a6ed (diff) | |
download | meta-qt5-9c7507ef155d9c248b6d9b12349c52fa1410e482.tar.gz |
qt: upgrade to latest revision in 5.9 branch
* 3 patches were included upstream
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch')
-rw-r--r-- | recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch index ed25390b..7549ce9c 100644 --- a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e0387540876944a20461d60d2208191c734e00b1 Mon Sep 17 00:00:00 2001 | 1 | From 0098107f710e363d41b4913758302b43adccf2bd 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] add noqtwebkit configuration | 4 | Subject: [PATCH] add noqtwebkit configuration |
@@ -16,16 +16,16 @@ 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 540c9689..2312b521 100644 | 19 | index 82f55092..ef07ee03 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 @@ |
23 | -false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { | 23 | -qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { |
24 | +false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { | 24 | +qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { |
25 | # FIXME: currently broken | ||
26 | BROWSER = qtwebkit | 25 | BROWSER = qtwebkit |
27 | } else { | 26 | } else { |
28 | @@ -76,7 +76,7 @@ SOURCES += aboutdialog.cpp \ | 27 | BROWSER = qtextbrowser |
28 | @@ -75,7 +75,7 @@ SOURCES += aboutdialog.cpp \ | ||
29 | openpagesmanager.cpp \ | 29 | openpagesmanager.cpp \ |
30 | openpagesswitcher.cpp | 30 | openpagesswitcher.cpp |
31 | 31 | ||