Apply upstream patch to fix regression in pyuic's handling of custom widgets (bug 431070 by Laurent Bachelier).

Package-Manager: portage-2.2.0_alpha123-r2/cvs/Linux x86_64

4 files changed, 328 insertions, 9 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 70a9ada24d1b..90635164cabc 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.196 2012/08/20 18:52:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.197 2012/09/03 07:18:12 pesa Exp $
+
+*PyQt4-4.9.4-r1 (03 Sep 2012)
+
+  03 Sep 2012; Davide Pesavento <pesa@gentoo.org> +PyQt4-4.9.4-r1.ebuild,
+  +files/PyQt4-4.9.4-pyuic-custom-widgets.patch:
+  Apply upstream patch to fix regression in pyuic's handling of custom widgets
+  (bug 431070 by Laurent Bachelier).
 
   20 Aug 2012; Johannes Huber <johu@gentoo.org> PyQt4-4.9.4.ebuild:
   Stable for x86, wrt bug #429042
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 83caaaebde0a..d2018cc7c3de 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -3,22 +3,30 @@ Hash: SHA256
 
 AUX PyQt4-4.7.2-configure.py.patch 933 SHA256 1a87c58ccb14441f77c7c764b6e6c40d1bdd64c5b35581f3deda54019a3461be SHA512 e2484a7361fabe32861913fe2e81e8c4a2d4e0d697a82a643dfc45332e99221767b0224df3fb0b5da27e33f7c2e6585d5b09a022e3fe35e9c8e3af2ba5feb4a3 WHIRLPOOL 44435221972b24dff022c78ffaa0c5888e035a88e95ebf2220605e34ca736d272b46cf875bbe7bde16b3137f255026f8d07e51c35fc6a9fd52d1256feba32312
 AUX PyQt4-4.7.3-qreal_float_support.patch 6460 SHA256 8183d7a12c094d02eb4f1ac2b983690c39ee54182a0d28adba52348f705e9c16 SHA512 b333f4016b048af66bb13177981dc468f6e645d9280c18a4f419127c48aca8b4d5c034a167be7353884b715e67ec110ff7d4d4e850793883186ebfef7678e372 WHIRLPOOL 9c7a0409023e8c3af3626bfb3887aea687c07feb5235506ea0ed01171095d575b5681171dc5cde1c796448bb83e26449cab7df2432e172b47b43ec751bf99317
+AUX PyQt4-4.9.4-pyuic-custom-widgets.patch 3212 SHA256 8a59ee0fcd3f1d8a52745c68c35eed5e4b0e2b31e6e7bf2f5dca7bdb2396e44c SHA512 58e4e4bb43c32408f3ead09c619c414d717a2ad3b15025a54698d2287c085ac3ec2e14760b6f9e36d11a28202c65aed2a3e378e7c7ed65ee9f6d3b7edc5eaee0 WHIRLPOOL 16d32a6f885fc71205c9208ea8e1ca7fcb6f8fed8f31305e907395dfd3bcb1723c3ea4aeda1eb1f04824cc7424eb00b1318834a98350f5a1d789ca0a2b480b19
 DIST PyQt-x11-gpl-4.8.4.tar.gz 9799081 SHA256 fcfa3ecc0b4fad6d93227751b36a6f81ea104ee19dd26905f52de59f060b3e98 SHA512 036e23ff126980f97fd939de9f064056ef0e0e8fbf2cc0a1968fc9cde8c0b09fd531b412d0de362d3fcae7aee828e1cc5347300a35b45cff9c6eda6fed2ef46f WHIRLPOOL c2a993fe0203e63e134fb2ddd405817913055a43e23a1a8eca6fd52445e85d2002453d0f4093b6ed5c453be6864aa68a4051fccf3936e757a16b6ef5892c5b51
 DIST PyQt-x11-gpl-4.9.1.tar.gz 9742132 SHA256 f283557f2190ffc00d72fe8451ac15536cab777c36a9b573031328f401629bb1 SHA512 3e3042138a204faa83628f4595f78ce3a07f69a54c4141ec9f2165a9fc94f4c30f1ad4c650ebf682e31e4589e0a9973871fbbf9944ce7ee6509bb394327a47d9 WHIRLPOOL bb9d455b74f0be80066bc4f6c02e52bcfd3b0d1181ebf668d1c97d08eeb5dcd9c15ac2be19cda09af9d404b22050982c65d4d54ae1bc61771c655fcb6a5172b8
 DIST PyQt-x11-gpl-4.9.4.tar.gz 9801300 SHA256 29416e9b2dd394d39c3034e103717a40b9090ec05f457600a4d62b6f29b27e48 SHA512 719abd2dc5504c9fdab3151d9649915d80d4b9e59f4f122127c7d9c5938cb4116ba993d7ff1a8468d098bb76d49c7f36aa5f13b30f44fedc38192e89e751e1f3 WHIRLPOOL 294a6d77ecf6540561795219ea02d687d906fd635b1de0c8d78cc60ddf51bf870f819127f58c9bb406edb942a3c8caaf4d581045920b99ecd4b9bb831d16d214
 EBUILD PyQt4-4.8.4.ebuild 4990 SHA256 c0a29142b86bb2c193f601dfac1256fa4024b3f0b8efd0175ebf1613c92881b3 SHA512 a330872843478913411753410a46cc86b1c4149caf93070ba2a52e17dc4bf0c3cafabfabaa863822ebda864efdbc212662fa77ac5e8634039edf40b1783b4288 WHIRLPOOL b3252cef2779cdffcee57f4ad687d5ec6f4ccc9721cc12118b937a59c1d29d536b6b0a3a83c005dbd704c6703cf70385d559e133adbb59d3379b98279293c76f
 EBUILD PyQt4-4.9.1.ebuild 5697 SHA256 5fe8df9fab06df2dd390c97a98024cca0825e5c159357d28588585af196ef5a8 SHA512 38c2cca886753671d527137d36ff736cbed4d83a396165f56b448a89c6f567fd4ef178521b62d730cd104d669328a9485063d36b3819129768c0a2fb29eb90e4 WHIRLPOOL 172f780dcaa70cc81b56e0abe1883dcca7fa2f0440af619f15dd5df25fb7c8050160f5e344f1b5165a98b3f44ce80a2f42ccdb80d9a600c73b018cbabd0e9cc2
+EBUILD PyQt4-4.9.4-r1.ebuild 5748 SHA256 b747065eb9eb10fbccd701c05052785d5237fdec7492064bc3b136549116b836 SHA512 44bb6dab4fd5c873c8c55da7cc03ff81582c78c1eca916bcc5c88563e2c8fb7e7b3c0409e5fa648303c83d557b12bc54fdcae52ff717038706697d15b35d8725 WHIRLPOOL 2235e6576a289f40166af722b2c4e478fb6597067ab570acc6c1465b8e64767d34e221e5410277b8de5b3ed3a891e50c657c325f0db7c39800d4cd05cafeb044
 EBUILD PyQt4-4.9.4.ebuild 5694 SHA256 872dd7963ea9eb7ba6db6eadffd800ee21ef85055f71ceeed62d711cb952097b SHA512 5e6e12ef037cfb63358a3eccf9d8713b2ff0e6a9df40c89a10e156b09488122e5106e0d471f5bb2eb0cb9c694e47d5947a46aaf3d472c2b711f13856237c9fac WHIRLPOOL 61d9dfd6f9d7dbdce2e6069d010da7dd9f9e4556548354f97a893e43d4e9ecd0b146c3754da9c74cfc77c1453f8f0a8aa2a9ada7fe31c95b35173ff228d2a580
-MISC ChangeLog 27294 SHA256 899651510df2f7863e16ef5618a5d3a85a53fd1b1427c34f3b5923ff2b5b8364 SHA512 e20fd736e4c94649acb7050ebfe78a95e486691288fd92806038ee2ecfa07ac0e986e1502ac0c761f07e6ffe95dc8a0ce9f677fb67134ec3903a5da962ba0afc WHIRLPOOL 5ecc8963c3d5915576240e1279bdb4c99ba0df4f3c2b37bd9bd451b3c758affa79c34a847c0c5d922854bd87354e2d5cb6b1cb55755e933a5fb4c977e3a902ec
+MISC ChangeLog 27565 SHA256 b1146af8592e34feef9d8da3859eab4fb7e97cd32a6cb2dfc13003ca86144603 SHA512 3e345c8150031b8af7e903867d2403248ceda3c8e12d48736cc784f18c7698e9f4de0165d6cb54201451bb21408e61bfa4b8cedecab2a45d0bed8b240f352c50 WHIRLPOOL 9811632b7b5068bf86186b78d2f95cfb144607309790f602724503eada4000c051f50beb2ee0789b20b7ef851de42b235cb0f4d6dc5f815965fc018b58c3c4a8
 MISC metadata.xml 1100 SHA256 7ca5b5cd157c0cea93a86c007b0eaa57882a3b738933299c33eb6e1d4ceca6ae SHA512 b1985381f5b92d5e7839027028ac96de52fb034c8fdaa80e3f71464182d7ab8eac1060e0a7663faca55b8db64138ed59bd2e733d24d83466085be92aa6c7914b WHIRLPOOL 3a1309fd3b39a43f3dd2a16c9943bfb7eb8b0130c4ec0dcd717ded72a8d6c1c522896ed3bcfc3d396379d12afefeea3d22deb0caa40d9d359e4a7c859d2f4530
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQMod6AAoJEO+t9ga+3I3a9BcH/0VGy2rJFNUT36BSgMQLKCgF
-GJIFqv6eu4LyZ8ZZcOIXHEbOVDlQbVQsMj1vcfmCxIQjgQXcEvrkoSCfWERMjO0c
-GODr3UfBDDbdFGyPzwH7V74hm4jmeVK2j5Ifu+k3FlGwJRTrEDdp0zTJo5v9sGJ2
-ak+MVQhcu//uIJ1OsRS9FkWUIhwNCr31f9MUkEPhVKNNG3JZXBVWofZakOdqSXwk
-uiDkDcgG99axAep/Dz41HBxYgwf1Zgdzr4Kh5it3VOz4hxFB+s6ypB6m5DNgX+od
-5gnTbADOfUlUmZyxUF8OcAw93DQA/u/TiCAbYRkb1UNCxNVHkwpB4BiSP81vYMU=
-=IfFD
+iQIcBAEBCAAGBQJQRFnOAAoJENXLsxwXqFxyZwgP/0fHO5vYQpOwsA999mZT4/X6
+OSQXN8EPQhBbDe7QyvJaZq+cOTSROo52mApbPZzMixAn6NPG/MydmHr8qD4eM2eo
+z15Uq6yZ+pKOTzw5P+RZJx9kJSuCKpvmNUP/pYdqekqc8QM77a1cybpHOukRvxw5
+IYD8ccazpvkdmhlx1mAaVcqnKx+aNtI1BxArqqx5QMso5mm2UkG/KREtwpryZUgI
+zTwmOiEBVj4qi/p/ldnN21/TEQM5RoIAd/1MQIRwWi+lxDKTVhqQsPqn3cijqR4I
+/x7H+Wku9bpzyt2JIz0Abd9lw+tR4MslUS5E45jqvrzv/JzeQCxwz6sDQRV8MYHE
+NU5PnzbzPjsI8TS9SY4YMZvaTPGD+spOnTjPtvj6fIy1Vk61sSsDOBf2HRtw+vWr
+mVivDXXY/R/xqXEwhhtyYfhgsznlvT3ZwmgODbv3v8uisWuVFEPpvpR8ITDr5zkT
+WlK8ueV5sT8nuGAsKXEHx6Xizx4Z1j/fKMaIpIVpy1uY70kzbtHnl87pwleeHruV
+mXeBdVDNguBeVRjqtsFOW2C4V985bmYcc48bO4Gpiqoy/fjklnsaWqHdRWqOxBSc
+qiIq+TfYFVczSOX6a5WSEXAPepDFE1f6X/BdVTm2gSSj56foZAE+o2l8/Bv3B4Sc
+kX5OYxLAvw8qZrrCLvMA
+=ODrX
 -----END PGP SIGNATURE-----
diff --git a/dev-python/PyQt4/PyQt4-4.9.4-r1.ebuild b/dev-python/PyQt4/PyQt4-4.9.4-r1.ebuild
new file mode 100644
index 000000000000..aa37ba490af1
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.9.4-r1.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.4-r1.ebuild,v 1.1 2012/09/03 07:18:12 pesa Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="*"
+PYTHON_EXPORT_PHASE_FUNCTIONS="1"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
+
+inherit eutils toolchain-funcs qt4-r2 python
+
+# Minimal supported version of Qt.
+QT_VER="4.7.2"
+
+DESCRIPTION="Python bindings for the Qt toolkit"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt"
+
+if [[ ${PV} == *_pre* ]]; then
+	MY_P="PyQt-x11-gpl-snapshot-${PV%_pre*}-${REVISION}"
+	SRC_URI="http://www.gentoo-el.org/~hwoarang/distfiles/${MY_P}.tar.gz"
+else
+	MY_P="PyQt-x11-gpl-${PV}"
+	SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="X assistant dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
+
+REQUIRED_USE="
+	assistant? ( X )
+	declarative? ( X )
+	multimedia? ( X )
+	opengl? ( X )
+	phonon? ( X )
+	sql? ( X )
+	svg? ( X )
+	webkit? ( X )
+"
+
+RDEPEND="
+	>=dev-python/sip-4.13.3
+	>=x11-libs/qt-core-${QT_VER}:4
+	>=x11-libs/qt-script-${QT_VER}:4
+	X? (
+		>=x11-libs/qt-gui-${QT_VER}:4[dbus?]
+		>=x11-libs/qt-test-${QT_VER}:4
+	)
+	assistant? ( >=x11-libs/qt-assistant-${QT_VER}:4 )
+	dbus? (
+		>=dev-python/dbus-python-0.80
+		>=x11-libs/qt-dbus-${QT_VER}:4
+	)
+	declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 )
+	multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 )
+	opengl? (
+		>=x11-libs/qt-opengl-${QT_VER}:4
+		|| ( >=x11-libs/qt-opengl-4.8.0:4 <x11-libs/qt-opengl-4.8.0:4[-egl] )
+	)
+	phonon? (
+		!kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) )
+		kde? ( media-libs/phonon )
+	)
+	sql? ( >=x11-libs/qt-sql-${QT_VER}:4 )
+	svg? ( >=x11-libs/qt-svg-${QT_VER}:4 )
+	webkit? ( >=x11-libs/qt-webkit-${QT_VER}:4 )
+	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_VER}:4 )
+"
+DEPEND="${RDEPEND}
+	dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7.2-configure.py.patch"
+	"${FILESDIR}/${P}-pyuic-custom-widgets.patch"
+)
+
+PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/pyuic4")
+
+src_prepare() {
+	if ! use dbus; then
+		sed -e 's/^\([[:blank:]]\+\)check_dbus()/\1pass/' -i configure.py || die
+	fi
+
+	# Support qreal for arm architecture (bug #322349).
+	use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch"
+
+	qt4-r2_src_prepare
+
+	# Use proper include directory.
+	sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die
+
+	python_copy_sources
+
+	preparation() {
+		if [[ $(python_get_version -l --major) == 3 ]]; then
+			rm -fr pyuic/uic/port_v2
+		else
+			rm -fr pyuic/uic/port_v3
+		fi
+	}
+	python_execute_function -s preparation
+}
+
+pyqt4_use_enable() {
+	use $1 && echo "--enable=${2:-$1}"
+}
+
+src_configure() {
+	configuration() {
+		local myconf=("$(PYTHON)"
+			configure.py
+			--confirm-license
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="${EPREFIX}$(python_get_sitedir)"
+			--sipdir="${EPREFIX}/usr/share/sip"
+			--assume-shared
+			--no-timestamp
+			--qsci-api
+			$(use debug && echo --debug)
+			--enable=QtCore
+			--enable=QtNetwork
+			--enable=QtScript
+			--enable=QtXml
+			$(pyqt4_use_enable X QtGui)
+			$(pyqt4_use_enable X QtDesigner) $(use X || echo --no-designer-plugin)
+			$(pyqt4_use_enable X QtScriptTools)
+			$(pyqt4_use_enable X QtTest)
+			$(pyqt4_use_enable assistant QtHelp)
+			$(pyqt4_use_enable dbus QtDBus)
+			$(pyqt4_use_enable declarative QtDeclarative)
+			$(pyqt4_use_enable multimedia QtMultimedia)
+			$(pyqt4_use_enable opengl QtOpenGL)
+			$(pyqt4_use_enable phonon)
+			$(pyqt4_use_enable sql QtSql)
+			$(pyqt4_use_enable svg QtSvg)
+			$(pyqt4_use_enable webkit QtWebKit)
+			$(pyqt4_use_enable xmlpatterns QtXmlPatterns)
+			CC="$(tc-getCC)"
+			CXX="$(tc-getCXX)"
+			LINK="$(tc-getCXX)"
+			LINK_SHLIB="$(tc-getCXX)"
+			CFLAGS="${CFLAGS}"
+			CXXFLAGS="${CXXFLAGS}"
+			LFLAGS="${LDFLAGS}")
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		local mod
+		for mod in QtCore \
+				$(use X && echo QtDesigner QtGui) \
+				$(use dbus && echo QtDBus) \
+				$(use declarative && echo QtDeclarative) \
+				$(use opengl && echo QtOpenGL); do
+			# Run eqmake4 inside the qpy subdirectories to respect
+			# CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping.
+			pushd qpy/${mod} > /dev/null || return 1
+			eqmake4 $(ls w_qpy*.pro)
+			popd > /dev/null || return 1
+
+			# Fix insecure runpaths.
+			sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \
+				-i ${mod}/Makefile || die "Failed to fix rpath for ${mod}"
+		done
+
+		# Avoid stripping of libpythonplugin.so.
+		if use X; then
+			pushd designer > /dev/null || return 1
+			eqmake4 python.pro
+			popd > /dev/null || return 1
+		fi
+	}
+	python_execute_function -s configuration
+}
+
+src_install() {
+	installation() {
+		# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
+		emake DESTDIR="${T}/images/${PYTHON_ABI}" INSTALL_ROOT="${T}/images/${PYTHON_ABI}" install
+	}
+	python_execute_function -s installation
+	python_merge_intermediate_installation_images "${T}/images"
+
+	dodoc NEWS THANKS
+
+	if use doc; then
+		dohtml -r doc/html/*
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize PyQt4
+
+	ewarn "When updating dev-python/PyQt4, you usually need to rebuild packages that depend on it,"
+	ewarn "such as dev-python/qscintilla-python and kde-base/pykde4. If you have app-portage/gentoolkit"
+	ewarn "installed, you can find these packages with \`equery d dev-python/PyQt4\`."
+}
+
+pkg_postrm() {
+	python_mod_cleanup PyQt4
+}
diff --git a/dev-python/PyQt4/files/PyQt4-4.9.4-pyuic-custom-widgets.patch b/dev-python/PyQt4/files/PyQt4-4.9.4-pyuic-custom-widgets.patch
new file mode 100644
index 000000000000..20ebeb93e842
--- /dev/null
+++ b/dev-python/PyQt4/files/PyQt4-4.9.4-pyuic-custom-widgets.patch
@@ -0,0 +1,93 @@
+
+
+# HG changeset patch
+# User Phil Thompson <phil@riverbankcomputing.com>
+# Date 2012-07-13 13:39:28 +0100
+# Node ID 29b668ada14c1428a3bbfe8f0324c6626bd5ac9a
+# Parent  fd0f3da9d79ca9858d10a20c15fb85456cb832d7
+Fixed a regression in pyuic's handling of custom widgets.
+
+diff --git a/pyuic/uic/Compiler/qobjectcreator.py b/pyuic/uic/Compiler/qobjectcreator.py
+--- a/pyuic/uic/Compiler/qobjectcreator.py
++++ b/pyuic/uic/Compiler/qobjectcreator.py
+@@ -1,6 +1,6 @@
+ #############################################################################
+ ##
+-## Copyright (C) 2011 Riverbank Computing Limited.
++## Copyright (C) 2012 Riverbank Computing Limited.
+ ## Copyright (C) 2006 Thorsten Marek.
+ ## All right reserved.
+ ##
+@@ -100,7 +100,6 @@
+         assert widgetClass not in self._widgets 
+         self._widgets[widgetClass] = (baseClass, module)
+ 
+-
+     def _resolveBaseclass(self, baseClass):
+         try:
+             for x in range(0, 10):
+@@ -114,19 +113,17 @@
+         except KeyError:
+             raise ValueError("unknown baseclass %s" % baseClass)
+         
+-
+     def search(self, cls):
+         try:
+-            self._usedWidgets.add(cls)
+             baseClass = self._resolveBaseclass(self._widgets[cls][0])
+             DEBUG("resolved baseclass of %s: %s" % (cls, baseClass))
+-            
+-            return type(cls, (baseClass,),
+-                        {"module" : ""})
+-        
+         except KeyError:
+             return None
+ 
++        self._usedWidgets.add(cls)
++
++        return type(cls, (baseClass, ), {"module" : ""})
++
+     def _writeImportCode(self):
+         imports = {}
+         for widget in self._usedWidgets:
+diff --git a/pyuic/uic/objcreator.py b/pyuic/uic/objcreator.py
+--- a/pyuic/uic/objcreator.py
++++ b/pyuic/uic/objcreator.py
+@@ -102,19 +102,26 @@
+         self._modules.append(self._customWidgets)
+ 
+     def createQObject(self, classname, *args, **kwargs):
+-        # Handle scoped names, typically static factory methods.
+-        parts = classname.split('.')
+-        factory = self.findQObjectType(parts[0])
++        # Handle regular and custom widgets.
++        factory = self.findQObjectType(classname)
+ 
+-        if factory is not None:
+-            for part in parts[1:]:
+-                factory = getattr(factory, part, None)
+-                if factory is None:
+-                    break
+-            else:
+-                return self._cpolicy.instantiate(factory, *args, **kwargs)
++        if factory is None:
++            # Handle scoped names, typically static factory methods.
++            parts = classname.split('.')
+ 
+-        raise NoSuchWidgetError(classname)
++            if len(parts) > 1:
++                factory = self.findQObjectType(parts[0])
++
++                if factory is not None:
++                    for part in parts[1:]:
++                        factory = getattr(factory, part, None)
++                        if factory is None:
++                            break
++
++            if factory is None:
++                raise NoSuchWidgetError(classname)
++
++        return self._cpolicy.instantiate(factory, *args, **kwargs)
+ 
+     def invoke(self, rname, method, args=()):
+         return self._cpolicy.invoke(rname, method, args)