From 62aebd90b88f7e21c2f213c183b78c9de1530295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 26 Sep 2018 01:14:08 +0200 Subject: QT_INCLUDES => TQT_INCLUDES conversion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- acinclude.m4 | 10 +++++----- configure.in | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 5a317c6..a052e11 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1296,7 +1296,7 @@ fi dnl ------------------------------------------------------------------------ dnl Try to find the Qt headers and libraries. dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed) -dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed) +dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed) dnl ------------------------------------------------------------------------ dnl AC_DEFUN([AC_PATH_TQT_1_3], @@ -1556,10 +1556,10 @@ AC_SUBST(qt_libraries) AC_SUBST(qt_includes) if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then - QT_INCLUDES="" + TQT_INCLUDES="" else - QT_INCLUDES="-I$qt_includes" - all_includes="$QT_INCLUDES $all_includes" + TQT_INCLUDES="-I$qt_includes" + all_includes="$TQT_INCLUDES $all_includes" fi if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then @@ -1570,7 +1570,7 @@ else fi test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS" -AC_SUBST(QT_INCLUDES) +AC_SUBST(TQT_INCLUDES) AC_SUBST(QT_LDFLAGS) AC_PATH_TQT_MOC_UIC diff --git a/configure.in b/configure.in index 9535417..a5c6313 100644 --- a/configure.in +++ b/configure.in @@ -100,7 +100,7 @@ if test "$have_kde" = yes; then else echo "KDE support : disabled." fi -echo "Qt includes : $QT_INCLUDES" +echo "Qt includes : $TQT_INCLUDES" echo "Qt libraries : $LIB_TQT" echo "chmlib to link : $USE_LIB_CHM" KDE_CREATE_SUBDIRSLIST -- cgit v1.2.3