diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-27 16:03:57 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-27 16:03:57 +0900 |
commit | 430aedbbce33fd98ce26df658842f94f333cc8ef (patch) | |
tree | 6a8894ba14f996bb1e74648d9be377603c5dfb46 /parts | |
parent | 255de04fbbb4597e46fb25017879a6afeaf4cebd (diff) | |
download | tdevelop-430aedbbce33fd98ce26df658842f94f333cc8ef.tar.gz tdevelop-430aedbbce33fd98ce26df658842f94f333cc8ef.zip |
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>
Diffstat (limited to 'parts')
-rw-r--r-- | parts/appwizard/common/scons/admin/kde.py | 16 | ||||
-rw-r--r-- | parts/classview/Makefile.am | 6 | ||||
-rw-r--r-- | parts/documentation/plugins/qt/docqtplugin.cpp | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py index aa275dab..717579f4 100644 --- a/parts/appwizard/common/scons/admin/kde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -65,7 +65,7 @@ def detect_kde(env): ## Detect the qt library print "Checking for the qt library : ", - qtdir = os.getenv("QTDIR") + qtdir = os.getenv("TQTDIR") if qtdir: print GREEN+"qt is in "+qtdir+NORMAL else: @@ -77,9 +77,9 @@ def detect_kde(env): print YELLOW+"qt was found as "+m.group(1)+NORMAL else: 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['QTDIR'] = qtdir.strip() + env['TQTDIR'] = qtdir.strip() ## Find the necessary programs uic and moc print "Checking for uic : ", @@ -95,7 +95,7 @@ def detect_kde(env): if len(uic): print YELLOW+"uic was found as "+uic+NORMAL else: - print RED+"uic was not found - set QTDIR put it in your PATH ?"+NORMAL + print RED+"uic was not found - set TQTDIR put it in your PATH ?"+NORMAL env.Exit(1) env['QT_UIC'] = uic @@ -111,7 +111,7 @@ def detect_kde(env): moc = "/usr/share/qt3/bin/moc" print YELLOW + "moc was found as " + moc + NORMAL 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['QT_MOC'] = moc @@ -365,7 +365,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt opts.AddOptions( ('PREFIX', 'root of the program installation'), - ('QTDIR', 'root of qt directory'), + ('TQTDIR', 'root of qt directory'), ('TQTLIBPATH', 'path to the qt libraries'), ('QTINCLUDEPATH', 'path to the qt includes'), ('QT_UIC', 'moc directory'), @@ -392,7 +392,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt opts.Update(env) # reconfigure when things are missing - if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('QTDIR') or not env.has_key('TDEDIR')): + if not env['HELP'] and (env['_CONFIGURE'] or not env.has_key('TQTDIR') or not env.has_key('TDEDIR')): detect_kde(env) # finally save the configuration to the cache file @@ -408,7 +408,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt env['QT_DEBUG'] = 0 env['QT_UIC_HFLAGS'] = '-L $QTPLUGINS -nounload' env['QT_UIC_CFLAGS'] = '$QT_UIC_HFLAGS -tr tr2i18n' - env['QT_LIBS'] = 'qt-mt' + env['TQT_LIBS'] = 'qt-mt' env['QT_UICIMPLPREFIX'] = '' env['QT_UICIMPLSUFFIX'] = '.cpp' diff --git a/parts/classview/Makefile.am b/parts/classview/Makefile.am index 3041259e..da07fcb6 100644 --- a/parts/classview/Makefile.am +++ b/parts/classview/Makefile.am @@ -19,9 +19,9 @@ rcdir = $(kde_datadir)/kdevclassview rc_DATA = kdevclassview.rc -QTDIR = /home/bernd/kdesrc/qt-copy +TQTDIR = /home/bernd/kdesrc/qt-copy foo: digraphview.cpp digraphview.h - $(QTDIR)/bin/moc digraphview.h > digraphview.moc ; \ - g++ digraphview.cpp -I$(QTDIR)/include -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lX11 -lXext -o foo + $(TQTDIR)/bin/moc digraphview.h > digraphview.moc ; \ + g++ digraphview.cpp -I$(TQTDIR)/include -L$(TQTDIR)/lib -L/usr/X11R6/lib -lqt -lX11 -lXext -o foo noinst_HEADERS = viewcombos.h navigator.h diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp index 47d0baff..8ce7ee06 100644 --- a/parts/documentation/plugins/qt/docqtplugin.cpp +++ b/parts/documentation/plugins/qt/docqtplugin.cpp @@ -149,7 +149,7 @@ void DocQtPlugin::autoSetupPlugin() qtDocDir = URLUtil::envExpand(qtDocDir); if (qtDocDir.isEmpty()) { - qtDocDir = getenv("QTDIR"); + qtDocDir = getenv("TQTDIR"); } if (!qtDocDir.isEmpty()) { |