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>
pull/1/head
Michele Calgaro 1 year 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
A: There are two things you should check:
1. It may be that the Qt header files are not installed. If this is true,
install them and run the configure script again.
2. The QTDIR environment variable might not be set properly or at all.
2. The TQTDIR environment variable might not be set properly or at all.
Check for the following line in your ~/.bashrc file

export QTDIR=PREFIX
export TQTDIR=PREFIX

and add it, if it is not present. Replace PREFIX with the prefix of your
Qt installation. Run
@@ -95,7 +95,7 @@ A: There are two things you should check:

from the shell. Now, you're set for a second configuration attempt.

If the header files are installed and the QTDIR variable is set, but you
If the header files are installed and the TQTDIR variable is set, but you
still get the same error, you might want to try to pass the
'--with-qt-includes=/path/to/header/files' option to the configure script.


+ 9
- 9
acinclude.m4 View File

@@ -296,7 +296,7 @@ EOT

dnl ------------------------------------------------------------------------
dnl Find the meta object compiler and the ui compiler in the PATH,
dnl in $QTDIR/bin, and some more usual places
dnl in $TQTDIR/bin, and some more usual places
dnl ------------------------------------------------------------------------
dnl
AC_DEFUN([AC_PATH_TQT_MOC_UIC],
@@ -1223,16 +1223,16 @@ else
fi

if test $kde_qtver = 4; then
kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
kde_qt_dirs="$TQTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
kde_qt_dirs="$TQTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
fi
if test $kde_qtver = 2; then
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
kde_qt_dirs="$TQTDIR /usr/lib/qt2 /usr/lib/qt"
fi
if test $kde_qtver = 1; then
kde_qt_dirs="$QTDIR /usr/lib/qt"
kde_qt_dirs="$TQTDIR /usr/lib/qt"
fi
])

@@ -5533,10 +5533,10 @@ if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
fi

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)
AC_MSG_RESULT($QTDOCDIR)
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)
AC_MSG_RESULT($TQTDOCDIR)

AC_SUBST(QTDOCDIR)
AC_SUBST(TQTDOCDIR)

KDE_FIND_PATH(dot, DOT, [], [])
if test -n "$DOT"; then
@@ -5554,7 +5554,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
AC_SUBST(DOXYGEN_PROJECT_NUMBER)

KDE_HAS_DOXYGEN=no
if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/qsql.html; then
KDE_HAS_DOXYGEN=yes
fi
AC_SUBST(KDE_HAS_DOXYGEN)

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

@@ -4928,14 +4928,14 @@ in the meantime.</para>
<para><emphasis role="bold">Solution:</emphasis> There are two things that should check:</para>
<itemizedlist>
<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>
<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>
<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>
<para>If you are using the bash, check for the following line in your <filename>~/.bashrc</filename> file</para>
<screen>export QTDIR=PREFIX</screen>
<screen>export TQTDIR=PREFIX</screen>
<para>and add it, if it is not present. Replace PREFIX with the prefix of your Qt installation. Run</para>
<screen><prompt>$</prompt> <userinput><command>source</command> ~/.bashrc</userinput></screen>
<para>from the shell. Now, you're set for a second configuration attempt.</para></listitem>
</itemizedlist>
<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>
<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>
</listitem>

<listitem id="trouble_shooting_no_kde">

Loading…
Cancel
Save