diff options
| -rw-r--r-- | acinclude.m4 | 36 | ||||
| -rw-r--r-- | kmymoney2/pics/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kmymoney2/templates/en_US/CMakeLists.txt | 2 |
3 files changed, 20 insertions, 20 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d0727b1..43ca9e6 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,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 ]) @@ -5536,10 +5536,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 @@ -5557,7 +5557,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) @@ -12118,9 +12118,9 @@ AC_DEFUN([AC_SQLITE3], [ if test ! "lib${tdelibsuff}" = "lib"; then tqtlib=".lib64" fi - if test x$QTDIR = x; then - QTDIR=`dirname $MOC` - QTDIR=${QTDIR%/bin} + if test x$TQTDIR = x; then + TQTDIR=`dirname $MOC` + TQTDIR=${TQTDIR%/bin} fi if test "$PKG_CONFIG" != "no" ; then if $PKG_CONFIG --exists qt-mt ; then @@ -12132,7 +12132,7 @@ AC_DEFUN([AC_SQLITE3], [ fi fi if test "x$qt_plugins_dir" = "x"; then - qt_plugins_dir=${QTDIR}/plugins + qt_plugins_dir=${TQTDIR}/plugins fi LIBSQLITE3=${qt_plugins_dir}/sqldrivers/libqsqlite3${tqtlib}.so @@ -12170,12 +12170,12 @@ AC_DEFUN([AC_SQLITE3], [ fi if test $enable_sqlite3 = yes; then - AC_MSG_CHECKING(if the environment variable QTDIR is set) - if test x$QTDIR = x; then - AC_MSG_ERROR(QTDIR not set) + AC_MSG_CHECKING(if the environment variable TQTDIR is set) + if test x$TQTDIR = x; then + AC_MSG_ERROR(TQTDIR not set) fi - AC_MSG_RESULT($QTDIR) - ac_qmake=${QTDIR}/bin/qmake + AC_MSG_RESULT($TQTDIR) + ac_qmake=${TQTDIR}/bin/qmake AC_ARG_WITH(qmake, AC_HELP_STRING([--with-qmake=PATH],[which version of QMake to use ]), [ ac_qmake="$withval" ]) diff --git a/kmymoney2/pics/CMakeLists.txt b/kmymoney2/pics/CMakeLists.txt index 6723c09..abee5e7 100644 --- a/kmymoney2/pics/CMakeLists.txt +++ b/kmymoney2/pics/CMakeLists.txt @@ -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 ############### diff --git a/kmymoney2/templates/en_US/CMakeLists.txt b/kmymoney2/templates/en_US/CMakeLists.txt index 553d99e..bf0b498 100644 --- a/kmymoney2/templates/en_US/CMakeLists.txt +++ b/kmymoney2/templates/en_US/CMakeLists.txt @@ -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 ############### |