1 |
commit: 8947d869217415b683ab5d3325fd5a917e1779e3 |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Nov 29 05:28:02 2021 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Nov 29 05:36:28 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8947d869 |
7 |
|
8 |
dev-qt/qt-creator: add USE flag to disable the qmake project manager |
9 |
|
10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
11 |
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org> |
12 |
|
13 |
dev-qt/qt-creator/metadata.xml | 3 ++- |
14 |
dev-qt/qt-creator/qt-creator-9999.ebuild | 16 +++++++++------- |
15 |
2 files changed, 11 insertions(+), 8 deletions(-) |
16 |
|
17 |
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml |
18 |
index bdaf1a3ad21f..d2e6af3e1338 100644 |
19 |
--- a/dev-qt/qt-creator/metadata.xml |
20 |
+++ b/dev-qt/qt-creator/metadata.xml |
21 |
@@ -37,7 +37,8 @@ |
22 |
<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag> |
23 |
<flag name="perfprofiler">Build the Linux Perf-based profiler plugin</flag> |
24 |
<flag name="python">Build plugin for Python language support</flag> |
25 |
- <flag name="qbs">Build plugin for QBS-based projects</flag> |
26 |
+ <flag name="qbs">Build plugin for Qbs-based projects</flag> |
27 |
+ <flag name="qmake">Build plugin for qmake-based projects</flag> |
28 |
<flag name="qml">Build plugins for QML-based development (designer, editor, project manager)</flag> |
29 |
<flag name="qmldesigner">Enable designer for QML/QtQuick-based UIs</flag> |
30 |
<flag name="qmljs">Build the QML/JavaScript editor plugin</flag> |
31 |
|
32 |
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild |
33 |
index c199ce2d341b..d0d62b73a9e0 100644 |
34 |
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild |
35 |
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild |
36 |
@@ -24,13 +24,11 @@ fi |
37 |
|
38 |
LICENSE="GPL-3" |
39 |
SLOT="0" |
40 |
-QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt |
41 |
- '+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager conan cppcheck |
42 |
- ctfvisualizer cvs +designer docker git glsl:glsleditor +help incredibuild +lsp:languageclient |
43 |
- mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler |
44 |
- python qbs:qbsprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome' |
45 |
- qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind |
46 |
- webassembly) |
47 |
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools' |
48 |
+ clearcase cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs +designer docker git glsl:glsleditor +help incredibuild |
49 |
+ +lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler python |
50 |
+ qbs:qbsprojectmanager qmake:qmakeprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome' |
51 |
+ qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly) |
52 |
IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}" |
53 |
RESTRICT="!test? ( test )" |
54 |
REQUIRED_USE=" |
55 |
@@ -39,6 +37,7 @@ REQUIRED_USE=" |
56 |
clang? ( lsp ) |
57 |
mcu? ( baremetal cmake ) |
58 |
python? ( lsp ) |
59 |
+ qml? ( qmake ) |
60 |
qnx? ( remotelinux ) |
61 |
" |
62 |
|
63 |
@@ -149,6 +148,9 @@ src_prepare() { |
64 |
sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die |
65 |
fi |
66 |
fi |
67 |
+ if ! use qmake; then |
68 |
+ sed -i -e '/buildoutputparser/d' src/tools/tools.pro || die |
69 |
+ fi |
70 |
if ! use qml; then |
71 |
sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' src/libs/libs.pro || die |
72 |
sed -i -e '/qml2puppet/d' src/tools/tools.pro || die |