dev-qt/qtwebengine: Add "designer" USE flag

Bug: https://bugs.gentoo.org/652508

diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index d93362dc7bc23f48faac6ed5cb4de82805524e08..d6bd8540b0f83dbfb565a8bbcb051ba87c304f3e 100644 (file)
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -6,6 +6,7 @@
                <name>Gentoo Qt Project</name>
        </maintainer>
        <use>
+               <flag name="designer">Install QWebEngineView plugin for displaying web pages in <pkg>dev-qt/designer</pkg></flag>
                <flag name="geolocation">Enable physical position determination
                        via <pkg>dev-qt/qtpositioning</pkg></flag>
                <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>

diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild
index 82890439c645236cf56ab435f9847059cf19a2af..152fe1ffb7811fa0a0e36c4aae634fdd871fdc68 100644 (file)
--- a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
-IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
 
 RDEPEND="
        app-arch/snappy:=
@@ -58,6 +59,7 @@ RDEPEND="
        x11-libs/libXScrnSaver
        x11-libs/libXtst
        alsa? ( media-libs/alsa-lib )
+       designer? ( ~dev-qt/designer-${PV} )
        geolocation? ( ~dev-qt/qtpositioning-${PV} )
        pulseaudio? ( media-sound/pulseaudio:= )
        system-ffmpeg? ( media-video/ffmpeg:0= )
@@ -88,6 +90,8 @@ src_prepare() {
        qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
        qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
 
+       qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
        qt_use_disable_mod geolocation positioning \
                mkspecs/features/configure.prf \
                src/core/core_chromium.pri \

diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.6.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.6.ebuild
index df6b40f689079daab74963dab5d119dec9fc889d..6788f042ae3dfe16dcce771ec6b269489b3dae61 100644 (file)
--- a/dev-qt/qtwebengine/qtwebengine-5.9.6.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.6.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
-IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
 
 RDEPEND="
        app-arch/snappy:=
@@ -58,6 +59,7 @@ RDEPEND="
        x11-libs/libXScrnSaver
        x11-libs/libXtst
        alsa? ( media-libs/alsa-lib )
+       designer? ( ~dev-qt/designer-${PV} )
        geolocation? ( ~dev-qt/qtpositioning-${PV} )
        pulseaudio? ( media-sound/pulseaudio:= )
        system-ffmpeg? ( media-video/ffmpeg:0= )
@@ -91,6 +93,8 @@ src_prepare() {
        qt_use_disable_config alsa alsa src/core/config/linux.pri
        qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
 
+       qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
        qt_use_disable_mod geolocation positioning \
                mkspecs/features/configure.prf \
                src/core/core_chromium.pri \