summaryrefslogtreecommitdiffstats
path: root/src/tdedistutils.py
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-09-28 19:23:30 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-09-28 19:23:30 +0200
commitec166143c498b91a7f0943493fdc958dae17ae5c (patch)
tree9d525a1ed2995d6b09a7a38d6434bf797d9d3fb5 /src/tdedistutils.py
parent4d065d1c64dc63893092f3f14ae231c8f16f155b (diff)
downloadpytdeextensions-ec166143c498b91a7f0943493fdc958dae17ae5c.tar.gz
pytdeextensions-ec166143c498b91a7f0943493fdc958dae17ae5c.zip
Properly import python_tqt module
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'src/tdedistutils.py')
-rw-r--r--src/tdedistutils.py22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/tdedistutils.py b/src/tdedistutils.py
index a0f7971..9515010 100644
--- a/src/tdedistutils.py
+++ b/src/tdedistutils.py
@@ -39,18 +39,6 @@ from types import StringType
INSTALL_LIST = 'install_log.txt'
-# Trinity-specific paths
-tqt_modules = []
-for m_path in sys.path:
- if os.path.exists(os.path.join(m_path, 'sip4_tqt')):
- m_sip_dir = os.path.join(m_path, 'sip4_tqt')
- tqt_modules.insert(0, m_sip_dir)
- if os.path.exists(os.path.join(m_path, 'python_tqt')):
- m_pyqt_dir = os.path.join(m_path, 'python_tqt')
- tqt_modules.insert(0, m_pyqt_dir)
-for m_path in tqt_modules:
- sys.path.insert(0, m_path)
-
###########################################################################
def setup(**arg_dict):
@@ -650,8 +638,6 @@ class BuildKControlModule(Command):
# PyQt dir
if self.pyqt_dir is None:
- self.pyqt_dir = m_pyqt_dir
- if self.pyqt_dir is None:
self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'python_tqt')
if (FindFileInPaths("libqtcmodule*",[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
@@ -666,8 +652,6 @@ class BuildKControlModule(Command):
# Sip dir
if self.sip_dir is None:
- self.sip_dir = m_sip_dir
- if self.sip_dir is None:
self.sip_dir = os.path.join(sysconfig.get_python_lib(), 'sip4_tqt')
if (FindFileInPaths("libsip*", [self.sip_dir]) is None) and (FindFileInPaths("sip*", [self.sip_dir]) is None):
raise SystemExit, "Failed to find libsip files in directory: %s" % self.sip_dir
@@ -1605,8 +1589,6 @@ class BuildTdeioslave(Command):
# PyQt dir
if self.pyqt_dir is None:
- self.pyqt_dir = m_pyqt_dir
- if self.pyqt_dir is None:
self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'python_tqt')
if (FindFileInPaths("libqtcmodule*",[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
@@ -1621,8 +1603,6 @@ class BuildTdeioslave(Command):
# Sip dir
if self.sip_dir is None:
- self.sip_dir = m_sip_dir
- if self.sip_dir is None:
self.sip_dir = os.path.join(sysconfig.get_python_lib(), 'sip4_tqt')
if (FindFileInPaths("libsip*", [self.sip_dir]) is None) and (FindFileInPaths("sip*", [self.sip_dir]) is None):
raise SystemExit, "Failed to find libsip files in directory: %s" % self.sip_dir
@@ -2049,7 +2029,7 @@ class CheckPyQt(Command):
self.announce("Found Qt version %s." % qtver)
try:
self.announce("Checking for a working PyQt...")
- import qt
+ from python_tqt import qt
self.announce(" ...PyQt is working")
except:
raise SystemExit, "Couldn't import Qt! Please make sure that PyQt is installed and working."