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 5 months ago
parent
commit
4177b104fd
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
4 changed files with 30 additions and 30 deletions
  1. 10
    10
      INSTALL
  2. 12
    12
      acinclude.m4
  3. 7
    7
      doc/INSTALL-MacOS.txt
  4. 1
    1
      doc/win32.compiling.1.2.txt

+ 10
- 10
INSTALL View File

@@ -49,7 +49,7 @@ General notes for the installation of the 3.4.0 release of KVIrc
49 49
     If you're compiling the svn version of KVirc run ./autogen.sh
50 50
     (You NEED automake >= 1.5 for autogen.sh to run).
51 51
 
52
-    # export QTDIR="your tqtlibrary path"
52
+    # export TQTDIR="your tqtlibrary path"
53 53
 
54 54
     eventually:
55 55
 
@@ -259,16 +259,16 @@ General notes for the installation of the 3.4.0 release of KVIrc
259 259
         script tries to be smart , but in some cases it will fail.
260 260
 
261 261
         So before running the script make sure that the enviroinement
262
-        variable $QTDIR points to the right location. This will help
262
+        variable $TQTDIR points to the right location. This will help
263 263
         in finding the correct version of Qt.
264 264
         You might eventually set it with the command:
265 265
 
266
-        # export QTDIR="your qt dir"
266
+        # export TQTDIR="your qt dir"
267 267
 
268 268
         On my system qt is installed in /usr/local/kde/qt
269 269
         so I actually execute
270 270
 
271
-        # export QTDIR="/usr/local/kde/qt"
271
+        # export TQTDIR="/usr/local/kde/qt"
272 272
 
273 273
         If you want to compile the KDE support you might want to do the same
274 274
         with TDEDIR
@@ -303,7 +303,7 @@ General notes for the installation of the 3.4.0 release of KVIrc
303 303
             Look for the qt library in <DIR>.
304 304
             You might want to use this if the configure script has trouble
305 305
             in finding the qt library.
306
-            You should have no problems if you use export QTDIR="<DIR>"
306
+            You should have no problems if you use export TQTDIR="<DIR>"
307 307
             before launching the configure script, but it might help you
308 308
             if you have a non standard Qt installation.
309 309
         
@@ -311,15 +311,15 @@ General notes for the installation of the 3.4.0 release of KVIrc
311 311
             Look for the qt headers in <DIR>.
312 312
             You might want to use this if the configure script has trouble
313 313
             in finding the qt headers. It may especially help if your headers
314
-            are in a place different than $QTDIR/include (and thus you have
314
+            are in a place different than $TQTDIR/include (and thus you have
315 315
             a non standard installation)
316 316
          
317 317
         --with-qt-moc=<PATH>
318 318
             Use the qt meta-object compiler found in <PATH>
319
-            The path is usually $QTDIR/bin/moc , and the
319
+            The path is usually $TQTDIR/bin/moc , and the
320 320
             configure script will find it if you have a standard
321
-            Qt installation and $QTDIR points to the right directory.
322
-            Thus should have no problems if you use export QTDIR="<DIR>"
321
+            Qt installation and $TQTDIR points to the right directory.
322
+            Thus should have no problems if you use export TQTDIR="<DIR>"
323 323
             before launching the configure script, but it might help you
324 324
             if you have a non standard Qt installation.
325 325
             This will also help if you have the moc compiler renamed
@@ -709,7 +709,7 @@ General notes for the installation of the 3.4.0 release of KVIrc
709 709
 
710 710
     6. switch to a console
711 711
 
712
-    7. export QTDIR=[path] On Debian is '/usr'
712
+    7. export TQTDIR=[path] On Debian is '/usr'
713 713
 
714 714
     8. Read http://doc.trolltech.com/3.0/envvars.html and configure your
715 715
        environment vars until kvirc3-emb loads (it will give you an error

+ 12
- 12
acinclude.m4 View File

@@ -1502,8 +1502,8 @@ AC_DEFUN([AC_SS_FIND_QT3_GENERAL_DIR],
1502 1502
 		ss_qt_general_test_dirs="$ss_qt_general_test_dirs $HOME $HOME/lib"
1503 1503
 	fi
1504 1504
 
1505
-	if test -n "$QTDIR"; then
1506
-		ss_qt_general_test_dirs="$QTDIR $ss_qt_general_test_dirs"
1505
+	if test -n "$TQTDIR"; then
1506
+		ss_qt_general_test_dirs="$TQTDIR $ss_qt_general_test_dirs"
1507 1507
 	fi
1508 1508
 
1509 1509
 	ss_qt_general_test_path_suffix="qt$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED"
@@ -1547,8 +1547,8 @@ AC_DEFUN([AC_SS_FIND_QT4_GENERAL_DIR],
1547 1547
 		ss_qt_general_test_dirs="$ss_qt_general_test_dirs $HOME $HOME/lib"
1548 1548
 	fi
1549 1549
 
1550
-	if test -n "$QTDIR"; then
1551
-		ss_qt_general_test_dirs="$QTDIR $ss_qt_general_test_dirs"
1550
+	if test -n "$TQTDIR"; then
1551
+		ss_qt_general_test_dirs="$TQTDIR $ss_qt_general_test_dirs"
1552 1552
 	fi
1553 1553
 
1554 1554
 	ss_qt_general_test_path_suffix="qt$SS_QT4_MAJOR_VERSION_REQUIRED.$SS_QT4_MINOR_VERSION_REQUIRED.$SS_QT4_PATCH_LEVEL_REQUIRED"
@@ -1585,7 +1585,7 @@ AC_DEFUN([AC_SS_FIND_QT3_INCLUDE_DIR],
1585 1585
 		AC_MSG_CHECKING([for the Qt 3.x header files])
1586 1586
 
1587 1587
 		ss_qt_include_test_dirs="$SS_QT3_GENERAL_DIR/include /include /usr/include /usr/local/include /usr/qt/include /usr/local/qt/include /usr/X11R6/include /usr/lib/qt/include /usr/lib/qt /usr/include/X11"
1588
-		test -n "$QTDIR" && ss_qt_include_test_dirs="$QTDIR/include $QTDIR $ss_qt_include_test_dirs"
1588
+		test -n "$TQTDIR" && ss_qt_include_test_dirs="$TQTDIR/include $TQTDIR $ss_qt_include_test_dirs"
1589 1589
 		ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt /usr/include/tqt3 /usr/include/qt3 /usr/local/include/qt /include/qt /usr/X11R6/include/qt /usr/build/qt/include"
1590 1590
 		ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/tqt$SS_QT3_MAJOR_VERSION_REQUIRED /usr/include/qt$SS_QT3_MAJOR_VERSION_REQUIRED /usr/include/qt-$SS_QT3_MAJOR_VERSION_REQUIRED /usr/local/include/qt$SS_QT3_MAJOR_VERSION_REQUIRED"
1591 1591
 		ss_qt_include_test_dirs="$ss_qt_include_test_dirs /include/tqt$SS_QT3_MAJOR_VERSION_REQUIRED /include/qt$SS_QT3_MAJOR_VERSION_REQUIRED /usr/X11R6/include/qt$SS_QT3_MAJOR_VERSION_REQUIRED"
@@ -1602,7 +1602,7 @@ AC_DEFUN([AC_SS_FIND_QT3_INCLUDE_DIR],
1602 1602
 			dnl HACK HACK HACK
1603 1603
 
1604 1604
 			ss_qt_include_test_dirs="$SS_QT4_GENERAL_DIR/include /include /usr/include /usr/local/include /usr/qt/include /usr/include/qt4 /usr/qt4/include /usr/local/qt/include /usr/X11R6/include /usr/lib/qt/include /usr/lib/qt /usr/include/X11"
1605
-			test -n "$QTDIR" && ss_qt_include_test_dirs="$QTDIR/include $QTDIR $ss_qt_include_test_dirs"
1605
+			test -n "$TQTDIR" && ss_qt_include_test_dirs="$TQTDIR/include $TQTDIR $ss_qt_include_test_dirs"
1606 1606
 			ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt /usr/include/qt4 /usr/local/include/qt /include/qt /usr/X11R6/include/qt /usr/build/qt/include"
1607 1607
 			ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED /usr/include/qt-$SS_QT4_MAJOR_VERSION_REQUIRED /usr/local/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED"
1608 1608
 			ss_qt_include_test_dirs="$ss_qt_include_test_dirs /include/qt$SS_QT4_MAJOR_VERSION_REQUIRED /usr/X11R6/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED"
@@ -1652,7 +1652,7 @@ AC_DEFUN([AC_SS_FIND_QT4_INCLUDE_DIR],
1652 1652
 		AC_MSG_CHECKING([for the Qt 4.x header files])
1653 1653
 
1654 1654
 		ss_qt_include_test_dirs="$SS_QT4_GENERAL_DIR/include /include /usr/include /usr/local/include /usr/qt/include /usr/include/qt4 /usr/qt4/include /usr/local/qt/include /usr/X11R6/include /usr/lib/qt/include /usr/lib/qt /usr/include/X11"
1655
-		test -n "$QTDIR" && ss_qt_include_test_dirs="$QTDIR/include $QTDIR $ss_qt_include_test_dirs"
1655
+		test -n "$TQTDIR" && ss_qt_include_test_dirs="$TQTDIR/include $TQTDIR $ss_qt_include_test_dirs"
1656 1656
 		ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt /usr/include/qt4 /usr/local/include/qt /include/qt /usr/X11R6/include/qt /usr/build/qt/include"
1657 1657
 		ss_qt_include_test_dirs="$ss_qt_include_test_dirs /usr/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED /usr/include/qt-$SS_QT4_MAJOR_VERSION_REQUIRED /usr/local/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED"
1658 1658
 		ss_qt_include_test_dirs="$ss_qt_include_test_dirs /include/qt$SS_QT4_MAJOR_VERSION_REQUIRED /usr/X11R6/include/qt$SS_QT4_MAJOR_VERSION_REQUIRED"
@@ -1698,7 +1698,7 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
1698 1698
 		AC_MSG_CHECKING([for the Qt library])
1699 1699
 
1700 1700
 		ss_qt_library_test_dirs="$SS_QT3_GENERAL_DIR/lib /lib /usr/lib /usr/local/lib /usr/qt/lib /usr/local/qt/lib /usr/X11R6/lib /usr/lib/qt/lib /usr/lib/qt /usr/local/lib/qt/lib"
1701
-		test -n "$QTDIR" && ss_qt_library_test_dirs="$QTDIR/lib $QTDIR $ss_qt_library_test_dirs"
1701
+		test -n "$TQTDIR" && ss_qt_library_test_dirs="$TQTDIR/lib $TQTDIR $ss_qt_library_test_dirs"
1702 1702
 		ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/local/lib/qt /usr/X11R6/lib/qt /usr/build/qt/lib /opt/lib /opt/qt/lib"
1703 1703
 
1704 1704
 		ss_qt_libs_to_find="lib$SS_TQTLIB_NAME-mt.so.$SS_QT3_MAJOR_VERSION_REQUIRED.$SS_QT3_MINOR_VERSION_REQUIRED.$SS_QT3_PATCH_LEVEL_REQUIRED"
@@ -1729,7 +1729,7 @@ AC_DEFUN([AC_SS_FIND_QT3_LIBRARY_DIR],
1729 1729
 			AC_MSG_CHECKING([for the Qt 4.x libraries])
1730 1730
 
1731 1731
 			ss_qt_library_test_dirs="$SS_QT4_GENERAL_DIR/lib /lib /usr/lib /usr/local/lib /usr/qt/lib /usr/local/qt/lib /usr/X11R6/lib /usr/lib/qt/lib /usr/lib/qt /usr/local/lib/qt/lib"
1732
-			test -n "$QTDIR" && ss_qt_library_test_dirs="$QTDIR/lib $QTDIR $ss_qt_library_test_dirs"
1732
+			test -n "$TQTDIR" && ss_qt_library_test_dirs="$TQTDIR/lib $TQTDIR $ss_qt_library_test_dirs"
1733 1733
 			ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/local/lib/qt /usr/X11R6/lib/qt /usr/build/qt/lib /opt/lib /opt/qt/lib"
1734 1734
 			ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/lib/qt4 /usr/local/lib/qt4 /usr/X11R6/lib/qt4"
1735 1735
 			ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/build/qt4/lib /opt/qt4/lib"
@@ -1784,7 +1784,7 @@ AC_DEFUN([AC_SS_FIND_QT4_LIBRARY_DIR],
1784 1784
 		AC_MSG_CHECKING([for the Qt 4.x libraries])
1785 1785
 
1786 1786
 		ss_qt_library_test_dirs="$SS_QT4_GENERAL_DIR/lib /lib /usr/lib /usr/local/lib /usr/qt/lib /usr/local/qt/lib /usr/X11R6/lib /usr/lib/qt/lib /usr/lib/qt /usr/local/lib/qt/lib"
1787
-		test -n "$QTDIR" && ss_qt_library_test_dirs="$QTDIR/lib $QTDIR $ss_qt_library_test_dirs"
1787
+		test -n "$TQTDIR" && ss_qt_library_test_dirs="$TQTDIR/lib $TQTDIR $ss_qt_library_test_dirs"
1788 1788
 		ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/local/lib/qt /usr/X11R6/lib/qt /usr/build/qt/lib /opt/lib /opt/qt/lib"
1789 1789
 		ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/lib/qt4 /usr/local/lib/qt4 /usr/X11R6/lib/qt4"
1790 1790
 		ss_qt_library_test_dirs="$ss_qt_library_test_dirs /usr/build/qt4/lib /opt/qt4/lib"
@@ -1837,7 +1837,7 @@ AC_DEFUN([AC_SS_FIND_QT3_MOC],
1837 1837
 		AC_MSG_CHECKING([for the Qt 3.x tmoc])
1838 1838
 
1839 1839
  		unset SS_QT3_MOC
1840
-		ss_moc_test_dirs="$QTDIR/bin $PATH /usr/bin /bin /usr/local/bin /usr/X11R6/bin /usr/lib/qt/bin /usr/local/qt/bin /usr/X11R6/qt/bin /usr/qt/bin /usr/build/qt/bin"
1840
+		ss_moc_test_dirs="$TQTDIR/bin $PATH /usr/bin /bin /usr/local/bin /usr/X11R6/bin /usr/lib/qt/bin /usr/local/qt/bin /usr/X11R6/qt/bin /usr/qt/bin /usr/build/qt/bin"
1841 1841
 		if test -n "$SS_QT3_GENERAL_DIR"; then
1842 1842
 			ss_moc_test_dirs="$SS_QT3_GENERAL_DIR/bin $ss_moc_test_dirs"
1843 1843
 		fi
@@ -1881,7 +1881,7 @@ AC_DEFUN([AC_SS_FIND_QT4_MOC],
1881 1881
 		AC_MSG_CHECKING([for the Qt 4.x moc])
1882 1882
 
1883 1883
  		unset SS_QT4_MOC
1884
-		ss_moc_test_dirs="$QTDIR/bin $PATH /usr/bin /bin /usr/local/bin /usr/X11R6/bin /usr/lib/qt/bin /usr/local/qt/bin /usr/X11R6/qt/bin /usr/qt/bin /usr/build/qt/bin"
1884
+		ss_moc_test_dirs="$TQTDIR/bin $PATH /usr/bin /bin /usr/local/bin /usr/X11R6/bin /usr/lib/qt/bin /usr/local/qt/bin /usr/X11R6/qt/bin /usr/qt/bin /usr/build/qt/bin"
1885 1885
 		if test -n "$SS_QT4_GENERAL_DIR"; then
1886 1886
 			ss_moc_test_dirs="$SS_QT4_GENERAL_DIR/bin $ss_moc_test_dirs"
1887 1887
 		fi

+ 7
- 7
doc/INSTALL-MacOS.txt View File

@@ -45,8 +45,8 @@ I used V3.3.4
45 45
 
46 46
 Add the following two lines to your ~/.profile file, otherwise the compilation if Qt may fail.
47 47
 
48
-export QTDIR=/Developer/qt-mac-free-3.3.4
49
-export DYLD_FALLBACK_LIBRARY_PATH=$QTDIR/lib
48
+export TQTDIR=/Developer/qt-mac-free-3.3.4
49
+export DYLD_FALLBACK_LIBRARY_PATH=$TQTDIR/lib
50 50
 
51 51
 
52 52
 Open a terminal window
@@ -102,9 +102,9 @@ Feel free to remove --enable-debug if you don't want to have a debuggable build
102 102
 
103 103
 3) Run make
104 104
 
105
-CAUTION!!! Because of a problem with libtool you have to remove or rename the file libtqt-mt.la (or libtqt.la if you compiled QT without threads). It is located in $QTDIR/lib/. Otherwise the compilation will stop with a link error.
105
+CAUTION!!! Because of a problem with libtool you have to remove or rename the file libtqt-mt.la (or libtqt.la if you compiled QT without threads). It is located in $TQTDIR/lib/. Otherwise the compilation will stop with a link error.
106 106
 
107
-# mv $QTDIR/lib/libtqt-mt.la $QTDIR/lib/libtqt-mt.la.bak
107
+# mv $TQTDIR/lib/libtqt-mt.la $TQTDIR/lib/libtqt-mt.la.bak
108 108
 
109 109
 Now run make and relax :-)
110 110
 
@@ -135,15 +135,15 @@ a) You don't want to include libtqt within the bundle
135 135
 
136 136
 Make sure the dynamic linker is able to find libtqt. The easiest way is to make symlinks in the /usr/lib directory.
137 137
 
138
-# ln -sf $QTDIR/lib/libtqt-mt.3.dylib /usr/lib
139
-# ln -sf $QTDIR/lib/libqui.1.dylib /usr/lib
138
+# ln -sf $TQTDIR/lib/libtqt-mt.3.dylib /usr/lib
139
+# ln -sf $TQTDIR/lib/libqui.1.dylib /usr/lib
140 140
 
141 141
 
142 142
 b) You want to include libtqt within the bundle
143 143
 
144 144
 Copy libtqt into the bundle:
145 145
 
146
-# cp $QTDIR/lib/libtqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/
146
+# cp $TQTDIR/lib/libtqt-mt.3.dylib $(pwd)/KVirc.app/Contents/Frameworks/
147 147
 
148 148
 Relinking commands for libtqt:
149 149
 

+ 1
- 1
doc/win32.compiling.1.2.txt View File

@@ -159,7 +159,7 @@ and/or extract the ready-to-use pakage wherever you may like (generally in folde
159 159
 Now we need to set up every variable of this ambiency, needed in order the compiler 
160 160
 will be able to find every library from which KVIrc depends. 
161 161
 Right-button on Resources then Properties -> Advanced -> Ambient Variables and this will 
162
-engage all QT system variables (QTDIR) set; if that doesn't match you will need to 
162
+engage all QT system variables (TQTDIR) set; if that doesn't match you will need to 
163 163
 reinstall QT and remember to answer YES once you're prompted for setting all ambiency 
164 164
 variables, otherwise you will need to set them manually – that parts from this tutorial. 
165 165
 

Loading…
Cancel
Save