commit: 8947d869217415b683ab5d3325fd5a917e1779e3
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 05:28:02 2021 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 05:36:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8947d869
dev-qt/qt-creator: add USE flag to disable the qmake project manager
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
dev-qt/qt-creator/metadata.xml | 3 ++-
dev-qt/qt-creator/qt-creator-9999.ebuild | 16 +++++++++-------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index bdaf1a3ad21f..d2e6af3e1338 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -37,7 +37,8 @@
<flag name="perforce">Add support for Perforce version control
system (requires manual installation of Perforce client)</flag>
<flag name="perfprofiler">Build the Linux Perf-based profiler
plugin</flag>
<flag name="python">Build plugin for Python language
support</flag>
- <flag name="qbs">Build plugin for QBS-based projects</flag>
+ <flag name="qbs">Build plugin for Qbs-based projects</flag>
+ <flag name="qmake">Build plugin for qmake-based projects</flag>
<flag name="qml">Build plugins for QML-based development
(designer, editor, project manager)</flag>
<flag name="qmldesigner">Enable designer for QML/QtQuick-based
UIs</flag>
<flag name="qmljs">Build the QML/JavaScript editor plugin</flag>
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild
b/dev-qt/qt-creator/qt-creator-9999.ebuild
index c199ce2d341b..d0d62b73a9e0 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -24,13 +24,11 @@ fi
LICENSE="GPL-3"
SLOT="0"
-QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal
bazaar beautifier boot2qt
- '+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
'+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
- qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal
silversearcher subversion valgrind
- webassembly)
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal
bazaar beautifier boot2qt '+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 qmake:qmakeprojectmanager
'+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="
@@ -39,6 +37,7 @@ REQUIRED_USE="
clang? ( lsp )
mcu? ( baremetal cmake )
python? ( lsp )
+ qml? ( qmake )
qnx? ( remotelinux )
"
@@ -149,6 +148,9 @@ src_prepare() {
sed -i -e '/tracing/d' src/libs/libs.pro
tests/auto/auto.pro || die
fi
fi
+ if ! use qmake; then
+ sed -i -e '/buildoutputparser/d' src/tools/tools.pro || die
+ fi
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