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>
pull/1/head
Michele Calgaro 6 years ago
parent f666158f1e
commit 977a33f90b
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

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

@ -86,7 +86,7 @@ def detect_kde(env):
## Detect the qt library ## Detect the qt library
print "Checking for the qt library : ", print "Checking for the qt library : ",
qtdir = os.getenv("QTDIR") qtdir = os.getenv("TQTDIR")
if qtdir: if qtdir:
print GREEN+"qt is in "+qtdir+NORMAL print GREEN+"qt is in "+qtdir+NORMAL
else: else:
@ -102,9 +102,9 @@ def detect_kde(env):
print YELLOW+"qt was found as "+m.group(1)+NORMAL print YELLOW+"qt was found as "+m.group(1)+NORMAL
else: else:
print RED+"qt was not found"+NORMAL print RED+"qt was not found"+NORMAL
print RED+"Please set QTDIR first (/usr/lib/qt3?)"+NORMAL print RED+"Please set TQTDIR first (/usr/lib/qt3?)"+NORMAL
env.Exit(1) env.Exit(1)
env['QTDIR'] = qtdir.strip() env['TQTDIR'] = qtdir.strip()
## Find the necessary programs uic-tqt and moc ## Find the necessary programs uic-tqt and moc
print "Checking for uic-tqt : ", print "Checking for uic-tqt : ",
@ -120,7 +120,7 @@ def detect_kde(env):
if len(uic): if len(uic):
print YELLOW+"uic-tqt was found as "+uic+NORMAL print YELLOW+"uic-tqt was found as "+uic+NORMAL
else: else:
print RED+"uic-tqt was not found - set QTDIR put it in your PATH ?"+NORMAL print RED+"uic-tqt was not found - set TQTDIR put it in your PATH ?"+NORMAL
env.Exit(1) env.Exit(1)
env['QT_UIC'] = uic env['QT_UIC'] = uic
@ -139,7 +139,7 @@ def detect_kde(env):
moc = "/usr/share/qt3/bin/tqmoc" moc = "/usr/share/qt3/bin/tqmoc"
print YELLOW + "moc was found as " + moc + NORMAL print YELLOW + "moc was found as " + moc + NORMAL
else: else:
print RED + "moc was not found - set QTDIR or put it in your PATH ?" + NORMAL print RED + "moc was not found - set TQTDIR or put it in your PATH ?" + NORMAL
env.Exit(1) env.Exit(1)
env['QT_MOC'] = moc env['QT_MOC'] = moc
@ -418,7 +418,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
opts.AddOptions( opts.AddOptions(
('PREFIX', 'root of the program installation'), ('PREFIX', 'root of the program installation'),
('QTDIR', 'root of qt directory'), ('TQTDIR', 'root of qt directory'),
('TQTLIBPATH', 'path to the qt libraries'), ('TQTLIBPATH', 'path to the qt libraries'),
('QTINCLUDEPATH', 'path to the qt includes'), ('QTINCLUDEPATH', 'path to the qt includes'),
('TQTINCLUDEPATH', 'path to the tqt includes'), ('TQTINCLUDEPATH', 'path to the tqt includes'),
@ -449,7 +449,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
opts.Update(env) opts.Update(env)
# reconfigure when things are missing # reconfigure when things are missing
if 'configure' in env['TARGS'] or not env.has_key('QTDIR') or not env.has_key('TDEDIR'): if 'configure' in env['TARGS'] or not env.has_key('TQTDIR') or not env.has_key('TDEDIR'):
detect_kde(env) detect_kde(env)
# finally save the configuration to the cache file # finally save the configuration to the cache file
@ -465,7 +465,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
env['QT_DEBUG'] = 0 env['QT_DEBUG'] = 0
env['QT_UIC_HFLAGS'] = '-L $QTPLUGINS -nounload' env['QT_UIC_HFLAGS'] = '-L $QTPLUGINS -nounload'
env['QT_UIC_CFLAGS'] = '$QT_UIC_HFLAGS -tr tr2i18n' env['QT_UIC_CFLAGS'] = '$QT_UIC_HFLAGS -tr tr2i18n'
env['QT_LIBS'] = 'tqt' env['TQT_LIBS'] = 'tqt'
env['QT_UICIMPLPREFIX'] = '' env['QT_UICIMPLPREFIX'] = ''
env['QT_UICIMPLSUFFIX'] = '.cpp' env['QT_UICIMPLSUFFIX'] = '.cpp'

Loading…
Cancel
Save