diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2021-11-23 05:05:43 +0100 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2021-11-23 05:19:04 +0100 |
| commit | 9ba0be1a9a528038bd6892795905dea469df2cca (patch) | |
| tree | e6e95c58e950ab23f45d7a9d1eb9e0f48dc7d351 /dev-qt/qt-creator/qt-creator-9999.ebuild | |
| parent | dev-qt/qt-creator: always build clangsupport and sqlite internal libs (diff) | |
| download | gentoo-9ba0be1a9a528038bd6892795905dea469df2cca.tar.gz gentoo-9ba0be1a9a528038bd6892795905dea469df2cca.tar.bz2 gentoo-9ba0be1a9a528038bd6892795905dea469df2cca.zip | |
dev-qt/qt-creator: merge qmldesigner and qmljs USE flags
And also put qmlpreview and qmlprojectmanager behind the new flag
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa@gentoo.org>
Diffstat (limited to 'dev-qt/qt-creator/qt-creator-9999.ebuild')
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-9999.ebuild | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index 8db237c5577b..ceec86efbe12 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -28,8 +28,9 @@ QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaa '+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs +designer docker git glsl:glsleditor +help incredibuild lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler - python qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor qmlprofiler qnx remotelinux - scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly) + python qbs:qbsprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome' + qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind + webassembly) IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}" RESTRICT="!test? ( test )" REQUIRED_USE=" @@ -38,7 +39,6 @@ REQUIRED_USE=" clang? ( test? ( qbs ) ) mcu? ( baremetal cmake ) python? ( lsp ) - qmldesigner? ( qmljs ) qnx? ( remotelinux ) " @@ -97,7 +97,7 @@ RDEPEND="${CDEPEND} cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) - qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) + qml? ( >=dev-qt/qtquicktimeline-${QT_PV} ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) @@ -123,7 +123,6 @@ src_prepare() { # disable unwanted plugins for plugin in "${QTC_PLUGINS[@]#[+-]}"; do if ! use ${plugin%:*}; then - einfo "Disabling ${plugin%:*} plugin" sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \ src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin" fi @@ -150,14 +149,11 @@ src_prepare() { sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die fi fi - if ! use qmldesigner; then - sed -i -e '/advanceddockingsystem/d' src/libs/libs.pro || die + if ! use qml; then + sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' src/libs/libs.pro || die sed -i -e '/qml2puppet/d' src/tools/tools.pro || die sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die fi - if ! use qmljs; then - sed -i -e '/qmleditorwidgets/d' src/libs/libs.pro || die - fi if ! use valgrind; then sed -i -e '/valgrindfake/d' src/tools/tools.pro || die sed -i -e '/valgrind/d' tests/auto/auto.pro || die |