1 |
commit: 9ba0be1a9a528038bd6892795905dea469df2cca |
2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 23 04:05:43 2021 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 23 04:19:04 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba0be1a |
7 |
|
8 |
dev-qt/qt-creator: merge qmldesigner and qmljs USE flags |
9 |
|
10 |
And also put qmlpreview and qmlprojectmanager behind the new flag |
11 |
|
12 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
13 |
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org> |
14 |
|
15 |
dev-qt/qt-creator/metadata.xml | 5 +++-- |
16 |
dev-qt/qt-creator/qt-creator-9999.ebuild | 16 ++++++---------- |
17 |
2 files changed, 9 insertions(+), 12 deletions(-) |
18 |
|
19 |
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml |
20 |
index 8713dfe7612f..bdaf1a3ad21f 100644 |
21 |
--- a/dev-qt/qt-creator/metadata.xml |
22 |
+++ b/dev-qt/qt-creator/metadata.xml |
23 |
@@ -17,7 +17,7 @@ |
24 |
<flag name="bazaar">Add support for GNU Bazaar version control system (requires manual installation of Bazaar client)</flag> |
25 |
<flag name="beautifier">Build the beautifier plugin (supports astyle, clang-format, and uncrustify)</flag> |
26 |
<flag name="boot2qt">Build plugin for Boot2Qt devices</flag> |
27 |
- <flag name="clang">Build clang-based plugins (code model, formatting, static analysis)</flag> |
28 |
+ <flag name="clang">Build clang-based plugins for C/C++ development (code model, formatting, static analysis)</flag> |
29 |
<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag> |
30 |
<flag name="cmake">Build plugin for CMake-based projects</flag> |
31 |
<flag name="conan">Build plugin to integrate with the Conan package manager</flag> |
32 |
@@ -27,7 +27,7 @@ |
33 |
<flag name="docker">Build plugin for Docker support</flag> |
34 |
<flag name="glsl">Build the GLSL editor plugin</flag> |
35 |
<flag name="help">Enable the integrated documentation viewer</flag> |
36 |
- <flag name="incredibuild">Enable integration with Incredibuild (requires manual installation of Incredibuild)</flag> |
37 |
+ <flag name="incredibuild">Enable integration with Incredibuild</flag> |
38 |
<flag name="lsp">Add support for the Language Server Protocol (LSP)</flag> |
39 |
<flag name="mcu">Build plugin for MCU devices</flag> |
40 |
<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag> |
41 |
@@ -38,6 +38,7 @@ |
42 |
<flag name="perfprofiler">Build the Linux Perf-based profiler plugin</flag> |
43 |
<flag name="python">Build plugin for Python language support</flag> |
44 |
<flag name="qbs">Build plugin for QBS-based projects</flag> |
45 |
+ <flag name="qml">Build plugins for QML-based development (designer, editor, project manager)</flag> |
46 |
<flag name="qmldesigner">Enable designer for QML/QtQuick-based UIs</flag> |
47 |
<flag name="qmljs">Build the QML/JavaScript editor plugin</flag> |
48 |
<flag name="qmlprofiler">Build the QML profiler plugin</flag> |
49 |
|
50 |
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild |
51 |
index 8db237c5577b..ceec86efbe12 100644 |
52 |
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild |
53 |
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild |
54 |
@@ -28,8 +28,9 @@ QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaa |
55 |
'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager conan cppcheck |
56 |
ctfvisualizer cvs +designer docker git glsl:glsleditor +help incredibuild lsp:languageclient |
57 |
mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler |
58 |
- python qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor qmlprofiler qnx remotelinux |
59 |
- scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly) |
60 |
+ python qbs:qbsprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome' |
61 |
+ qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind |
62 |
+ webassembly) |
63 |
IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}" |
64 |
RESTRICT="!test? ( test )" |
65 |
REQUIRED_USE=" |
66 |
@@ -38,7 +39,6 @@ REQUIRED_USE=" |
67 |
clang? ( test? ( qbs ) ) |
68 |
mcu? ( baremetal cmake ) |
69 |
python? ( lsp ) |
70 |
- qmldesigner? ( qmljs ) |
71 |
qnx? ( remotelinux ) |
72 |
" |
73 |
|
74 |
@@ -97,7 +97,7 @@ RDEPEND="${CDEPEND} |
75 |
cvs? ( dev-vcs/cvs ) |
76 |
git? ( dev-vcs/git ) |
77 |
mercurial? ( dev-vcs/mercurial ) |
78 |
- qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) |
79 |
+ qml? ( >=dev-qt/qtquicktimeline-${QT_PV} ) |
80 |
silversearcher? ( sys-apps/the_silver_searcher ) |
81 |
subversion? ( dev-vcs/subversion ) |
82 |
valgrind? ( dev-util/valgrind ) |
83 |
@@ -123,7 +123,6 @@ src_prepare() { |
84 |
# disable unwanted plugins |
85 |
for plugin in "${QTC_PLUGINS[@]#[+-]}"; do |
86 |
if ! use ${plugin%:*}; then |
87 |
- einfo "Disabling ${plugin%:*} plugin" |
88 |
sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \ |
89 |
src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin" |
90 |
fi |
91 |
@@ -150,14 +149,11 @@ src_prepare() { |
92 |
sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die |
93 |
fi |
94 |
fi |
95 |
- if ! use qmldesigner; then |
96 |
- sed -i -e '/advanceddockingsystem/d' src/libs/libs.pro || die |
97 |
+ if ! use qml; then |
98 |
+ sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' src/libs/libs.pro || die |
99 |
sed -i -e '/qml2puppet/d' src/tools/tools.pro || die |
100 |
sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die |
101 |
fi |
102 |
- if ! use qmljs; then |
103 |
- sed -i -e '/qmleditorwidgets/d' src/libs/libs.pro || die |
104 |
- fi |
105 |
if ! use valgrind; then |
106 |
sed -i -e '/valgrindfake/d' src/tools/tools.pro || die |
107 |
sed -i -e '/valgrind/d' tests/auto/auto.pro || die |