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 6 years ago
parent 0b74ec0cfd
commit 33ac605687
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -296,7 +296,7 @@ EOT
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
dnl Find the meta object compiler and the ui compiler in the PATH, 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 ------------------------------------------------------------------------
dnl dnl
AC_DEFUN([AC_PATH_TQT_MOC_UIC], AC_DEFUN([AC_PATH_TQT_MOC_UIC],
@ -1223,16 +1223,16 @@ else
fi fi
if test $kde_qtver = 4; then 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 fi
if test $kde_qtver = 3; then 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 fi
if test $kde_qtver = 2; then 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 fi
if test $kde_qtver = 1; then if test $kde_qtver = 1; then
kde_qt_dirs="$QTDIR /usr/lib/qt" kde_qt_dirs="$TQTDIR /usr/lib/qt"
fi fi
]) ])
@ -5536,10 +5536,10 @@ if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir" kde_qtdir="$with_qt_dir"
fi 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_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($QTDOCDIR) AC_MSG_RESULT($TQTDOCDIR)
AC_SUBST(QTDOCDIR) AC_SUBST(TQTDOCDIR)
KDE_FIND_PATH(dot, DOT, [], []) KDE_FIND_PATH(dot, DOT, [], [])
if test -n "$DOT"; then if test -n "$DOT"; then
@ -5557,7 +5557,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
AC_SUBST(DOXYGEN_PROJECT_NUMBER) AC_SUBST(DOXYGEN_PROJECT_NUMBER)
KDE_HAS_DOXYGEN=no 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 KDE_HAS_DOXYGEN=yes
fi fi
AC_SUBST(KDE_HAS_DOXYGEN) AC_SUBST(KDE_HAS_DOXYGEN)
@ -12118,9 +12118,9 @@ AC_DEFUN([AC_SQLITE3], [
if test ! "lib${tdelibsuff}" = "lib"; then if test ! "lib${tdelibsuff}" = "lib"; then
tqtlib=".lib64" tqtlib=".lib64"
fi fi
if test x$QTDIR = x; then if test x$TQTDIR = x; then
QTDIR=`dirname $MOC` TQTDIR=`dirname $MOC`
QTDIR=${QTDIR%/bin} TQTDIR=${TQTDIR%/bin}
fi fi
if test "$PKG_CONFIG" != "no" ; then if test "$PKG_CONFIG" != "no" ; then
if $PKG_CONFIG --exists qt-mt ; then if $PKG_CONFIG --exists qt-mt ; then
@ -12132,7 +12132,7 @@ AC_DEFUN([AC_SQLITE3], [
fi fi
fi fi
if test "x$qt_plugins_dir" = "x"; then if test "x$qt_plugins_dir" = "x"; then
qt_plugins_dir=${QTDIR}/plugins qt_plugins_dir=${TQTDIR}/plugins
fi fi
LIBSQLITE3=${qt_plugins_dir}/sqldrivers/libqsqlite3${tqtlib}.so LIBSQLITE3=${qt_plugins_dir}/sqldrivers/libqsqlite3${tqtlib}.so
@ -12170,12 +12170,12 @@ AC_DEFUN([AC_SQLITE3], [
fi fi
if test $enable_sqlite3 = yes; then if test $enable_sqlite3 = yes; then
AC_MSG_CHECKING(if the environment variable QTDIR is set) AC_MSG_CHECKING(if the environment variable TQTDIR is set)
if test x$QTDIR = x; then if test x$TQTDIR = x; then
AC_MSG_ERROR(QTDIR not set) AC_MSG_ERROR(TQTDIR not set)
fi fi
AC_MSG_RESULT($QTDIR) AC_MSG_RESULT($TQTDIR)
ac_qmake=${QTDIR}/bin/qmake ac_qmake=${TQTDIR}/bin/qmake
AC_ARG_WITH(qmake, AC_ARG_WITH(qmake,
AC_HELP_STRING([--with-qmake=PATH],[which version of QMake to use ]), AC_HELP_STRING([--with-qmake=PATH],[which version of QMake to use ]),
[ ac_qmake="$withval" ]) [ ac_qmake="$withval" ])

@ -1,4 +1,4 @@
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${TQT_INCLUDE_DIR} )
########### install files ############### ########### install files ###############

@ -1,4 +1,4 @@
INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${TQT_INCLUDE_DIR} )
########### install files ############### ########### install files ###############

Loading…
Cancel
Save