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

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

commit:     a3796a566fdabd71e36b32bbe57fe14a9cfc2dfd
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  9 15:38:04 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct  9 15:51:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a3796a56

dev-qt/qtdeclarative: fix dev-qt/qtwidgets automagic

Gentoo-bug: 560858

Package-Manager: portage-2.2.20.1

 dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild    | 5 ++---
 dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild | 5 ++---
 dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild | 5 ++---
 dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild   | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild
index 6e560db..d6202e6 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild
@@ -31,11 +31,10 @@ src_prepare() {
 	use localstorage || sed -i -e '/localstorage/d' \
 		src/imports/imports.pro || die
 
-	use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \
-		src/qmltest/qmltest.pro || die
-
 	qt_use_disable_mod widgets widgets \
 		src/src.pro \
+		src/qmltest/qmltest.pro \
+		tests/auto/auto.pro \
 		tools/tools.pro \
 		tools/qmlscene/qmlscene.pro \
 		tools/qml/qml.pro

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild
index 6e560db..d6202e6 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild
@@ -31,11 +31,10 @@ src_prepare() {
 	use localstorage || sed -i -e '/localstorage/d' \
 		src/imports/imports.pro || die
 
-	use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \
-		src/qmltest/qmltest.pro || die
-
 	qt_use_disable_mod widgets widgets \
 		src/src.pro \
+		src/qmltest/qmltest.pro \
+		tests/auto/auto.pro \
 		tools/tools.pro \
 		tools/qmlscene/qmlscene.pro \
 		tools/qml/qml.pro

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild
index 6e560db..d6202e6 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.6.9999.ebuild
@@ -31,11 +31,10 @@ src_prepare() {
 	use localstorage || sed -i -e '/localstorage/d' \
 		src/imports/imports.pro || die
 
-	use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \
-		src/qmltest/qmltest.pro || die
-
 	qt_use_disable_mod widgets widgets \
 		src/src.pro \
+		src/qmltest/qmltest.pro \
+		tests/auto/auto.pro \
 		tools/tools.pro \
 		tools/qmlscene/qmlscene.pro \
 		tools/qml/qml.pro

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
index 6e560db..d6202e6 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild
@@ -31,11 +31,10 @@ src_prepare() {
 	use localstorage || sed -i -e '/localstorage/d' \
 		src/imports/imports.pro || die
 
-	use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \
-		src/qmltest/qmltest.pro || die
-
 	qt_use_disable_mod widgets widgets \
 		src/src.pro \
+		src/qmltest/qmltest.pro \
+		tests/auto/auto.pro \
 		tools/tools.pro \
 		tools/qmlscene/qmlscene.pro \
 		tools/qml/qml.pro