diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-05-23 18:53:31 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-05-23 23:59:45 +0900 |
| commit | dbf13a369d5c0d06d0e59bfa862616609be5d045 (patch) | |
| tree | 94b602c2b13081a13093a609880b37771d26c21d /acinclude.m4 | |
| parent | 2a6652cc8907371caa56ef508089d672d4ec0f5a (diff) | |
| download | krecipes-dbf13a36.tar.gz krecipes-dbf13a36.zip | |
Use proper TQt headers
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit eb49b1d15fbf228459c3675f9f348d7a946d9443)
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 8be8c96..5929915 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1040,7 +1040,7 @@ elif test "$kde_use_qt_emb" = "yes"; then x_includes="" x_libraries="" elif test "$kde_use_qt_mac" = "yes"; then - dnl We're using TQt/Mac (I use QT_MAC so that ntqglobal.h doesn't *have* to + dnl We're using TQt/Mac (I use QT_MAC so that tqglobal.h doesn't *have* to dnl be included to get the information) --Sam CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp" CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp" @@ -1072,13 +1072,13 @@ AC_DEFUN([KDE_PRINT_QT_PROGRAM], AC_REQUIRE([KDE_USE_TQT]) cat > conftest.$ac_ext <<EOF #include "confdefs.h" -#include <ntqglobal.h> -#include <ntqapplication.h> +#include <tqglobal.h> +#include <tqapplication.h> EOF if test "$kde_qtver" = "3"; then cat >> conftest.$ac_ext <<EOF -#include <ntqcursor.h> -#include <ntqstylefactory.h> +#include <tqcursor.h> +#include <tqstylefactory.h> #include <private/qucomextra_p.h> EOF fi @@ -1345,7 +1345,7 @@ if test ! "$ac_tqt_includes" = "NO"; then qt_incdirs="$ac_tqt_includes $qt_incdirs" fi -kde_qt_header=ntqstyle.h +kde_qt_header=tqstyle.h AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) ac_tqt_includes="$qt_incdir" @@ -1922,7 +1922,7 @@ AC_CACHE_VAL(kde_cv_have_kdetqtaddon, LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ - #include <ntqdom.h> + #include <tqdom.h> ], [ QDomDocument doc; @@ -2458,7 +2458,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK( -[#include <ntqapplication.h>], +[#include <tqapplication.h>], [ int argc; char** argv; @@ -3274,7 +3274,7 @@ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY], AC_TRY_COMPILE( [ -#include <ntqglobal.h> +#include <tqglobal.h> #if Q_EXPORT - 0 != 0 /* if this compiles, then Q_EXPORT is undefined */ /* if Q_EXPORT is nonempty, this will break compilation */ @@ -4522,7 +4522,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" AC_TRY_RUN(dnl [ #include <qimageio.h> -#include <ntqstring.h> +#include <tqstring.h> int main() { TQString t = "hallo"; t.fill('t'); @@ -5366,7 +5366,7 @@ if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" fi -AC_FIND_FILE(ntqsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/tqt/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/tqt/html ], TQTDOCDIR) +AC_FIND_FILE(tqsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/tqt/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/tqt/html ], TQTDOCDIR) AC_MSG_RESULT($TQTDOCDIR) AC_SUBST(TQTDOCDIR) @@ -5387,7 +5387,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME) AC_SUBST(DOXYGEN_PROJECT_NUMBER) KDE_HAS_DOXYGEN=no -if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/ntqsql.html; then +if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/tqsql.html; then KDE_HAS_DOXYGEN=yes fi AC_SUBST(KDE_HAS_DOXYGEN) |
