From bb92347d9b8f20b152e441ed12e88d30bbf75ac7 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 27 Sep 2018 16:04:18 +0900 Subject: [PATCH] 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 --- acinclude.m4 | 18 +++++++++--------- src/kile/CMakeLists.txt | 2 +- src/kile/icons/CMakeLists.txt | 2 +- src/kile/symbols/CMakeLists.txt | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 80d1d95..e0a3fe9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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,10 +1223,10 @@ 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 /usr/lib${tdelibsuff}/qt-3.3" + kde_qt_dirs="$TQTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3 /usr/lib${tdelibsuff}/qt-3.3" if test -z "$PKG_CONFIG"; then AC_PATH_PROG(PKG_CONFIG, pkg-config, no) fi @@ -1237,10 +1237,10 @@ if test $kde_qtver = 3; then fi 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 ]) @@ -5555,10 +5555,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 @@ -5576,7 +5576,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) diff --git a/src/kile/CMakeLists.txt b/src/kile/CMakeLists.txt index 0a91528..1e3cc68 100644 --- a/src/kile/CMakeLists.txt +++ b/src/kile/CMakeLists.txt @@ -11,7 +11,7 @@ ADD_SUBDIRECTORY( test ) INCLUDE( KDE3Macros ) INCLUDE( FindPerl ) -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} ) ########### next target ############### diff --git a/src/kile/icons/CMakeLists.txt b/src/kile/icons/CMakeLists.txt index a7471d9..23ff0e4 100644 --- a/src/kile/icons/CMakeLists.txt +++ b/src/kile/icons/CMakeLists.txt @@ -1,6 +1,6 @@ ADD_SUBDIRECTORY( actions ) -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} ) INCLUDE(KDE3Macros) diff --git a/src/kile/symbols/CMakeLists.txt b/src/kile/symbols/CMakeLists.txt index 842bdcd..83c461c 100644 --- a/src/kile/symbols/CMakeLists.txt +++ b/src/kile/symbols/CMakeLists.txt @@ -32,7 +32,7 @@ ENDFOREACH( _dir ) ########### next target ############### -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} ) INCLUDE( FindKDE3 ) SET(gesymb_SRCS gesymb.cpp