From ab7479ea17e0eb02db0e29f14d203394428d8b76 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 7 Aug 2014 21:20:48 +0200 Subject: [PATCH] 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']) (From meta-qt5 rev: 02861e677ab95b537efb331fb7faea4e5851d2ea) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- .../0003-add-noqtwebkit-configuration.patch | 51 ++++++++++++++++++++++ .../0003-add-noqtwebkit-configuration.patch | 26 +++++++---- 2 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 meta-qt5/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch diff --git a/meta-qt5/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch b/meta-qt5/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch new file mode 100644 index 0000000..fa3ac1a --- /dev/null +++ b/meta-qt5/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch @@ -0,0 +1,51 @@ +From 6bb257d69ba7ac93b2b11aae35e0a523785d94ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 4 Jun 2014 11:28:16 +0200 +Subject: [PATCH 3/3] add noqtwebkit configuration +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropiate [configuration] + +Signed-off-by: Andreas Müller +Signed-off-by: Martin Jansa +--- + src/assistant/assistant/assistant.pro | 4 ++-- + src/designer/src/plugins/plugins.pro | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro +index 5f96377..71acdfc 100644 +--- a/src/assistant/assistant/assistant.pro ++++ b/src/assistant/assistant/assistant.pro +@@ -1,4 +1,4 @@ +-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { ++qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { + QT += webkitwidgets + } else { + DEFINES += QT_NO_WEBKIT +@@ -72,7 +72,7 @@ SOURCES += aboutdialog.cpp \ + openpageswidget.cpp \ + openpagesmanager.cpp \ + openpagesswitcher.cpp +-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { ++qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { + SOURCES += helpviewer_qwv.cpp + } else { + SOURCES += helpviewer_qtb.cpp +diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro +index 500a153..b60fa2d 100644 +--- a/src/designer/src/plugins/plugins.pro ++++ b/src/designer/src/plugins/plugins.pro +@@ -1,6 +1,6 @@ + TEMPLATE = subdirs + + # qtHaveModule(opengl): SUBDIRS += tools/view3d +-qtHaveModule(webkitwidgets): SUBDIRS += qwebview ++qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit): SUBDIRS += qwebview + win32: qtHaveModule(axcontainer): SUBDIRS += activeqt + qtHaveModule(quickwidgets): SUBDIRS += qquickwidget +-- +2.0.4 + diff --git a/meta-qt5/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/meta-qt5/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch index 956bff2..fa3ac1a 100644 --- a/meta-qt5/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +++ b/meta-qt5/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch @@ -1,4 +1,4 @@ -From d59c24913f7edb0809ed32cf6dfeea874860d783 Mon Sep 17 00:00:00 2001 +From 6bb257d69ba7ac93b2b11aae35e0a523785d94ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 4 Jun 2014 11:28:16 +0200 Subject: [PATCH 3/3] add noqtwebkit configuration @@ -9,23 +9,33 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropiate [configuration] Signed-off-by: Andreas Müller +Signed-off-by: Martin Jansa --- - src/assistant/assistant/assistant.pro | 2 +- + src/assistant/assistant/assistant.pro | 4 ++-- src/designer/src/plugins/plugins.pro | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro -index 5f96377..e2dfa61 100644 +index 5f96377..71acdfc 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -1,4 +1,4 @@ -qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { -+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(QT_CONFIG, noqtwebkit) { ++qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { QT += webkitwidgets } else { DEFINES += QT_NO_WEBKIT +@@ -72,7 +72,7 @@ SOURCES += aboutdialog.cpp \ + openpageswidget.cpp \ + openpagesmanager.cpp \ + openpagesswitcher.cpp +-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { ++qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { + SOURCES += helpviewer_qwv.cpp + } else { + SOURCES += helpviewer_qtb.cpp diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro -index 500a153..12a6127 100644 +index 500a153..b60fa2d 100644 --- a/src/designer/src/plugins/plugins.pro +++ b/src/designer/src/plugins/plugins.pro @@ -1,6 +1,6 @@ @@ -33,9 +43,9 @@ index 500a153..12a6127 100644 # qtHaveModule(opengl): SUBDIRS += tools/view3d -qtHaveModule(webkitwidgets): SUBDIRS += qwebview -+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, noqtwebkit): SUBDIRS += qwebview ++qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit): SUBDIRS += qwebview win32: qtHaveModule(axcontainer): SUBDIRS += activeqt qtHaveModule(quickwidgets): SUBDIRS += qquickwidget -- -2.0.0 +2.0.4 -- 2.7.4