From 553da9f77a1dba1f5a6f0ee2398bb5dbc14cc341 Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Wed, 26 Sep 2018 01:14:10 +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 +++++----- kdiff3plugin/po/Makefile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index eceafa1..c61e53a 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/kdiff3plugin/po/Makefile b/kdiff3plugin/po/Makefile index d1f45ac..499a470 100644 --- a/kdiff3plugin/po/Makefile +++ b/kdiff3plugin/po/Makefile @@ -185,7 +185,7 @@ PACKAGE_VERSION = PATH_SEPARATOR = : PERL = /usr/bin/perl QTE_NORTTI = -QT_INCLUDES = -I/usr/include/qt3 +TQT_INCLUDES = -I/usr/include/qt3 QT_LDFLAGS = -L/usr/share/qt3/lib RANLIB = ranlib SET_MAKE = -- cgit v1.2.3