|
|
|
@ -638,9 +638,9 @@ class BuildKControlModule(Command):
|
|
|
|
|
|
|
|
|
|
# PyQt dir
|
|
|
|
|
if self.pyqt_dir is None:
|
|
|
|
|
self.pyqt_dir = FindFileInPaths("python_tqt", sys.path)
|
|
|
|
|
self.pyqt_dir = FindFileInPaths("PyTQt", sys.path)
|
|
|
|
|
if self.pyqt_dir is None:
|
|
|
|
|
self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'python_tqt')
|
|
|
|
|
self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'PyTQt')
|
|
|
|
|
if (FindFileInPaths("libtqtcmodule*",[self.pyqt_dir]) is None) and (FindFileInPaths("qt*",[self.pyqt_dir]) is None):
|
|
|
|
|
raise SystemExit, "Failed to find the PyQt directory: %s" % self.pyqt_dir
|
|
|
|
|
self.announce("Using %s for PyQt modules" % self.pyqt_dir)
|
|
|
|
@ -948,7 +948,7 @@ static TDECModule* return_instance( TQWidget *parent, const char *name ) {
|
|
|
|
|
|
|
|
|
|
// Inject a helper function
|
|
|
|
|
TQString bridge = TQString("import sip_tqt\n"
|
|
|
|
|
"from python_tqt import qt\n"
|
|
|
|
|
"from PyTQt import qt\n"
|
|
|
|
|
"def kcontrol_bridge_" FACTORY "(parent,name):\n"
|
|
|
|
|
" if parent!=0:\n"
|
|
|
|
|
" wparent = sip_tqt.wrapinstance(parent,qt.TQWidget)\n"
|
|
|
|
@ -1589,9 +1589,9 @@ class BuildTdeioslave(Command):
|
|
|
|
|
|
|
|
|
|
# PyQt dir
|
|
|
|
|
if self.pyqt_dir is None:
|
|
|
|
|
self.pyqt_dir = FindFileInPaths("python_tqt", sys.path)
|
|
|
|
|
self.pyqt_dir = FindFileInPaths("PyTQt", sys.path)
|
|
|
|
|
if self.pyqt_dir is None:
|
|
|
|
|
self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'python_tqt')
|
|
|
|
|
self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'PyTQt')
|
|
|
|
|
if (FindFileInPaths("libtqtcmodule*",[self.pyqt_dir]) is None) and (FindFileInPaths("qt*",[self.pyqt_dir]) is None):
|
|
|
|
|
raise SystemExit, "Failed to find the PyQt directory: %s" % self.pyqt_dir
|
|
|
|
|
self.announce("Using %s for PyQt modules" % self.pyqt_dir)
|
|
|
|
@ -2033,7 +2033,7 @@ class CheckPyQt(Command):
|
|
|
|
|
self.announce("Found Qt version %s." % qtver)
|
|
|
|
|
try:
|
|
|
|
|
self.announce("Checking for a working PyQt...")
|
|
|
|
|
from python_tqt import qt
|
|
|
|
|
from PyTQt import qt
|
|
|
|
|
self.announce(" ...PyQt is working")
|
|
|
|
|
except:
|
|
|
|
|
raise SystemExit, "Couldn't import Qt! Please make sure that PyQt is installed and working."
|
|
|
|
|