summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2023-01-06 16:20:45 +0100
committerSlávek Banko <slavek.banko@axis.cz>2023-01-06 16:20:45 +0100
commit065f41b4908b11278d4334e8c85150ec0fd4a9f6 (patch)
tree4d5a908b17f19541eaa126a609e8632dd08ef9a1
parent25a48864e706c59626d0f2c74bc585f05d5b4b31 (diff)
downloadpytde-065f41b4908b11278d4334e8c85150ec0fd4a9f6.tar.gz
pytde-065f41b4908b11278d4334e8c85150ec0fd4a9f6.zip
Use the full names of PyTQt modules in the pytde_imports table.
This will allow PyTQt modules to be loaded automatically when importing PyTDE modules. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--configure.py62
1 files changed, 31 insertions, 31 deletions
diff --git a/configure.py b/configure.py
index 680af7a..fde3a4d 100644
--- a/configure.py
+++ b/configure.py
@@ -100,30 +100,30 @@ pytde_modules = ["dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources
"tdehtml", "tdespell", "tdeprint", "tdemdi"] #, "tdespell2"]
pytde_imports = {
- "dcop": ["qt"],
- "tdecore": ["qt", "dcop"],
-# "tdesu": ["qt", "dcop", "tdecore"],
- "tdefx": ["qt", "dcop", "tdecore"],
- "tdeui": ["qt", "qtxml", "dcop", "tdecore", "tdefx"],
- "tdeio": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"],
- "tderesources": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
- "tdeabc": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources"],
- "tdeutils": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
- "tdefile": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
- "tdeparts": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
- "tdehtml": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeutils", "tdeio", "tdeparts"],
- "tdespell": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdefile"],
- "tdeprint": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"],
- "tdemdi": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdeparts"],
- "tdespell2": ["qt", "qtxml", "dcop", "tdecore", "tdefx", "tdeui"]
+ "dcop": ["PyTQt.qt"],
+ "tdecore": ["PyTQt.qt", "dcop"],
+# "tdesu": ["PyTQt.qt", "dcop", "tdecore"],
+ "tdefx": ["PyTQt.qt", "dcop", "tdecore"],
+ "tdeui": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx"],
+ "tdeio": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui"],
+ "tderesources": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
+ "tdeabc": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tderesources"],
+ "tdeutils": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
+ "tdefile": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
+ "tdeparts": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio"],
+ "tdehtml": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeutils", "tdeio", "tdeparts"],
+ "tdespell": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdefile"],
+ "tdeprint": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui"],
+ "tdemdi": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui", "tdeio", "tdeparts"],
+ "tdespell2": ["PyTQt.qt", "PyTQt.qtxml", "dcop", "tdecore", "tdefx", "tdeui"]
}
kde_includes = {
- "dcop": None,
- "tdecore": None,
-# "tdesu": ["tdesu"],
- "tdefx": None,
- "tdeui": None,
+ "dcop": None,
+ "tdecore": None,
+# "tdesu": ["tdesu"],
+ "tdefx": None,
+ "tdeui": None,
"tdeio": ["tdeio"],
"tderesources": ["tdeio", "../tdeio", "tderesources"],
"tdeabc": ["tdeio", "../tdeio", "tderesources", "tdeabc"],
@@ -131,20 +131,20 @@ kde_includes = {
"tdeparts": ["tdeio", "../tdeio", "tdeparts"],
"tdehtml": ["tdeio", "../tdeio", "tdeparts", "dom"],
"tdespell": ["tdeio"],
- "tdeprint": ["tdeprint"],
+ "tdeprint": ["tdeprint"],
"tdemdi": ["tdemdi", "tdeio", "../tdeio", "tdeparts"],
"tdeutils": ["tdeio", "../tdeio"] #,
# "tdespell2": None
}
postProcess = {
- "dcop": None,
- "tdecore": [["-p ", "tdecore", "-o", "appQuit", "tdecore.py"],
- #["-p ", "tdecore", "-o", "fixTQVariant", "tdecore.sbf"],
- ["-p ", "tdecore", "-o", "fixSignal", "tdecorepart0.*"]],
-# "tdesu": None,
- "tdefx": None,
- "tdeui": None, #[["-p ", "tdeui", "-o", "shpix", "siptdeuiTDESharedPixmap.cpp"]],
+ "dcop": None,
+ "tdecore": [["-p ", "tdecore", "-o", "appQuit", "tdecore.py"],
+ #["-p ", "tdecore", "-o", "fixTQVariant", "tdecore.sbf"],
+ ["-p ", "tdecore", "-o", "fixSignal", "tdecorepart0.*"]],
+# "tdesu": None,
+ "tdefx": None,
+ "tdeui": None, #[["-p ", "tdeui", "-o", "shpix", "siptdeuiTDESharedPixmap.cpp"]],
"tderesources": None,
"tdeabc": None,
"tdeio": None,
@@ -152,7 +152,7 @@ postProcess = {
"tdeparts": None,
"tdehtml": None,
"tdespell": None,
- "tdeprint": None,
+ "tdeprint": None,
"tdemdi": None,
"tdeutils": None #,
# "tdespell2": None
@@ -624,7 +624,7 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e
pyqtInclPathSeen = 0
for mod in pytde_imports [mname]:
- if string.find (mod, "q") == 0 and not pyqtInclPathSeen:
+ if string.find (mod, "PyTQt.q") == 0 and not pyqtInclPathSeen:
argv.append ("-I")
argv.append (pyqtcfg.pyqt_sip_dir)
pyqtInclPathSeen = 1