|
|
@ -229,8 +229,6 @@ def moduleChecks(maindir):
|
|
|
|
tryModule(maindir,"tqtnetwork", "tqsocket.h", "TQSocket()")
|
|
|
|
tryModule(maindir,"tqtnetwork", "tqsocket.h", "TQSocket()")
|
|
|
|
tryModule(maindir,"tqttable", "tqtable.h", "TQTable()")
|
|
|
|
tryModule(maindir,"tqttable", "tqtable.h", "TQTable()")
|
|
|
|
tryModule(maindir,"tqtxml", "tqdom.h", "TQDomImplementation()")
|
|
|
|
tryModule(maindir,"tqtxml", "tqdom.h", "TQDomImplementation()")
|
|
|
|
|
|
|
|
|
|
|
|
if config.tqt_version >= 0x030000:
|
|
|
|
|
|
|
|
tryModule(maindir,"tqtsql", "tqsql.h", "TQSql()")
|
|
|
|
tryModule(maindir,"tqtsql", "tqsql.h", "TQSql()")
|
|
|
|
|
|
|
|
|
|
|
|
# We need a different Makefile for the tqtgl module.
|
|
|
|
# We need a different Makefile for the tqtgl module.
|
|
|
@ -244,7 +242,6 @@ def moduleChecks(maindir):
|
|
|
|
config.create_makefile("tqttest.pro")
|
|
|
|
config.create_makefile("tqttest.pro")
|
|
|
|
|
|
|
|
|
|
|
|
# Check for the tqui library.
|
|
|
|
# Check for the tqui library.
|
|
|
|
if config.tqt_version >= 0x030000:
|
|
|
|
|
|
|
|
if sys.platform == "win32":
|
|
|
|
if sys.platform == "win32":
|
|
|
|
tquilib = r"$(TQTDIR)\lib\tqui.lib"
|
|
|
|
tquilib = r"$(TQTDIR)\lib\tqui.lib"
|
|
|
|
else:
|
|
|
|
else:
|
|
|
@ -327,7 +324,7 @@ int main(int argc,char **argv)
|
|
|
|
fprintf(fp,"-x TQt_THREAD_SUPPORT\\n");
|
|
|
|
fprintf(fp,"-x TQt_THREAD_SUPPORT\\n");
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#if (defined(Q_OS_WIN32) || defined(Q_OS_WIN64)) && TQT_VERSION >= 0x030000
|
|
|
|
#if (defined(Q_OS_WIN32) || defined(Q_OS_WIN64))
|
|
|
|
if (tqWinVersion() != TQt::WV_XP)
|
|
|
|
if (tqWinVersion() != TQt::WV_XP)
|
|
|
|
fprintf(fp,"-x TQt_STYLE_WINDOWSXP\\n");
|
|
|
|
fprintf(fp,"-x TQt_STYLE_WINDOWSXP\\n");
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
@ -525,11 +522,6 @@ def main(argv):
|
|
|
|
if config.tqt_version == 0:
|
|
|
|
if config.tqt_version == 0:
|
|
|
|
sip_tqt_config.error("SIP-TQt has been built with TQt support disabled.\n")
|
|
|
|
sip_tqt_config.error("SIP-TQt has been built with TQt support disabled.\n")
|
|
|
|
|
|
|
|
|
|
|
|
# Early versions of TQt for the Mac didn't include everything. Rather than
|
|
|
|
|
|
|
|
# maintain these in the future we just mandate a later version.
|
|
|
|
|
|
|
|
if sys.platform == "darwin" and config.tqt_version < 0x030100:
|
|
|
|
|
|
|
|
sip_tqt_config.error("PyTQt for MacOS/X requires TQt v3.1.0 or later.\n")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Check the installation directory is valid and add it as a patch.
|
|
|
|
# Check the installation directory is valid and add it as a patch.
|
|
|
|
if not os.access(modDir,os.F_OK):
|
|
|
|
if not os.access(modDir,os.F_OK):
|
|
|
|
sip_tqt_config.error("The %s PyTQt destination directory does not seem to exist. Use the -d argument to set the correct directory." % (modDir))
|
|
|
|
sip_tqt_config.error("The %s PyTQt destination directory does not seem to exist. Use the -d argument to set the correct directory." % (modDir))
|
|
|
@ -576,7 +568,6 @@ def main(argv):
|
|
|
|
# Link in the tqassistantclient library for TQt v3.1+.
|
|
|
|
# Link in the tqassistantclient library for TQt v3.1+.
|
|
|
|
tqaclib = ""
|
|
|
|
tqaclib = ""
|
|
|
|
|
|
|
|
|
|
|
|
if config.tqt_version >= 0x030100:
|
|
|
|
|
|
|
|
if sys.platform == "win32":
|
|
|
|
if sys.platform == "win32":
|
|
|
|
tqaclib = r"$(TQTDIR)\lib\tqassistantclient.lib"
|
|
|
|
tqaclib = r"$(TQTDIR)\lib\tqassistantclient.lib"
|
|
|
|
else:
|
|
|
|
else:
|
|
|
@ -585,14 +576,12 @@ def main(argv):
|
|
|
|
config.patches["@PYTQT_TQASSISTANTCLIENT_LIB@"] = tqaclib
|
|
|
|
config.patches["@PYTQT_TQASSISTANTCLIENT_LIB@"] = tqaclib
|
|
|
|
|
|
|
|
|
|
|
|
# Check for TQScintilla.
|
|
|
|
# Check for TQScintilla.
|
|
|
|
if config.tqt_version >= 0x030000:
|
|
|
|
|
|
|
|
checkTQScintilla()
|
|
|
|
checkTQScintilla()
|
|
|
|
|
|
|
|
|
|
|
|
# Create a build directory that we can compile test programs.
|
|
|
|
# Create a build directory that we can compile test programs.
|
|
|
|
maindir = mkTempBuildDir()
|
|
|
|
maindir = mkTempBuildDir()
|
|
|
|
|
|
|
|
|
|
|
|
# Check what additional modules to build.
|
|
|
|
# Check what additional modules to build.
|
|
|
|
if config.tqt_version >= 0x020000:
|
|
|
|
|
|
|
|
moduleChecks(maindir)
|
|
|
|
moduleChecks(maindir)
|
|
|
|
|
|
|
|
|
|
|
|
# Work out the platform and TQt version tags to pass to SIP-TQt to generate the
|
|
|
|
# Work out the platform and TQt version tags to pass to SIP-TQt to generate the
|
|
|
@ -685,7 +674,6 @@ def main(argv):
|
|
|
|
# See which version of pyuic to build.
|
|
|
|
# See which version of pyuic to build.
|
|
|
|
config.patches["@PYTQT_BINDIR@"] = sip_tqt_config.escape(binDir)
|
|
|
|
config.patches["@PYTQT_BINDIR@"] = sip_tqt_config.escape(binDir)
|
|
|
|
|
|
|
|
|
|
|
|
if config.tqt_version >= 0x030000:
|
|
|
|
|
|
|
|
sip_tqt_config.inform("Creating Makefile for pytquic3.")
|
|
|
|
sip_tqt_config.inform("Creating Makefile for pytquic3.")
|
|
|
|
subdirs.append("pytquic3")
|
|
|
|
subdirs.append("pytquic3")
|
|
|
|
olddir = sip_tqt_config.push_dir("pytquic3")
|
|
|
|
olddir = sip_tqt_config.push_dir("pytquic3")
|
|
|
@ -693,8 +681,7 @@ def main(argv):
|
|
|
|
config.create_makefile("pytquic.pro", [])
|
|
|
|
config.create_makefile("pytquic.pro", [])
|
|
|
|
sip_tqt_config.pop_dir(olddir)
|
|
|
|
sip_tqt_config.pop_dir(olddir)
|
|
|
|
|
|
|
|
|
|
|
|
# Build pylupdate if TQt v3.0 or later.
|
|
|
|
# Build pylupdate.
|
|
|
|
if config.tqt_version >= 0x030000:
|
|
|
|
|
|
|
|
sip_tqt_config.inform("Creating Makefile for pytqlupdate3.")
|
|
|
|
sip_tqt_config.inform("Creating Makefile for pytqlupdate3.")
|
|
|
|
subdirs.append("pytqlupdate3")
|
|
|
|
subdirs.append("pytqlupdate3")
|
|
|
|
olddir = sip_tqt_config.push_dir("pytqlupdate3")
|
|
|
|
olddir = sip_tqt_config.push_dir("pytqlupdate3")
|
|
|
|