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 <[email protected]>

12 files changed, 13 insertions, 13 deletions

diff --git a/dcopperl/Makefile.PL b/dcopperl/Makefile.PL
index fbd26f0a..af1a3d14 100644
--- a/dcopperl/Makefile.PL
+++ b/dcopperl/Makefile.PL
@@ -5,7 +5,7 @@ use Config;
 
 print "Trying to find some configuration information...\n";
 my $tde_dirs = $ENV{TDEDIRS} || '/opt/trinity';
-my $qt_dir = $ENV{QTDIR} || '/opt/trinity/lib';
+my $qt_dir = $ENV{TQTDIR} || '/opt/trinity/lib';
 my $tde_inc = "$tde_dirs/include";
 my $tde_lib = "$tde_dirs/lib";
 my $qt_inc = "$qt_dir/include";
diff --git a/kalyptus/kalyptus.spec.in b/kalyptus/kalyptus.spec.in
index 1c270ec9..6fdf86fb 100644
--- a/kalyptus/kalyptus.spec.in
+++ b/kalyptus/kalyptus.spec.in
@@ -24,7 +24,7 @@ rm -rf $RPM_BUILD_ROOT
 make -f Makefile.cvs
 
 %build
-export TDEDIR=%{prefix} QTDIR=%{qtdir}
+export TDEDIR=%{prefix} TQTDIR=%{qtdir}
 CXXFLAGS="$RPM_OPT_FLAGS -I%{prefix}/include/tde" ./configure \
 	--prefix=%{prefix}
 make CXXFLAGS="$RPM_OPT_FLAGS -DNO_DEBUG -DNDEBUG"
diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am
index a2743ae8..5959b552 100644
--- a/kjsembed/Makefile.am
+++ b/kjsembed/Makefile.am
@@ -2,7 +2,7 @@
 AM_CXXFLAGS = -frtti
 
 # Make sure the include path includes Qt's uilib
-INCLUDES = -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/.. $(all_includes)
+INCLUDES = -I$(TQTDIR)/tools/designer/uilib -I$(srcdir)/.. $(all_includes)
 
 INCLUDES += -DQT_NO_ASCII_CAST
 
diff --git a/kjsembed/cpptests/jsaccess/Makefile.am b/kjsembed/cpptests/jsaccess/Makefile.am
index 3dee5ff9..9a3c15d3 100644
--- a/kjsembed/cpptests/jsaccess/Makefile.am
+++ b/kjsembed/cpptests/jsaccess/Makefile.am
@@ -1,7 +1,7 @@
 # -*- makefile -*-
 
 # Make sure the include path includes Qt's uilib
-INCLUDES = -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/../../../.. -I.. -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(TQTDIR)/tools/designer/uilib -I$(srcdir)/../../../.. -I.. -I$(top_srcdir) $(all_includes)
 
 INCLUDES += -DQT_NO_ASCII_CAST
 
diff --git a/kjsembed/plugin/Makefile.am b/kjsembed/plugin/Makefile.am
index 2a75ff87..d55101ba 100644
--- a/kjsembed/plugin/Makefile.am
+++ b/kjsembed/plugin/Makefile.am
@@ -1,7 +1,7 @@
 # -*- makefile -*-
 
 # Make sure the include path includes Qt's uilib
-INCLUDES= -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/.. -I.. -I$(top_srcdir) $(all_includes)
+INCLUDES= -I$(TQTDIR)/tools/designer/uilib -I$(srcdir)/.. -I.. -I$(top_srcdir) $(all_includes)
 
 INCLUDES += -DQT_NO_ASCII_CAST
 
diff --git a/kjsembed/qjsembed.nsi b/kjsembed/qjsembed.nsi
index ca265461..10b07e43 100644
--- a/kjsembed/qjsembed.nsi
+++ b/kjsembed/qjsembed.nsi
@@ -99,7 +99,7 @@ Section "${APP_NAME} Runtime" secRuntime
   File qjscmd\qjscmd.exe

   File qjscmdw\qjscmdw.exe

   File stdlib\cmdline.js

-  File "$%QTDIR%\bin\tqt-mt*.dll"

+  File "$%TQTDIR%\bin\tqt-mt*.dll"

 SectionEnd

 

 Section "${APP_NAME} Source" secSrc

diff --git a/qtjava/javalib/examples/helpviewer/Main.java b/qtjava/javalib/examples/helpviewer/Main.java
index 65deaff7..492ca36d 100644
--- a/qtjava/javalib/examples/helpviewer/Main.java
+++ b/qtjava/javalib/examples/helpviewer/Main.java
@@ -21,7 +21,7 @@ public static void main( String[] args )
     if (args.length > 0)
         home = args[0];
 //    else
-//        home = System.getenv("QTDIR") + "/doc/html/index.html";
+//        home = System.getenv("TQTDIR") + "/doc/html/index.html";
 
     
     HelpWindow help = new HelpWindow(home, ".", null, "help viewer");
diff --git a/qtsharp/TODO b/qtsharp/TODO
index 438dd3b4..0571785e 100644
--- a/qtsharp/TODO
+++ b/qtsharp/TODO
@@ -47,7 +47,7 @@ o Some TQGL* classes
 ** Build Environment todo
 
 o Write better library detection macros for autoconf.
-o Use QTDIR when searching for Qt stuff.
+o Use TQTDIR when searching for Qt stuff.
 o See if thre's a way to use LD_LIBRARY_PATH when hunting for libraries.
 o Set up cvsignore files.
 o Organize Qt.dll Makefile stuffs - maybe use external targets for building
diff --git a/smoke/tde/generate.pl.in b/smoke/tde/generate.pl.in
index 894ef635..eb224025 100644
--- a/smoke/tde/generate.pl.in
+++ b/smoke/tde/generate.pl.in
@@ -73,7 +73,7 @@ my %excludes = (
     'ntqwindowsxpstyle.h' => 1 # play on the safe side 
 );
 
-# Some systems have a QTDIR = TDEDIR = PREFIX
+# Some systems have a TQTDIR = TDEDIR = PREFIX
 # We need a complete list
 
 my %includes;
@@ -117,7 +117,7 @@ my %kdeexcludes = (
 	'knotifywidgetbase.h' => 1,
 );
 
-# Some systems have a QTDIR = TDEDIR = PREFIX
+# Some systems have a TQTDIR = TDEDIR = PREFIX
 # We need a complete list
 
 my %kdeincludes;
diff --git a/smoke/tde/hint_header_list.pl b/smoke/tde/hint_header_list.pl
index ff9c86b7..efc0c544 100644
--- a/smoke/tde/hint_header_list.pl
+++ b/smoke/tde/hint_header_list.pl
@@ -3,7 +3,7 @@
 #             the actual content of header_list
 
 $l = "header_list";
-$q = $ENV{'QTDIR'} || die "QTDIR not set\n";
+$q = $ENV{'TQTDIR'} || die "TQTDIR not set\n";
 @h = <$q/include/*.h>;
 grep s|.*/(.*\.h)|$1|, @h;
 open(IN, $l) or die "$!: $l\n";
diff --git a/smoke/tqt/generate.pl.in b/smoke/tqt/generate.pl.in
index 3b8ba05b..49b41b9a 100644
--- a/smoke/tqt/generate.pl.in
+++ b/smoke/tqt/generate.pl.in
@@ -80,7 +80,7 @@ my %excludes = (
     'ntqwindowsxpstyle.h' => 1 # play on the safe side 
 );
 
-# Some systems have a QTDIR = TDEDIR = PREFIX
+# Some systems have a TQTDIR = TDEDIR = PREFIX
 # We need a complete list
 
 my %includes;
diff --git a/smoke/tqt/hint_header_list.pl b/smoke/tqt/hint_header_list.pl
index ff9c86b7..efc0c544 100644
--- a/smoke/tqt/hint_header_list.pl
+++ b/smoke/tqt/hint_header_list.pl
@@ -3,7 +3,7 @@
 #             the actual content of header_list
 
 $l = "header_list";
-$q = $ENV{'QTDIR'} || die "QTDIR not set\n";
+$q = $ENV{'TQTDIR'} || die "TQTDIR not set\n";
 @h = <$q/include/*.h>;
 grep s|.*/(.*\.h)|$1|, @h;
 open(IN, $l) or die "$!: $l\n";