Browse Source

qt -> tqt conversion:

QTDIR -> TQTDIR
QTDOC -> TQTDOC
INCDIR_QT -> INCDIR_TQT
LIBDIR_QT -> LIBDIR_TQT
QT_INC -> TQT_INC
QT_LIB -> TQT_LIB

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Michele Calgaro 6 months ago
parent
commit
2ead41ab9a
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
6 changed files with 21 additions and 21 deletions
  1. 2
    2
      build.py
  2. 10
    10
      configure.py
  3. 1
    1
      examples3/tablestatistics.py
  4. 3
    3
      pylupdate3/pylupdate.pro.in
  5. 1
    1
      pyuic2/pyuic.pro.in
  6. 4
    4
      pyuic3/pyuic.pro.in

+ 2
- 2
build.py View File

@@ -246,7 +246,7 @@ def moduleChecks(maindir):
246 246
     # Check for the tqui library.
247 247
     if config.qt_version >= 0x030000:
248 248
         if sys.platform == "win32":
249
-            tquilib = r"$(QTDIR)\lib\tqui.lib"
249
+            tquilib = r"$(TQTDIR)\lib\tqui.lib"
250 250
         else:
251 251
             tquilib = "-ltqui"
252 252
 
@@ -578,7 +578,7 @@ def main(argv):
578 578
 
579 579
     if config.qt_version >= 0x030100:
580 580
         if sys.platform == "win32":
581
-            qaclib = r"$(QTDIR)\lib\qassistantclient.lib"
581
+            qaclib = r"$(TQTDIR)\lib\qassistantclient.lib"
582 582
         else:
583 583
             qaclib = "-lqassistantclient"
584 584
 

+ 10
- 10
configure.py View File

@@ -41,7 +41,7 @@ sip_min_version = 0x040800
41 41
 
42 42
 # Try and find a TQt installation to use as the default.
43 43
 try:
44
-    qt_dir = os.environ["QTDIR"]
44
+    qt_dir = os.environ["TQTDIR"]
45 45
 except KeyError:
46 46
     qt_dir = ""
47 47
 
@@ -1070,12 +1070,12 @@ def get_build_macros(overrides):
1070 1070
 
1071 1071
     # Add the TQt specific macros to the default.
1072 1072
     names = sipcfg.build_macros().keys()
1073
-    names.append("INCDIR_QT")
1074
-    names.append("LIBDIR_QT")
1073
+    names.append("INCDIR_TQT")
1074
+    names.append("LIBDIR_TQT")
1075 1075
     names.append("MOC")
1076 1076
 
1077
-    # Make sure $QTDIR reflects any directory passed on the command line.
1078
-    os.environ["QTDIR"] = qt_dir
1077
+    # Make sure $TQTDIR reflects any directory passed on the command line.
1078
+    os.environ["TQTDIR"] = qt_dir
1079 1079
 
1080 1080
     properties = {
1081 1081
         "QT_INSTALL_BINS":      os.path.join(qt_dir, "bin"),
@@ -1097,17 +1097,17 @@ def check_qt_installation(macros):
1097 1097
     # Set the TQt include and lib directories.
1098 1098
     global qt_incdir, qt_libdir
1099 1099
 
1100
-    qt_incdir = macros["INCDIR_QT"]
1100
+    qt_incdir = macros["INCDIR_TQT"]
1101 1101
 
1102 1102
     if not qt_incdir:
1103 1103
         qt_incdir = os.path.join(qt_dir, "include")
1104
-        macros["INCDIR_QT"] = qt_incdir
1104
+        macros["INCDIR_TQT"] = qt_incdir
1105 1105
 
1106
-    qt_libdir = macros["LIBDIR_QT"]
1106
+    qt_libdir = macros["LIBDIR_TQT"]
1107 1107
 
1108 1108
     if not qt_libdir:
1109 1109
         qt_libdir = os.path.join(qt_dir, "lib")
1110
-        macros["LIBDIR_QT"] = qt_libdir
1110
+        macros["LIBDIR_TQT"] = qt_libdir
1111 1111
 
1112 1112
     # Check the TQt header files have been installed.  Quietly check for TQt v4.
1113 1113
     qt4_d = os.path.join(qt_incdir, "TQtCore")
@@ -1399,7 +1399,7 @@ def main(argv):
1399 1399
 
1400 1400
     # Check that we know the name of the TQt root directory.
1401 1401
     if not qt_dir:
1402
-        sipconfig.error("A TQt installation could not be found. Use use the -q argument or the QTDIR environment variable to explicitly specify the correct directory.")
1402
+        sipconfig.error("A TQt installation could not be found. Use use the -q argument or the TQTDIR environment variable to explicitly specify the correct directory.")
1403 1403
 
1404 1404
     # When building static libraries, signed interpreter checking makes no
1405 1405
     # sense.

+ 1
- 1
examples3/tablestatistics.py View File

@@ -52,7 +52,7 @@ class Table(TQTable):
52 52
     def initTable(self):
53 53
         # read all the TQt source and header files into a list
54 54
         all = []
55
-        qtdir = os.getenv("QTDIR")
55
+        qtdir = os.getenv("TQTDIR")
56 56
         for i in dirs:
57 57
             dir = TQDir(os.path.join(qtdir, "src", i))
58 58
             lst = TQStringList(dir.entryList("*.cpp; *.h"))

+ 3
- 3
pylupdate3/pylupdate.pro.in View File

@@ -23,7 +23,7 @@ SOURCES		= fetchtr.cpp \
23 23
 		  metatranslator.cpp \
24 24
 		  proparser.cpp
25 25
 
26
-rbprof:exists($(QTDIR)/src/qt_professional.pri) {
27
-	QT_SOURCE_TREE = $(QTDIR)
28
-	include($(QTDIR)/src/qt_professional.pri)
26
+rbprof:exists($(TQTDIR)/src/qt_professional.pri) {
27
+	QT_SOURCE_TREE = $(TQTDIR)
28
+	include($(TQTDIR)/src/qt_professional.pri)
29 29
 }

+ 1
- 1
pyuic2/pyuic.pro.in View File

@@ -8,7 +8,7 @@
8 8
 
9 9
 TEMPLATE	= app
10 10
 CONFIG		= qt console warn_on release
11
-INCLUDEPATH	= @BLX_INCLUDEPATH@ $(QTDIR)/src/3rdparty/zlib
11
+INCLUDEPATH	= @BLX_INCLUDEPATH@ $(TQTDIR)/src/3rdparty/zlib
12 12
 DEFINES		= UIC @BLX_DEFINES@
13 13
 
14 14
 DESTDIR		= @PYQT_BINDIR@

+ 4
- 4
pyuic3/pyuic.pro.in View File

@@ -8,7 +8,7 @@
8 8
 
9 9
 TEMPLATE	= app
10 10
 CONFIG		+= qt console warn_on release @PYQT_RBPROF@
11
-INCLUDEPATH	+= @BLX_INCLUDEPATH@ $(QTDIR)/src/3rdparty/zlib
11
+INCLUDEPATH	+= @BLX_INCLUDEPATH@ $(TQTDIR)/src/3rdparty/zlib
12 12
 DEFINES		+= UIC QT_INTERNAL_XML @BLX_DEFINES@
13 13
 
14 14
 DESTDIR		= @PYQT_BINDIR@
@@ -30,7 +30,7 @@ SOURCES		= main.cpp \
30 30
 		  domtool.cpp \
31 31
 		  parser.cpp
32 32
 
33
-rbprof:exists($(QTDIR)/src/qt_professional.pri) {
34
-	QT_SOURCE_TREE = $(QTDIR)
35
-	include($(QTDIR)/src/qt_professional.pri)
33
+rbprof:exists($(TQTDIR)/src/qt_professional.pri) {
34
+	QT_SOURCE_TREE = $(TQTDIR)
35
+	include($(TQTDIR)/src/qt_professional.pri)
36 36
 }

Loading…
Cancel
Save