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>
master
Michele Calgaro 7 months ago
parent
commit
977a33f90b
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 9 additions and 9 deletions
  1. 1
    1
      INSTALL
  2. 8
    8
      kde.py

+ 1
- 1
INSTALL View File

@@ -51,7 +51,7 @@ The installation scripts are relying on the tde-config program.
51 51
 The programs tde-config, qmake, uic and moc must be accesssible
52 52
 through your PATH.
53 53
 
54
-Qt and tde may not be installed as expected (in QTDIR and TDEDIR)
54
+Qt and tde may not be installed as expected (in TQTDIR and TDEDIR)
55 55
 So until tde-config is able to give that information, you may
56 56
 have to give those paths.
57 57
 

+ 8
- 8
kde.py View File

@@ -86,7 +86,7 @@ def detect_kde(env):
86 86
 
87 87
 	## Detect the qt library
88 88
 	print "Checking for the qt library       : ",
89
-	qtdir = os.getenv("QTDIR")
89
+	qtdir = os.getenv("TQTDIR")
90 90
 	if qtdir:
91 91
 		print GREEN+"qt is in "+qtdir+NORMAL
92 92
 	else:
@@ -102,9 +102,9 @@ def detect_kde(env):
102 102
 			print YELLOW+"qt was found as "+m.group(1)+NORMAL
103 103
 		else:
104 104
 			print RED+"qt was not found"+NORMAL
105
-			print RED+"Please set QTDIR first (/usr/lib/qt3?)"+NORMAL
105
+			print RED+"Please set TQTDIR first (/usr/lib/qt3?)"+NORMAL
106 106
 			env.Exit(1)
107
-	env['QTDIR'] = qtdir.strip()
107
+	env['TQTDIR'] = qtdir.strip()
108 108
 
109 109
 	## Find the necessary programs uic-tqt and moc
110 110
 	print "Checking for uic-tqt              : ",
@@ -120,7 +120,7 @@ def detect_kde(env):
120 120
 			if len(uic):
121 121
 				print YELLOW+"uic-tqt was found as "+uic+NORMAL
122 122
 			else:
123
-				print RED+"uic-tqt was not found - set QTDIR put it in your PATH ?"+NORMAL
123
+				print RED+"uic-tqt was not found - set TQTDIR put it in your PATH ?"+NORMAL
124 124
 				env.Exit(1)
125 125
 	env['QT_UIC'] = uic
126 126
 
@@ -139,7 +139,7 @@ def detect_kde(env):
139 139
 			moc = "/usr/share/qt3/bin/tqmoc"
140 140
 			print YELLOW + "moc was found as " + moc + NORMAL
141 141
 		else:
142
-			print RED + "moc was not found - set QTDIR or put it in your PATH ?" + NORMAL
142
+			print RED + "moc was not found - set TQTDIR or put it in your PATH ?" + NORMAL
143 143
 			env.Exit(1)
144 144
 	env['QT_MOC'] = moc
145 145
 
@@ -418,7 +418,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
418 418
 	opts.AddOptions(
419 419
 		('PREFIX', 'root of the program installation'),
420 420
 
421
-		('QTDIR', 'root of qt directory'),
421
+		('TQTDIR', 'root of qt directory'),
422 422
 		('TQTLIBPATH', 'path to the qt libraries'),
423 423
 		('QTINCLUDEPATH', 'path to the qt includes'),
424 424
 		('TQTINCLUDEPATH', 'path to the tqt includes'),
@@ -449,7 +449,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
449 449
 	opts.Update(env)
450 450
 
451 451
 	# reconfigure when things are missing
452
-	if 'configure' in env['TARGS'] or not env.has_key('QTDIR') or not env.has_key('TDEDIR'):
452
+	if 'configure' in env['TARGS'] or not env.has_key('TQTDIR') or not env.has_key('TDEDIR'):
453 453
 		detect_kde(env)
454 454
 
455 455
 	# finally save the configuration to the cache file
@@ -465,7 +465,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
465 465
 	env['QT_DEBUG']    = 0
466 466
 	env['QT_UIC_HFLAGS']   = '-L $QTPLUGINS -nounload'
467 467
 	env['QT_UIC_CFLAGS']   = '$QT_UIC_HFLAGS -tr tr2i18n'
468
-	env['QT_LIBS']      = 'tqt'
468
+	env['TQT_LIBS']      = 'tqt'
469 469
 	env['QT_UICIMPLPREFIX'] = ''
470 470
 	env['QT_UICIMPLSUFFIX'] = '.cpp'
471 471
 

Loading…
Cancel
Save