[gentoo-commits] proj/qt:master commit in: dev-qt/qtquickcontrols/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     85d63e66827e8b2e8565304954979a92c6dfb848
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu May 15 18:25:00 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu May 15 18:25:00 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=85d63e66

[dev-qt/qtquickcontrols] Handle widgets automagic.

Package-Manager: portage-2.2.8-r1

---
 dev-qt/qtquickcontrols/metadata.xml                    |  3 +++
 dev-qt/qtquickcontrols/qtquickcontrols-5.3.0_rc.ebuild | 16 +++++++++++++---
 dev-qt/qtquickcontrols/qtquickcontrols-5.3.9999.ebuild | 16 +++++++++++++---
 dev-qt/qtquickcontrols/qtquickcontrols-5.9999.ebuild   | 16 +++++++++++++---
 4 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/dev-qt/qtquickcontrols/metadata.xml b/dev-qt/qtquickcontrols/metadata.xml
index 9d5bff1..a373189 100644
--- a/dev-qt/qtquickcontrols/metadata.xml
+++ b/dev-qt/qtquickcontrols/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>
+	<use>
+		<flag name="widgets">Enable QtWidgets support</flag>
+	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>
 		<doc>http://qt-project.org/doc/</doc>

diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.3.0_rc.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.3.0_rc.ebuild
index b55b3d5..0c00bd7 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.3.0_rc.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.3.0_rc.ebuild
@@ -14,13 +14,23 @@ else
 	KEYWORDS="~amd64"
 fi
 
-# FIXME: widgets is automagic in src/private/private.pri
-
-IUSE=""
+IUSE="widgets"
 
 DEPEND="
 	>=dev-qt/qtcore-${PV}:5[debug=]
 	>=dev-qt/qtdeclarative-${PV}:5[debug=]
 	>=dev-qt/qtgui-${PV}:5[debug=]
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
 "
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/controls/Private/private.pri \
+		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
+		tests/auto/controls/controls.pro \
+		tests/auto/testplugin/testplugin.pro
+
+	qt5-build_src_prepare
+}

diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.3.9999.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.3.9999.ebuild
index b55b3d5..0c00bd7 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.3.9999.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.3.9999.ebuild
@@ -14,13 +14,23 @@ else
 	KEYWORDS="~amd64"
 fi
 
-# FIXME: widgets is automagic in src/private/private.pri
-
-IUSE=""
+IUSE="widgets"
 
 DEPEND="
 	>=dev-qt/qtcore-${PV}:5[debug=]
 	>=dev-qt/qtdeclarative-${PV}:5[debug=]
 	>=dev-qt/qtgui-${PV}:5[debug=]
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
 "
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/controls/Private/private.pri \
+		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
+		tests/auto/controls/controls.pro \
+		tests/auto/testplugin/testplugin.pro
+
+	qt5-build_src_prepare
+}

diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.9999.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.9999.ebuild
index b55b3d5..0c00bd7 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.9999.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.9999.ebuild
@@ -14,13 +14,23 @@ else
 	KEYWORDS="~amd64"
 fi
 
-# FIXME: widgets is automagic in src/private/private.pri
-
-IUSE=""
+IUSE="widgets"
 
 DEPEND="
 	>=dev-qt/qtcore-${PV}:5[debug=]
 	>=dev-qt/qtdeclarative-${PV}:5[debug=]
 	>=dev-qt/qtgui-${PV}:5[debug=]
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
 "
 RDEPEND="${DEPEND}"
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/controls/Private/private.pri \
+		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
+		tests/auto/controls/controls.pro \
+		tests/auto/testplugin/testplugin.pro
+
+	qt5-build_src_prepare
+}