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
00d1f4f9d1
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
3 changed files with 15 additions and 15 deletions
  1. 3
    3
      FAQ
  2. 9
    9
      acinclude.m4
  3. 3
    3
      doc/en/index.docbook

+ 3
- 3
FAQ View File

@@ -83,10 +83,10 @@ Q:  The configure script fails and tells me, it can't find my Qt
83 83
 A:  There are two things you should check:
84 84
     1. It may be that the Qt header files are not installed. If this is true,
85 85
        install them and run the configure script again.
86
-    2. The QTDIR environment variable might not be set properly or at all.
86
+    2. The TQTDIR environment variable might not be set properly or at all.
87 87
        Check for the following line in your ~/.bashrc file
88 88
 
89
-       export QTDIR=PREFIX
89
+       export TQTDIR=PREFIX
90 90
 
91 91
        and add it, if it is not present. Replace PREFIX with the prefix of your
92 92
        Qt installation. Run
@@ -95,7 +95,7 @@ A:  There are two things you should check:
95 95
 
96 96
        from the shell. Now, you're set for a second configuration attempt.
97 97
 
98
-     If the header files are installed and the QTDIR variable is set, but you
98
+     If the header files are installed and the TQTDIR variable is set, but you
99 99
      still get the same error, you might want to try to pass the
100 100
      '--with-qt-includes=/path/to/header/files' option to the configure script.
101 101
 

+ 9
- 9
acinclude.m4 View File

@@ -296,7 +296,7 @@ EOT
296 296
 
297 297
 dnl ------------------------------------------------------------------------
298 298
 dnl Find the meta object compiler and the ui compiler in the PATH,
299
-dnl in $QTDIR/bin, and some more usual places
299
+dnl in $TQTDIR/bin, and some more usual places
300 300
 dnl ------------------------------------------------------------------------
301 301
 dnl
302 302
 AC_DEFUN([AC_PATH_TQT_MOC_UIC],
@@ -1223,16 +1223,16 @@ else
1223 1223
 fi
1224 1224
 
1225 1225
 if test $kde_qtver = 4; then
1226
-  kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
1226
+  kde_qt_dirs="$TQTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
1227 1227
 fi
1228 1228
 if test $kde_qtver = 3; then
1229
-  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
1229
+  kde_qt_dirs="$TQTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
1230 1230
 fi
1231 1231
 if test $kde_qtver = 2; then
1232
-   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
1232
+   kde_qt_dirs="$TQTDIR /usr/lib/qt2 /usr/lib/qt"
1233 1233
 fi
1234 1234
 if test $kde_qtver = 1; then
1235
-   kde_qt_dirs="$QTDIR /usr/lib/qt"
1235
+   kde_qt_dirs="$TQTDIR /usr/lib/qt"
1236 1236
 fi
1237 1237
 ])
1238 1238
 
@@ -5533,10 +5533,10 @@ if test "${with_qt_dir+set}" = set; then
5533 5533
   kde_qtdir="$with_qt_dir"
5534 5534
 fi
5535 5535
 
5536
-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
5537
-AC_MSG_RESULT($QTDOCDIR)
5536
+AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], TQTDOCDIR)
5537
+AC_MSG_RESULT($TQTDOCDIR)
5538 5538
 
5539
-AC_SUBST(QTDOCDIR)
5539
+AC_SUBST(TQTDOCDIR)
5540 5540
 
5541 5541
 KDE_FIND_PATH(dot, DOT, [], [])
5542 5542
 if test -n "$DOT"; then
@@ -5554,7 +5554,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
5554 5554
 AC_SUBST(DOXYGEN_PROJECT_NUMBER)
5555 5555
 
5556 5556
 KDE_HAS_DOXYGEN=no
5557
-if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
5557
+if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/qsql.html; then
5558 5558
   KDE_HAS_DOXYGEN=yes
5559 5559
 fi
5560 5560
 AC_SUBST(KDE_HAS_DOXYGEN)

+ 3
- 3
doc/en/index.docbook View File

@@ -4928,14 +4928,14 @@ in the meantime.</para>
4928 4928
 <para><emphasis role="bold">Solution:</emphasis> There are two things that should check:</para>
4929 4929
 <itemizedlist>
4930 4930
 <listitem><para>Maybe the Qt header files are not installed. If this is the case, install them and run the configure script again.</para></listitem>
4931
-<listitem><para>The <envar>QTDIR</envar> environment variable might not be set properly or at all. Make sure you export it in your shell's configuration file.</para>
4931
+<listitem><para>The <envar>TQTDIR</envar> environment variable might not be set properly or at all. Make sure you export it in your shell's configuration file.</para>
4932 4932
 <para>If you are using the bash, check for the following line in your <filename>~/.bashrc</filename> file</para>
4933
-<screen>export QTDIR=PREFIX</screen>
4933
+<screen>export TQTDIR=PREFIX</screen>
4934 4934
 <para>and add it, if it is not present. Replace PREFIX with the prefix of your Qt installation. Run</para>
4935 4935
 <screen><prompt>$</prompt> <userinput><command>source</command> ~/.bashrc</userinput></screen>
4936 4936
 <para>from the shell. Now, you're set for a second configuration attempt.</para></listitem>
4937 4937
 </itemizedlist>
4938
-<para>If the header files are installed and the <envar>QTDIR</envar> variable is set, but you still get the same error, you might want to try to pass the <option>--with-qt-includes=/path/to/header/files</option> option to the configure script.</para>
4938
+<para>If the header files are installed and the <envar>TQTDIR</envar> variable is set, but you still get the same error, you might want to try to pass the <option>--with-qt-includes=/path/to/header/files</option> option to the configure script.</para>
4939 4939
 </listitem>
4940 4940
 
4941 4941
 <listitem id="trouble_shooting_no_kde">

Loading…
Cancel
Save