diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2010-11-11 12:58:21 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2010-11-11 12:58:21 +0000 |
| commit | 6bc03a64901fbece928586e16fe0ae915b163417 (patch) | |
| tree | de56c37aa08890bd518a7200deb2e4c260f4abe1 /dev-util/qt-creator | |
| parent | Bump (diff) | |
| download | gentoo-2-6bc03a64901fbece928586e16fe0ae915b163417.tar.gz gentoo-2-6bc03a64901fbece928586e16fe0ae915b163417.tar.bz2 gentoo-2-6bc03a64901fbece928586e16fe0ae915b163417.zip | |
Disable qt4designer plugins when qml is disabled. Bug #344957. Force qml use flag as well
(Portage version: 2.1.9.24/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/qt-creator')
| -rw-r--r-- | dev-util/qt-creator/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild | 11 |
2 files changed, 13 insertions, 5 deletions
diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog index 149a288392a6..95eb8445cf95 100644 --- a/dev-util/qt-creator/ChangeLog +++ b/dev-util/qt-creator/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/qt-creator # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.61 2010/11/10 15:28:58 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.62 2010/11/11 12:58:21 hwoarang Exp $ + + 11 Nov 2010; Markos Chandras <hwoarang@gentoo.org> + qt-creator-2.1.0_beta2.ebuild: + Disable qt4designer plugins when qml is disabled. Bug #344957. Force qml + use flag as well *qt-creator-2.1.0_beta2 (10 Nov 2010) diff --git a/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild b/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild index fe2e3266aa04..d616173243a7 100644 --- a/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild +++ b/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild,v 1.1 2010/11/10 15:28:58 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-2.1.0_beta2.ebuild,v 1.2 2010/11/11 12:58:21 hwoarang Exp $ EAPI="2" LANGS="de es fr it ja pl ru sl" @@ -46,7 +46,7 @@ RDEPEND="${DEPEND} subversion? ( dev-vcs/subversion )" PLUGINS="bookmarks bineditor cmake cvs designer fakevim git mercurial perforce - qml qtscript subversion" + +qml qtscript subversion" S="${WORKDIR}"/"${MY_P}"-src @@ -63,8 +63,11 @@ src_prepare() { plugin="qtscripteditor" elif [[ ${plugin} == "qml" ]]; then plugins="qmljseditor" - sed -i "/^include(qml\/qml.pri)/d" \ - src/plugins/debugger/debugger.pro + sed -i -e "/^include(qml\/qml.pri)/d" \ + src/plugins/debugger/debugger.pro \ + -e "/plugin_qt4projectmanager/s:^:#:" \ + src/plugins/plugins.pro \ + || die "failed to disable qml plugins" fi if [[ ${plugin} == "designer" ]]; then sed -i "/plugin_qt4projectmanager/s:^:#:" \ |