TDE
/
tde-common-admin
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-common-admin
0
0
Fork 0
Code Issues Releases Wiki Activity

Use proper TQt headers

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/29/head
Michele Calgaro 6 months ago
parent 7fc9aedfb8
commit 34c35e11fb
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File

28
acinclude.m4.in
Unescape View File

@ -987,8 +987,8 @@ fi
LIB_XEXT="-lXext" LIB_XEXT="-lXext"
TQTE_NORTTI="" TQTE_NORTTI=""
CFLAGS="$CFLAGS -I/usr/include/tqt" CFLAGS="$CFLAGS -I/usr/include/tqt3 -I/usr/include/tqt"
CXXFLAGS="$CXXFLAGS -I/usr/include/tqt" CXXFLAGS="$CXXFLAGS -I/usr/include/tqt3 -I/usr/include/tqt"
elif test "$kde_use_tqt_emb" = "yes"; then elif test "$kde_use_tqt_emb" = "yes"; then
dnl We're using TQT Embedded dnl We're using TQT Embedded
@ -1044,16 +1044,8 @@ if $PKG_CONFIG --exists tqt-mt ; then
cat >> conftest.$ac_ext <<EOF cat >> conftest.$ac_ext <<EOF
#include <tqglobal.h> #include <tqglobal.h>
#include <tqapplication.h> #include <tqapplication.h>
EOF
fi
fi
if test "$kde_tqtver" = "3"; then
if $PKG_CONFIG --exists tqt-mt ; then
cat >> conftest.$ac_ext <<EOF
#include <tqcursor.h> #include <tqcursor.h>
#include <tqstylefactory.h> #include <tqstylefactory.h>
#include <tqucomextra_p.h>
EOF EOF
fi fi
fi fi
@ -1381,17 +1373,13 @@ if test "$PKG_CONFIG" != "no" ; then
tqt_incdirs="$tqt_incdirs `$PKG_CONFIG --variable=includedir tqt-mt`" tqt_incdirs="$tqt_incdirs `$PKG_CONFIG --variable=includedir tqt-mt`"
fi fi
fi fi
tqt_incdirs="$TQTINC $tqt_incdirs /usr/include/tqt3 /usr/include /usr/X11R6/include/X11/tqt /usr/X11R6/include/tqt $x_includes" tqt_incdirs="$TQTINC $tqt_incdirs /usr/include/tqt3 /usr/include/tqt /usr/include /usr/X11R6/include/X11/tqt /usr/X11R6/include/tqt $x_includes"
if test ! "$ac_tqt_includes" = "NO"; then if test ! "$ac_tqt_includes" = "NO"; then
tqt_incdirs="$ac_tqt_includes $tqt_incdirs" tqt_incdirs="$ac_tqt_includes $tqt_incdirs"
fi fi
kde_tqt_header=ntqstyle.h kde_tqt_header=tqstyle.h
AC_FIND_FILE($kde_tqt_header, $tqt_incdirs, tqt_incdir) AC_FIND_FILE($kde_tqt_header, $tqt_incdirs, tqt_incdir)
if test "$tqt_incdir" = "NO"; then
AC_FIND_FILE($kde_tqt_header, $tqt_incdirs, tqt_incdir)
fi
ac_tqt_includes="$tqt_incdir" ac_tqt_includes="$tqt_incdir"
tqt_libdirs="" tqt_libdirs=""
@ -4895,7 +4883,7 @@ AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAX
AC_DEFUN([KDE_CHECK_HEADER], AC_DEFUN([KDE_CHECK_HEADER],
[ [
kde_safe_cppflags=$CPPFLAGS kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt" CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt3 -I/usr/include/tqt"
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_CHECK_HEADER([$1], [$2], [$3], [$4]) AC_CHECK_HEADER([$1], [$2], [$3], [$4])
@ -4908,7 +4896,7 @@ AC_DEFUN([KDE_CHECK_HEADERS],
AH_CHECK_HEADERS_TDE([$1]) AH_CHECK_HEADERS_TDE([$1])
AC_LANG_SAVE AC_LANG_SAVE
kde_safe_cppflags=$CPPFLAGS kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt" CPPFLAGS="$CPPFLAGS $all_includes -I$kde_incdir/tde -I/usr/include/tqt3 -I/usr/include/tqt"
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_CHECK_HEADERS([$1], [$2], [$3], [$4]) AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
CPPFLAGS=$kde_safe_cppflags CPPFLAGS=$kde_safe_cppflags
@ -5549,7 +5537,7 @@ if test "${with_tqt_dir+set}" = set; then
kde_tqtdir="$with_tqt_dir" kde_tqtdir="$with_tqt_dir"
fi fi
AC_FIND_FILE(ntqsql.html, [ $kde_tqtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/tqt3/html /usr/lib/tqt3/doc /usr/lib/tqt3/doc/html /usr/doc/tqt3/html /usr/doc/tqt3 /usr/share/doc/tqt3-doc /usr/share/tqt3/doc/html /usr/X11R6/share/doc/tqt/html ], TQTDOCDIR) AC_FIND_FILE(tqsql.html, [ $kde_tqtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/tqt3/html /usr/lib/tqt3/doc /usr/lib/tqt3/doc/html /usr/doc/tqt3/html /usr/doc/tqt3 /usr/share/doc/tqt3-doc /usr/share/tqt3/doc/html /usr/X11R6/share/doc/tqt/html ], TQTDOCDIR)
AC_MSG_RESULT($TQTDOCDIR) AC_MSG_RESULT($TQTDOCDIR)
AC_SUBST(TQTDOCDIR) AC_SUBST(TQTDOCDIR)
@ -5570,7 +5558,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
AC_SUBST(DOXYGEN_PROJECT_NUMBER) AC_SUBST(DOXYGEN_PROJECT_NUMBER)
KDE_HAS_DOXYGEN=no 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 KDE_HAS_DOXYGEN=yes
fi fi
AC_SUBST(KDE_HAS_DOXYGEN) AC_SUBST(KDE_HAS_DOXYGEN)

2
am_edit
Unescape View File

@ -1374,7 +1374,7 @@ sub tag_UIFILES ()
$dep_lines .= "$source.h: $sourcedir$source.ui\n"; $dep_lines .= "$source.h: $sourcedir$source.ui\n";
$dep_lines .= "\trm -rf $source.h;\n"; $dep_lines .= "\trm -rf $source.h;\n";
if (!$kdeopts{"tqtonly"}) { if (!$kdeopts{"tqtonly"}) {
$dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pe \"s,public TQWizard,public KWizard,g; s,#include <ntqwizard.h>,#include <kwizard.h>,g; s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n"; $dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pe \"s,public TQWizard,public KWizard,g; s,#include <tqwizard.h>,#include <kwizard.h>,g; s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g\" >> $source.h ;\n";
} else { } else {
$dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n"; $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
} }

Write Preview
Loading…
Cancel
Save