commit: 8c26c751968845d9c017eb2e5dd59afe21460792 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Sat Nov 1 02:52:19 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Sat Nov 1 02:55:24 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c26c751
dev-qt/qt-creator: fix unused cmake options QA wrt bug #965413 there's still the cmake <3.10 to fix, but will leave that for another time if still needed (not urgent) Bug: https://bugs.gentoo.org/965413 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qt-creator/qt-creator-18.0.0.ebuild | 8 +++----- dev-qt/qt-creator/qt-creator-9999.ebuild | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dev-qt/qt-creator/qt-creator-18.0.0.ebuild b/dev-qt/qt-creator/qt-creator-18.0.0.ebuild index bd093dee7837..f8c5b71c2a25 100644 --- a/dev-qt/qt-creator/qt-creator-18.0.0.ebuild +++ b/dev-qt/qt-creator/qt-creator-18.0.0.ebuild @@ -185,11 +185,9 @@ src_configure() { -DBUILD_PLUGIN_HELP=$(usex help) -DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine) + # TODO?: unbundle litehtml, but support for latest releases + # tend to lag behind and bundled may work out better for now -DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine)) - # TODO?: package litehtml, but support for latest releases seem - # to lag behind and bundled may work out better for now - # 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 && @@ -200,7 +198,7 @@ src_configure() { -DWITH_QMLDESIGNER=$(usex qmldesigner) -DBUILD_EXECUTABLE_CMDBRIDGE=$(usex cmdbridge-server) #945925 - -DUPX_BIN=UPX_BIN-NOTFOUND #961623 + $(usev cmdbridge-server -DUPX_BIN=UPX_BIN-NOTFOUND) #961623 # meant to be in sync with qtbase[journald], but think(?) not worth # handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 2e76c0b1cca1..7aeefd19a5f0 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -185,11 +185,9 @@ src_configure() { -DBUILD_PLUGIN_HELP=$(usex help) -DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine) + # TODO?: unbundle litehtml, but support for latest releases + # tend to lag behind and bundled may work out better for now -DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine)) - # TODO?: package litehtml, but support for latest releases seem - # to lag behind and bundled may work out better for now - # 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 && @@ -200,7 +198,7 @@ src_configure() { -DWITH_QMLDESIGNER=$(usex qmldesigner) -DBUILD_EXECUTABLE_CMDBRIDGE=$(usex cmdbridge-server) #945925 - -DUPX_BIN=UPX_BIN-NOTFOUND #961623 + $(usev cmdbridge-server -DUPX_BIN=UPX_BIN-NOTFOUND) #961623 # meant to be in sync with qtbase[journald], but think(?) not worth # handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays
