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
2518c29202
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF

+ 5
- 5
COMPILING.html View File

@@ -47,13 +47,13 @@ source. Qt libs then end up in /usr/local/lib/qt3/lib.
47 47
 <p>On systems that respond to environment variables something similar to the 
48 48
 following is appropriate:
49 49
 
50
-<p>export LD_LIBRARY_PATH=$TDEDIR/lib:$QTDIR/lib
50
+<p>export LD_LIBRARY_PATH=$TDEDIR/lib:$TQTDIR/lib
51 51
 
52 52
 <p>On systems whose diety of choice is ldconfig, try:
53 53
 <pre>ldconfig -m $TDEDIR/lib
54
-ldconfig -m $QTDIR/lib</pre>
54
+ldconfig -m $TQTDIR/lib</pre>
55 55
 
56
-<p>You probably also want to add $TDEDIR/bin and $QTDIR/bin to your path.
56
+<p>You probably also want to add $TDEDIR/bin and $TQTDIR/bin to your path.
57 57
 
58 58
 <p>See http://www.kde.org/kde2-and-trinity.html for tips about setting up
59 59
 KDE 3.0 next to KDE 2.x.
@@ -92,7 +92,7 @@ make</pre>
92 92
 especially if your system has more version of Qt installed. Be aware 
93 93
 that information about library paths gets saved in the "config.cache" 
94 94
 file, "Makefile.in" as well as "Makefile" files. So it can be that after 
95
-some struggle to get QTDIR/TDEDIR setup correctly your setup is actually 
95
+some struggle to get TQTDIR/TDEDIR setup correctly your setup is actually 
96 96
 correct, but old -incorrect- settings are still lying around.
97 97
 
98 98
 <p>The best thing to do in such a case is to do a "make cvs-clean". This 
@@ -109,7 +109,7 @@ files lying around in your source tree any more, they will be deleted!
109 109
 Do a "make cvs-clean" and start from scratch, usually this solves the problem.
110 110
 
111 111
 <p>If you encounter missing include files, especially if the files start with
112
-a 'q', you probably have not setup your QTDIR correct or have the wrong 
112
+a 'q', you probably have not setup your TQTDIR correct or have the wrong 
113 113
 version of Qt.
114 114
 
115 115
 <p>If you encounter compile errors after updating from CVS, check whether you 

+ 2
- 2
Makefile.am.in View File

@@ -71,7 +71,7 @@ dist-hook:
71 71
 	cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin
72 72
 
73 73
 # Rule for generating HTML documentation [you need kdoc installed]
74
-# Don't forget to run qt2kdoc first (qt2kdoc $QTDIR/doc/html)
74
+# Don't forget to run qt2kdoc first (qt2kdoc $TQTDIR/doc/html)
75 75
 # The tdelibs docu will end up in ./srcdoc/
76 76
 kdedoc:
77 77
 	cd $(top_srcdir) && \
@@ -101,7 +101,7 @@ apidox-am-toplevel-tdelibs: $(top_builddir)/apidocs/qt/qt.tag
101 101
 $(top_builddir)/apidocs/qt/qt.tag:
102 102
 	@echo "*** Creating a tag file for the Qt library:"; \
103 103
 	$(mkinstalldirs) $(top_builddir)/apidocs/qt; \
104
-	doxytag -t $(top_builddir)/apidocs/qt/qt.tag $(QTDOCDIR)
104
+	doxytag -t $(top_builddir)/apidocs/qt/qt.tag $(TQTDOCDIR)
105 105
 
106 106
 install-data-local: install-apidox-tdelibs
107 107
 

+ 1
- 1
dcop/HOWTO View File

@@ -503,7 +503,7 @@ int main(int argc, char **argv)
503 503
 
504 504
 Compiled with:
505 505
 
506
-g++ -O2 -o testit testit.cpp -I$QTDIR/include -L$QTDIR/lib -ltdecore
506
+g++ -O2 -o testit testit.cpp -I$TQTDIR/include -L$TQTDIR/lib -ltdecore
507 507
 
508 508
 on Linux yields the following memory use statistics:
509 509
 

+ 2
- 2
dcop/testdcop.h View File

@@ -35,8 +35,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
35 35
 
36 36
 #include <stdio.h>
37 37
 /**
38
- $QTDIR/bin/moc testdcop.cpp -o testdcop.moc
39
- g++ -o testdcop testdcop.cpp -I$QTDIR/include -L$QTDIR/lib
38
+ $TQTDIR/bin/moc testdcop.cpp -o testdcop.moc
39
+ g++ -o testdcop testdcop.cpp -I$TQTDIR/include -L$TQTDIR/lib
40 40
  @internal
41 41
 
42 42
 **/

+ 4
- 4
doc/common/README.Doxygen View File

@@ -85,12 +85,12 @@ Differences with current dox: <TODO>
85 85
 # sh /mnt/src/tdepim/doc/api/doxygen.sh /mnt/src/tdepim kpilot/lib
86 86
 # 
87 87
 # When generating dox for tdelibs, a tag file for Qt is also created.
88
-# The location of Qt is specified indirectly through $QTDOCDIR or,
89
-# if that is not set, $QTDIR, or otherwise guessed. You may explicitly
90
-# set the location of a pre-generated tag file with $QTDOCTAG. One
88
+# The location of Qt is specified indirectly through $TQTDOCDIR or,
89
+# if that is not set, $TQTDIR, or otherwise guessed. You may explicitly
90
+# set the location of a pre-generated tag file with $TQTDOCTAG. One
91 91
 # typical approach might be:
92 92
 #
93
-# QTDOCTAG=$QTDIR/doc/qt.tag QTDOCDIR=http://doc.trolltech.com/3.3/
93
+# TQTDOCTAG=$TQTDIR/doc/qt.tag TQTDOCDIR=http://doc.trolltech.com/3.3/
94 94
 #
95 95
 # Finally, there is a --no-recurse option for top-level generation
96 96
 # that avoids generating all the subdirectories as well. It also

+ 3
- 3
tdeio/tests/kurifiltertest.cpp View File

@@ -288,14 +288,14 @@ int main(int argc, char **argv)
288 288
     setenv( "SOMEVAR", "/somevar", 0 );
289 289
     setenv( "ETC", "/etc", 0 );
290 290
 
291
-    TQCString qtdir=getenv("QTDIR");
291
+    TQCString qtdir=getenv("TQTDIR");
292 292
     TQCString home = getenv("HOME");
293 293
     TQCString tdehome = getenv("TDEHOME");
294 294
 
295 295
     filter( "$SOMEVAR/tdelibs/tdeio", 0, KURIFilterData::ERROR ); // note: this dir doesn't exist...
296 296
     filter( "$ETC/passwd", "/etc/passwd", KURIFilterData::LOCAL_FILE );
297 297
     if( !qtdir.isEmpty() ) {
298
-        filter( "$QTDIR/doc/html/functions.html#s", TQCString("file://")+qtdir+"/doc/html/functions.html#s", KURIFilterData::LOCAL_FILE );
298
+        filter( "$TQTDIR/doc/html/functions.html#s", TQCString("file://")+qtdir+"/doc/html/functions.html#s", KURIFilterData::LOCAL_FILE );
299 299
     }
300 300
     filter( "http://www.kde.org/$USER", "http://www.kde.org/$USER", KURIFilterData::NET_PROTOCOL ); // no expansion
301 301
 
@@ -336,7 +336,7 @@ int main(int argc, char **argv)
336 336
     // itself if the requested environment variable
337 337
     // is not already set.
338 338
     if( !qtdir.isEmpty() ) {
339
-        filter( "$QTDIR", 0, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter.
339
+        filter( "$TQTDIR", 0, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter.
340 340
     }
341 341
     filter( "$HOME", home, KURIFilterData::LOCAL_DIR, "tdeshorturifilter" ); //use specific filter.
342 342
 

+ 1
- 1
tdeprint/tests/main.cpp View File

@@ -23,7 +23,7 @@ int main( int argc, char ** argv )
23 23
     if (argc > 1)
24 24
         home = argv[1];
25 25
     else
26
-        home = TQString(getenv("QTDIR")) + "/doc/html/index.html";
26
+        home = TQString(getenv("TQTDIR")) + "/doc/html/index.html";
27 27
 
28 28
     
29 29
     HelpWindow *help = new HelpWindow(home, ".", 0, "help viewer");

+ 1
- 1
win/tools/build_tdelibs_dbg View File

@@ -73,7 +73,7 @@ qmake maketdewidgets.pro && $make clean && $make || exit 1
73 73
 qmake && $make clean && $make || exit 1
74 74
 
75 75
 # copy tdewidgets plugin for Qt Designer
76
-cp $TDEDIR/lib/trinity/plugins/designer/tdewidgets.dll $QTDIR/plugins/designer/
76
+cp $TDEDIR/lib/trinity/plugins/designer/tdewidgets.dll $TQTDIR/plugins/designer/
77 77
 
78 78
 cd $pwd
79 79
 

+ 1
- 1
win/zlib.pro View File

@@ -6,5 +6,5 @@ exists( $(KDELIBS)/win/3rdparty/zlib/zlib.h ) {
6 6
 	LIBS += $$KDELIBDESTDIR\zdll.lib
7 7
 }
8 8
 !exists( $(KDELIBS)/win/3rdparty/zlib/zlib.h ) {
9
-	INCLUDEPATH += $(QTDIR)/src/3rdparty/zlib
9
+	INCLUDEPATH += $(TQTDIR)/src/3rdparty/zlib
10 10
 }

Loading…
Cancel
Save