commit: d53edb82fb568c21f9770835a23863018fc58192 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Wed Feb 19 10:42:47 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed Feb 19 11:38:51 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d53edb82
dev-qt/qt-creator: update live Only for obvious changes and not tested much, will look more in-depth for if anything else needs updates when 16.x releases. Closes: https://bugs.gentoo.org/949916 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qt-creator/metadata.xml | 6 +++++- dev-qt/qt-creator/qt-creator-9999.ebuild | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml index 44e472f45a98..d0b42ff4836c 100644 --- a/dev-qt/qt-creator/metadata.xml +++ b/dev-qt/qt-creator/metadata.xml @@ -14,7 +14,11 @@ <flag name="qmldesigner">Build QmlDesigner and related plugins (Insight, StudioWelcome)</flag> <flag name="serialterminal">Build the serial terminal plugin</flag> <flag name="tracing">Build plugins for tracing requiring extra dependencies (AppStatisticsMonitor, CtfVisualizer, PerfProfiler, QmlProfiler)</flag> - <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> with the help USE rather than bundled litehtml</flag> + <flag name="webengine"> + Allow using <pkg>dev-qt/qtwebengine</pkg> for + better USE=help display, and for Design Viewer + Connector support with USE=qmldesigner + </flag> </use> <upstream> <bugs-to>https://bugreports.qt.io/</bugs-to> diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 3ed1685d4f1f..248b71441708 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -71,6 +71,8 @@ COMMON_DEPEND=" qmldesigner? ( >=dev-qt/qtquick3d-${QT_PV}= >=dev-qt/qtsvg-${QT_PV} + >=dev-qt/qtwebsockets-${QT_PV} + webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) ) serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) svg? ( >=dev-qt/qtsvg-${QT_PV} ) @@ -184,6 +186,10 @@ src_configure() { # https://bugreports.qt.io/browse/QTCREATORBUG-29169 $(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes) + # help shouldn't use with the above, but qmldesigner is automagic + $(use help || use qmldesigner && + cmake_use_find_package webengine Qt6WebEngineWidgets) + -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal) -DENABLE_SVG_SUPPORT=$(usex svg) $(usev !cmdbridge-server -DGO_BIN=GO_BIN-NOTFOUND) #945925
