Browse Source

qt -> tqt conversion:

qtlib -> tqtlib
libqt -> libtqt
QTLIB -> TQTLIB
LIBQT -> LIBTQT

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 10 months ago
parent
commit
0517447cd1
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 31 additions and 31 deletions
  1. 2
    2
      build.py
  2. 29
    29
      configure.py

+ 2
- 2
build.py View File

@@ -550,7 +550,7 @@ def main(argv):
if sipMajorVersion >= 4:
modlink = ""
elif sys.platform == "win32":
modlink = sipconfig.escape(os.path.join(modDir, "libqtc.lib"))
modlink = sipconfig.escape(os.path.join(modDir, "libtqtc.lib"))
else:
modlink = sipconfig.escape("-L" + modDir) + " -lqtcmodule"

@@ -559,7 +559,7 @@ def main(argv):
if sipMajorVersion >= 4:
modlink = ""
elif sys.platform == "win32":
modlink = sipconfig.escape(os.path.join(modDir, "libqttablec.lib")) + " " + sipconfig.escape(os.path.join(modDir, "libqtc.lib"))
modlink = sipconfig.escape(os.path.join(modDir, "libtqttablec.lib")) + " " + sipconfig.escape(os.path.join(modDir, "libtqtc.lib"))
else:
modlink = sipconfig.escape("-L" + modDir) + " -lqttablecmodule -lqtcmodule"


+ 29
- 29
configure.py View File

@@ -70,7 +70,7 @@ else:
sipcfg = sipconfig.Configuration()

# Command line options.
opt_qtlib = None
opt_tqtlib = None
opt_qconfigdir = None
opt_pyqtbindir = sipcfg.default_bin_dir
opt_pyqtmoddir = os.path.join(sipcfg.default_mod_dir, "python_tqt")
@@ -400,7 +400,7 @@ def inform_user():
sipconfig.inform("The PyTQt .sip files will be installed in %s." % opt_pyqtsipdir)

sipconfig.inform("The TQt header files are in %s." % qt_incdir)
sipconfig.inform("The %s TQt library is in %s." % (opt_qtlib, qt_libdir))
sipconfig.inform("The %s TQt library is in %s." % (opt_tqtlib, qt_libdir))

if qt_version >= 0x020000:
sipconfig.inform("pyuic will be installed in %s." % opt_pyqtbindir)
@@ -438,7 +438,7 @@ def create_config(module, template, macros):
"qt_threaded": qt_threaded,
"qt_dir": qt_dir,
"qt_inc_dir": qt_incdir,
"qt_lib": opt_qtlib,
"qt_lib": opt_tqtlib,
"qt_lib_dir": qt_libdir
}

@@ -1206,7 +1206,7 @@ def check_qt_installation(macros):

resolve_qt3_library(generator)

if opt_qtlib in ("qt-mt", "qt-mtedu", "qt-mteval", "qte-mt", "qtmt", "qtmtedu", "qtmteval", "tqt-mt", "tqt-mtedu", "tqt-mteval", "tqte-mt", "tqtmt", "tqtmtedu", "tqtmteval"):
if opt_tqtlib in ("qt-mt", "qt-mtedu", "qt-mteval", "qte-mt", "qtmt", "qtmtedu", "qtmteval", "tqt-mt", "tqt-mtedu", "tqt-mteval", "tqte-mt", "tqtmt", "tqtmtedu", "tqtmteval"):
qt_threaded = 1

global pyqt
@@ -1222,7 +1222,7 @@ def check_qt_installation(macros):
sipcfg.qt_framework = 0
sipcfg.qt_threaded = qt_threaded
sipcfg.qt_dir = qt_dir
sipcfg.qt_lib = opt_qtlib
sipcfg.qt_lib = opt_tqtlib
sipcfg.qt_lib_dir = qt_libdir


@@ -1232,11 +1232,11 @@ def resolve_qt3_library(generator):

generator is the name of the Makefile generator.
"""
global opt_qtlib
global opt_tqtlib

if opt_qtlib:
if not is_qt_library(generator, opt_qtlib):
sipconfig.error("The %s TQt library could not be found in %s." % (opt_qtlib, qt_libdir))
if opt_tqtlib:
if not is_qt_library(generator, opt_tqtlib):
sipconfig.error("The %s TQt library could not be found in %s." % (opt_tqtlib, qt_libdir))
else:
stlib = is_qt_library(generator, "tqt")
mtlib = is_qt_library(generator, "tqt-mt")
@@ -1253,40 +1253,40 @@ def resolve_qt3_library(generator):
names = []

if stlib:
opt_qtlib = "tqt"
names.append(opt_qtlib)
opt_tqtlib = "tqt"
names.append(opt_tqtlib)

if mtlib:
opt_qtlib = "tqt-mt"
names.append(opt_qtlib)
opt_tqtlib = "tqt-mt"
names.append(opt_tqtlib)

if edlib:
opt_qtlib = "tqt-mtedu"
names.append(opt_qtlib)
opt_tqtlib = "tqt-mtedu"
names.append(opt_tqtlib)

if evlib:
opt_qtlib = "tqt-mteval"
names.append(opt_qtlib)
opt_tqtlib = "tqt-mteval"
names.append(opt_tqtlib)

if emlib:
opt_qtlib = "tqte"
names.append(opt_qtlib)
opt_tqtlib = "tqte"
names.append(opt_tqtlib)

if etlib:
opt_qtlib = "tqte-mt"
names.append(opt_qtlib)
opt_tqtlib = "tqte-mt"
names.append(opt_tqtlib)

if bmtlib:
opt_qtlib = "tqtmt"
names.append(opt_qtlib)
opt_tqtlib = "tqtmt"
names.append(opt_tqtlib)

if bedlib:
opt_qtlib = "tqtmtedu"
names.append(opt_qtlib)
opt_tqtlib = "tqtmtedu"
names.append(opt_tqtlib)

if bevlib:
opt_qtlib = "tqtmteval"
names.append(opt_qtlib)
opt_tqtlib = "tqtmteval"
names.append(opt_tqtlib)

if not names:
sipconfig.error("No TQt libraries could be found in %s." % qt_libdir)
@@ -1335,7 +1335,7 @@ def main(argv):
except getopt.GetoptError:
usage()

global qt_dir, opt_qtlib, opt_qconfigdir
global qt_dir, opt_tqtlib, opt_qconfigdir
global opt_pyqtbindir, opt_pyqtmoddir, opt_pyqtsipdir
global opt_qtpetag, opt_static, opt_debug, opt_concat
global opt_split, opt_tracing, opt_verbose, opt_keepfeatures
@@ -1393,7 +1393,7 @@ def main(argv):
opt_verbose = 1
elif opt == "-y":
if arg in ("qt", "qt-mt", "qt-mtedu", "qt-mteval", "qte", "qte-mt", "qtmt", "qtmtedu", "tqt", "tqt-mt", "tqt-mtedu", "tqt-mteval", "tqte", "tqte-mt", "tqtmt", "tqtmtedu"):
opt_qtlib = arg
opt_tqtlib = arg
else:
usage()


Loading…
Cancel
Save