From a22e9d462a6083cbbc2bfb21c5c430958b1844bc Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Sat, 19 Mar 2016 02:14:38 +0100 Subject: [PATCH] fix PyQt.uic for use in processing --- python/PyQt/PyQt4/uic.py | 26 -------------------------- python/PyQt/PyQt4/uic/__init__.py | 5 ++++- 2 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 python/PyQt/PyQt4/uic.py diff --git a/python/PyQt/PyQt4/uic.py b/python/PyQt/PyQt4/uic.py deleted file mode 100644 index f0fc35457ca..00000000000 --- a/python/PyQt/PyQt4/uic.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -*************************************************************************** - uic.py - --------------------- - Date : February 2016 - Copyright : (C) 2016 by Jürgen E. Fischer - Email : jef at norbit dot de -*************************************************************************** -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -*************************************************************************** -""" - -__author__ = 'Jürgen E. Fischer' -__date__ = 'February 2016' -__copyright__ = '(C) 2016, Jürgen E. Fischer' -# This will get replaced with a git SHA1 when you do a git archive -__revision__ = '$Format:%H$' - -from PyQt4.uic import * diff --git a/python/PyQt/PyQt4/uic/__init__.py b/python/PyQt/PyQt4/uic/__init__.py index f0fc35457ca..99123d98702 100644 --- a/python/PyQt/PyQt4/uic/__init__.py +++ b/python/PyQt/PyQt4/uic/__init__.py @@ -2,7 +2,7 @@ """ *************************************************************************** - uic.py + __init__.py --------------------- Date : February 2016 Copyright : (C) 2016 by Jürgen E. Fischer @@ -23,4 +23,7 @@ __copyright__ = '(C) 2016, Jürgen E. Fischer' # This will get replaced with a git SHA1 when you do a git archive __revision__ = '$Format:%H$' +from PyQt4.uic.Compiler import indenter, compiler +from PyQt4.uic.objcreator import widgetPluginPath +from PyQt4.uic import properties, uiparser, Compiler from PyQt4.uic import *