Browse Source

qt -> tqt conversion:

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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Michele Calgaro 5 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):
550 550
     if sipMajorVersion >= 4:
551 551
         modlink = ""
552 552
     elif sys.platform == "win32":
553
-        modlink = sipconfig.escape(os.path.join(modDir, "libqtc.lib"))
553
+        modlink = sipconfig.escape(os.path.join(modDir, "libtqtc.lib"))
554 554
     else:
555 555
         modlink = sipconfig.escape("-L" + modDir) + " -lqtcmodule"
556 556
 
@@ -559,7 +559,7 @@ def main(argv):
559 559
     if sipMajorVersion >= 4:
560 560
         modlink = ""
561 561
     elif sys.platform == "win32":
562
-        modlink = sipconfig.escape(os.path.join(modDir, "libqttablec.lib")) + " " + sipconfig.escape(os.path.join(modDir, "libqtc.lib"))
562
+        modlink = sipconfig.escape(os.path.join(modDir, "libtqttablec.lib")) + " " + sipconfig.escape(os.path.join(modDir, "libtqtc.lib"))
563 563
     else:
564 564
         modlink = sipconfig.escape("-L" + modDir) + " -lqttablecmodule -lqtcmodule"
565 565
 

+ 29
- 29
configure.py View File

@@ -70,7 +70,7 @@ else:
70 70
 sipcfg = sipconfig.Configuration()
71 71
 
72 72
 # Command line options.
73
-opt_qtlib = None
73
+opt_tqtlib = None
74 74
 opt_qconfigdir = None
75 75
 opt_pyqtbindir = sipcfg.default_bin_dir
76 76
 opt_pyqtmoddir = os.path.join(sipcfg.default_mod_dir, "python_tqt")
@@ -400,7 +400,7 @@ def inform_user():
400 400
     sipconfig.inform("The PyTQt .sip files will be installed in %s." % opt_pyqtsipdir)
401 401
 
402 402
     sipconfig.inform("The TQt header files are in %s." % qt_incdir)
403
-    sipconfig.inform("The %s TQt library is in %s." % (opt_qtlib, qt_libdir))
403
+    sipconfig.inform("The %s TQt library is in %s." % (opt_tqtlib, qt_libdir))
404 404
 
405 405
     if qt_version >= 0x020000:
406 406
         sipconfig.inform("pyuic will be installed in %s." % opt_pyqtbindir)
@@ -438,7 +438,7 @@ def create_config(module, template, macros):
438 438
         "qt_threaded":        qt_threaded,
439 439
         "qt_dir":             qt_dir,
440 440
         "qt_inc_dir":         qt_incdir,
441
-        "qt_lib":             opt_qtlib,
441
+        "qt_lib":             opt_tqtlib,
442 442
         "qt_lib_dir":         qt_libdir
443 443
     }
444 444
 
@@ -1206,7 +1206,7 @@ def check_qt_installation(macros):
1206 1206
 
1207 1207
     resolve_qt3_library(generator)
1208 1208
 
1209
-    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"):
1209
+    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"):
1210 1210
         qt_threaded = 1
1211 1211
 
1212 1212
     global pyqt
@@ -1222,7 +1222,7 @@ def check_qt_installation(macros):
1222 1222
     sipcfg.qt_framework = 0
1223 1223
     sipcfg.qt_threaded = qt_threaded
1224 1224
     sipcfg.qt_dir = qt_dir
1225
-    sipcfg.qt_lib = opt_qtlib
1225
+    sipcfg.qt_lib = opt_tqtlib
1226 1226
     sipcfg.qt_lib_dir = qt_libdir
1227 1227
 
1228 1228
 
@@ -1232,11 +1232,11 @@ def resolve_qt3_library(generator):
1232 1232
 
1233 1233
     generator is the name of the Makefile generator.
1234 1234
     """
1235
-    global opt_qtlib
1235
+    global opt_tqtlib
1236 1236
 
1237
-    if opt_qtlib:
1238
-        if not is_qt_library(generator, opt_qtlib):
1239
-            sipconfig.error("The %s TQt library could not be found in %s." % (opt_qtlib, qt_libdir))
1237
+    if opt_tqtlib:
1238
+        if not is_qt_library(generator, opt_tqtlib):
1239
+            sipconfig.error("The %s TQt library could not be found in %s." % (opt_tqtlib, qt_libdir))
1240 1240
     else:
1241 1241
         stlib = is_qt_library(generator, "tqt")
1242 1242
         mtlib = is_qt_library(generator, "tqt-mt")
@@ -1253,40 +1253,40 @@ def resolve_qt3_library(generator):
1253 1253
         names = []
1254 1254
 
1255 1255
         if stlib:
1256
-            opt_qtlib = "tqt"
1257
-            names.append(opt_qtlib)
1256
+            opt_tqtlib = "tqt"
1257
+            names.append(opt_tqtlib)
1258 1258
 
1259 1259
         if mtlib:
1260
-            opt_qtlib = "tqt-mt"
1261
-            names.append(opt_qtlib)
1260
+            opt_tqtlib = "tqt-mt"
1261
+            names.append(opt_tqtlib)
1262 1262
 
1263 1263
         if edlib:
1264
-            opt_qtlib = "tqt-mtedu"
1265
-            names.append(opt_qtlib)
1264
+            opt_tqtlib = "tqt-mtedu"
1265
+            names.append(opt_tqtlib)
1266 1266
 
1267 1267
         if evlib:
1268
-            opt_qtlib = "tqt-mteval"
1269
-            names.append(opt_qtlib)
1268
+            opt_tqtlib = "tqt-mteval"
1269
+            names.append(opt_tqtlib)
1270 1270
 
1271 1271
         if emlib:
1272
-            opt_qtlib = "tqte"
1273
-            names.append(opt_qtlib)
1272
+            opt_tqtlib = "tqte"
1273
+            names.append(opt_tqtlib)
1274 1274
 
1275 1275
         if etlib:
1276
-            opt_qtlib = "tqte-mt"
1277
-            names.append(opt_qtlib)
1276
+            opt_tqtlib = "tqte-mt"
1277
+            names.append(opt_tqtlib)
1278 1278
 
1279 1279
         if bmtlib:
1280
-            opt_qtlib = "tqtmt"
1281
-            names.append(opt_qtlib)
1280
+            opt_tqtlib = "tqtmt"
1281
+            names.append(opt_tqtlib)
1282 1282
 
1283 1283
         if bedlib:
1284
-            opt_qtlib = "tqtmtedu"
1285
-            names.append(opt_qtlib)
1284
+            opt_tqtlib = "tqtmtedu"
1285
+            names.append(opt_tqtlib)
1286 1286
 
1287 1287
         if bevlib:
1288
-            opt_qtlib = "tqtmteval"
1289
-            names.append(opt_qtlib)
1288
+            opt_tqtlib = "tqtmteval"
1289
+            names.append(opt_tqtlib)
1290 1290
 
1291 1291
         if not names:
1292 1292
             sipconfig.error("No TQt libraries could be found in %s." % qt_libdir)
@@ -1335,7 +1335,7 @@ def main(argv):
1335 1335
     except getopt.GetoptError:
1336 1336
         usage()
1337 1337
 
1338
-    global qt_dir, opt_qtlib, opt_qconfigdir
1338
+    global qt_dir, opt_tqtlib, opt_qconfigdir
1339 1339
     global opt_pyqtbindir, opt_pyqtmoddir, opt_pyqtsipdir
1340 1340
     global opt_qtpetag, opt_static, opt_debug, opt_concat
1341 1341
     global opt_split, opt_tracing, opt_verbose, opt_keepfeatures
@@ -1393,7 +1393,7 @@ def main(argv):
1393 1393
             opt_verbose = 1
1394 1394
         elif opt == "-y":
1395 1395
             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"):
1396
-                opt_qtlib = arg
1396
+                opt_tqtlib = arg
1397 1397
             else:
1398 1398
                 usage()
1399 1399
 

Loading…
Cancel
Save