diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-07 21:20:48 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-11 13:34:30 +0200 |
commit | a06222499ab602e7c67c1433dd0b559d51d3d744 (patch) | |
tree | eefe9b4dbcdbec178dd752b1358b344016db6996 | |
parent | 1ae6dea45986f0588cea30b946e2505be01ca5f9 (diff) | |
download | meta-qt5-a06222499ab602e7c67c1433dd0b559d51d3d744.tar.gz |
qttools: fix noqtwebkit option
* it's added to CONFIG variable not QT_CONFIG
* qtwebkit was still detected and linked against
DEBUG: qttools-tools: Dependency libQt5WebKitWidgets.so.5 requires
package qtwebkit (used by files:
['qttools/5.3.1-r0/packages-split/qttools-tools/usr/bin/qt5/assistant',
'qttools/5.3.1-r0/packages-split/qttools-plugins/usr/lib/qt5/plugins/designer/libqwebview.so'])
DEBUG: qttools-tools: Dependency libQt5WebKit.so.5 requires package
qtwebkit (used by files:
['qttools/5.3.1-r0/packages-split/qttools-tools/usr/bin/qt5/assistant'])
DEBUG: qttools-plugins: Dependency libQt5WebKitWidgets.so.5 requires
package qtwebkit (used by files:
['qttools/5.3.1-r0/packages-split/qttools-tools/usr/bin/qt5/assistant',
'qttools/5.3.1-r0/packages-split/qttools-plugins/usr/lib/qt5/plugins/designer/libqwebview.so'])
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index 3238d795..ff7d3002 100644 --- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From e6b77a5732610816948a8a860a9cb9e92b02c33e Mon Sep 17 00:00:00 2001 | 1 | From 434d38b073556deaca2412cd9e71645b73732e90 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 3/3] add noqtwebkit configuration |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -9,23 +9,33 @@ Content-Transfer-Encoding: 8bit | |||
9 | Upstream-Status: Inappropiate [configuration] | 9 | Upstream-Status: Inappropiate [configuration] |
10 | 10 | ||
11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | 11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> |
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | 13 | --- |
13 | src/assistant/assistant/assistant.pro | 2 +- | 14 | src/assistant/assistant/assistant.pro | 4 ++-- |
14 | src/designer/src/plugins/plugins.pro | 2 +- | 15 | src/designer/src/plugins/plugins.pro | 2 +- |
15 | 2 files changed, 2 insertions(+), 2 deletions(-) | 16 | 2 files changed, 3 insertions(+), 3 deletions(-) |
16 | 17 | ||
17 | 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 |
18 | index 5f96377..e461d4b 100644 | 19 | index 5f96377..71acdfc 100644 |
19 | --- a/src/assistant/assistant/assistant.pro | 20 | --- a/src/assistant/assistant/assistant.pro |
20 | +++ b/src/assistant/assistant/assistant.pro | 21 | +++ b/src/assistant/assistant/assistant.pro |
21 | @@ -1,4 +1,4 @@ | 22 | @@ -1,4 +1,4 @@ |
22 | -qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { | 23 | -qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { |
23 | +qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(QT_CONFIG, noqtwebkit) { | 24 | +qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { |
24 | QT += webkitwidgets | 25 | QT += webkitwidgets |
25 | } else { | 26 | } else { |
26 | DEFINES += QT_NO_WEBKIT | 27 | DEFINES += QT_NO_WEBKIT |
28 | @@ -72,7 +72,7 @@ SOURCES += aboutdialog.cpp \ | ||
29 | openpageswidget.cpp \ | ||
30 | openpagesmanager.cpp \ | ||
31 | openpagesswitcher.cpp | ||
32 | -qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { | ||
33 | +qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { | ||
34 | SOURCES += helpviewer_qwv.cpp | ||
35 | } else { | ||
36 | SOURCES += helpviewer_qtb.cpp | ||
27 | diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro | 37 | diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro |
28 | index b7ee661..0c6e50a 100644 | 38 | index b7ee661..921ec11 100644 |
29 | --- a/src/designer/src/plugins/plugins.pro | 39 | --- a/src/designer/src/plugins/plugins.pro |
30 | +++ b/src/designer/src/plugins/plugins.pro | 40 | +++ b/src/designer/src/plugins/plugins.pro |
31 | @@ -1,5 +1,5 @@ | 41 | @@ -1,5 +1,5 @@ |
@@ -33,8 +43,8 @@ index b7ee661..0c6e50a 100644 | |||
33 | 43 | ||
34 | # qtHaveModule(opengl): SUBDIRS += tools/view3d | 44 | # qtHaveModule(opengl): SUBDIRS += tools/view3d |
35 | -qtHaveModule(webkitwidgets): SUBDIRS += qwebview | 45 | -qtHaveModule(webkitwidgets): SUBDIRS += qwebview |
36 | +qtHaveModule(webkitwidgets):!contains(QT_CONFIG, noqtwebkit): SUBDIRS += qwebview | 46 | +qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit): SUBDIRS += qwebview |
37 | win32: qtHaveModule(axcontainer): SUBDIRS += activeqt | 47 | win32: qtHaveModule(axcontainer): SUBDIRS += activeqt |
38 | -- | 48 | -- |
39 | 1.8.3.1 | 49 | 2.0.4 |
40 | 50 | ||