summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-05-26 15:07:30 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-09-15 18:56:46 +0900
commitcedb73e812b98ccee7172420e63eb029ce5da1aa (patch)
tree91d16af7de096f6c07ea79b91f245a4c0fdfc3eb
parent5ef0392a279c0b150e446c9d942173e606f25452 (diff)
downloadpytdeextensions-cedb73e812b98ccee7172420e63eb029ce5da1aa.tar.gz
pytdeextensions-cedb73e812b98ccee7172420e63eb029ce5da1aa.zip
Use proper TQt headers
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--src/tdedistutils.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/tdedistutils.py b/src/tdedistutils.py
index 0ba543d..e8cd35e 100644
--- a/src/tdedistutils.py
+++ b/src/tdedistutils.py
@@ -573,14 +573,11 @@ class BuildKControlModule(Command):
canidatepaths.append(os.path.join(install.prefix,"include"))
canidatepaths.append("/opt/tqt3/include")
canidatepaths.append("/usr/include/tqt3")
- self.tqt_inc_dir = FindFileInPaths('ntqstring.h',canidatepaths)
- if self.tqt_inc_dir is None:
self.tqt_inc_dir = FindFileInPaths('tqstring.h',canidatepaths)
if self.tqt_inc_dir is None:
raise SystemExit("Failed to find the TQt header file directory")
- if FindFileInPaths('ntqstring.h',[self.tqt_inc_dir]) is None:
- if FindFileInPaths('tqstring.h',[self.tqt_inc_dir]) is None:
- raise SystemExit("Failed to find TQt header files in: %s" % self.tqt_inc_dir)
+ if FindFileInPaths('tqstring.h',[self.tqt_inc_dir]) is None:
+ raise SystemExit("Failed to find TQt header files in: %s" % self.tqt_inc_dir)
self.announce("Using %s for TQt header files" % self.tqt_inc_dir)
# TQt lib dir
@@ -1522,12 +1519,10 @@ class BuildTdeioslave(Command):
canidatepaths.append(os.path.join(install.prefix,"include"))
canidatepaths.append("/opt/tqt3/include")
canidatepaths.append("/opt/tqt3/lib/include")
- self.tqt_inc_dir = FindFileInPaths('ntqstring.h',canidatepaths)
- if self.tqt_inc_dir is None:
self.tqt_inc_dir = FindFileInPaths('tqstring.h',canidatepaths)
if self.tqt_inc_dir is None:
raise SystemExit("Failed to find the TQt header file directory")
- if FindFileInPaths('ntqstring.h',[self.tqt_inc_dir]) is None:
+ if FindFileInPaths('tqstring.h',[self.tqt_inc_dir]) is None:
if FindFileInPaths('tqstring.h',[self.tqt_inc_dir]) is None:
raise SystemExit("Failed to find TQt header files in: %s" % self.tqt_inc_dir)
self.announce("Using %s for TQt header files" % self.tqt_inc_dir)