diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2024-06-04 01:35:00 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2024-06-04 15:30:40 -0400 |
| commit | ebfdd71497741a464f52bff7269c78edb3020389 (patch) | |
| tree | 7b8816513c0b9a2fdf6207a9ae5b29de283bad87 /dev-qt/qttools | |
| parent | dev-qt/qtquick3d: update live for 6.8+ branch (diff) | |
| download | gentoo-ebfdd71497741a464f52bff7269c78edb3020389.tar.gz gentoo-ebfdd71497741a464f52bff7269c78edb3020389.tar.bz2 gentoo-ebfdd71497741a464f52bff7269c78edb3020389.zip | |
dev-qt/qttools: update live for 6.8+ branch
QtHelp may possibly be split out of qttools in the future
which would be more convenient for us as well.
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-qt/qttools')
| -rw-r--r-- | dev-qt/qttools/metadata.xml | 1 | ||||
| -rw-r--r-- | dev-qt/qttools/qttools-6.9999.ebuild | 13 |
2 files changed, 11 insertions, 3 deletions
diff --git a/dev-qt/qttools/metadata.xml b/dev-qt/qttools/metadata.xml index 80f6a033c31d..b08d3bc7e49b 100644 --- a/dev-qt/qttools/metadata.xml +++ b/dev-qt/qttools/metadata.xml @@ -15,6 +15,7 @@ <flag name="qdbus">Build the Qt D-Bus Interface (D-Bus Viewer requires USE=widgets)</flag> <flag name="qdoc">Build Qt Documentation Generator</flag> <flag name="qml">Build QML/QtQuick bindings and imports</flag> + <flag name="qmlls">Build the QtHelp plugin for the QML language server</flag> <flag name="qtattributionsscanner">Build Qt Source Code Attribution Scanner</flag> <flag name="qtdiag">Build Qt Diag</flag> <flag name="qtplugininfo">Build Qt Plugin Info</flag> diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild index fd8e80ea6380..5ad1c0f2b81d 100644 --- a/dev-qt/qttools/qttools-6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.9999.ebuild @@ -20,9 +20,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then fi IUSE=" - +assistant clang designer distancefieldgenerator gles2-only - +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner - qtdiag qtplugininfo vulkan +widgets zstd + +assistant clang designer distancefieldgenerator gles2-only +linguist + opengl pixeltool +qdbus qdoc qml qmlls qtattributionsscanner qtdiag + qtplugininfo vulkan +widgets zstd " # note that some tools do not *require* widgets but will skip a sub-tool # if not enabled (e.g. linguist gives lrelease but not the GUI linguist6) @@ -33,6 +33,7 @@ REQUIRED_USE=" distancefieldgenerator? ( qml widgets ) pixeltool? ( widgets ) qdoc? ( clang qml ) + qmlls? ( assistant qml ) " RDEPEND=" @@ -50,6 +51,7 @@ RDEPEND=" ) qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] ) + qmlls? ( ~dev-qt/qtdeclarative-${PV}:6[qmlls] ) qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] ) widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) " @@ -87,6 +89,11 @@ src_configure() { # https://github.com/litehtml/litehtml/issues/266 $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON) + # USE=qmlls' help plugin may be temporary, upstream has plans to split + # QtHelp into another package so that qtdeclarative can depend on it + # without a circular dependency with qttools + $(cmake_use_find_package qmlls Qt6QmlLSPrivate) + $(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634) ) |