summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-08 18:51:48 +0900
committerSlávek Banko <slavek.banko@axis.cz>2018-09-16 17:59:45 +0200
commit7ed4760de47e51dc2148c6b1b4aecbcfcf05eb3f (patch)
tree75e76d76f78c2f505bf9d2af8c0f3aed8567962c
parent75306d2d1fe3eea200549805583bc9842c5ee172 (diff)
downloadadmin-7ed4760de47e51dc2148c6b1b4aecbcfcf05eb3f.tar.gz
admin-7ed4760de47e51dc2148c6b1b4aecbcfcf05eb3f.zip
Conversion qt -> tqt
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat
-rw-r--r--Doxyfile.global30
-rw-r--r--acinclude.m4.in1218
-rw-r--r--am_edit8
-rw-r--r--configure.in.bot.end8
-rw-r--r--configure.in.min2
-rw-r--r--cvs.sh8
-rwxr-xr-xdebianrules6
-rwxr-xr-xdoxygen.sh68
8 files changed, 480 insertions, 868 deletions
diff --git a/Doxyfile.global b/Doxyfile.global
index 6c30c56..8f412ac 100644
--- a/Doxyfile.global
+++ b/Doxyfile.global
@@ -134,18 +134,18 @@ SHORT_NAMES = NO
# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
# will interpret the first line (until the first dot) of a JavaDoc-style
# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
+# comments will behave just like regular TQt-style comments
# (thus requiring an explicit @brief command for a brief description.)
JAVADOC_AUTOBRIEF = YES
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
+# If the TQT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a TQt-style
# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
+# will behave just like regular TQt-style comments (thus requiring
# an explicit \brief command for a brief description.)
-QT_AUTOBRIEF = NO
+TQT_AUTOBRIEF = NO
# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
# treat a multi-line C++ special comment block (i.e. a block of //! or ///
@@ -905,7 +905,7 @@ TOC_EXPAND = NO
# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
# are set, an additional index file will be generated that can be used as input for
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
+# TQt's qhelpgenerator to generate a TQt Compressed Help (.qch) of the generated
# HTML documentation.
GENERATE_QHP = NO
@@ -917,36 +917,36 @@ GENERATE_QHP = NO
QCH_FILE =
# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
+# TQt Help Project output. For more information please see
+# http://doc.qt.io/qt-5/tqthelpproject.html#namespace
QHP_NAMESPACE =
# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+# TQt Help Project output. For more information please see
+# http://doc.qt.io/qt-5/tqthelpproject.html#virtual-folders
QHP_VIRTUAL_FOLDER = doc
# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
# For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
+# http://doc.qt.io/qt-5/tqthelpproject.html#custom-filters
QHP_CUST_FILTER_NAME =
# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+# <a href="http://doc.qt.io/qt-5/tqthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
QHP_CUST_FILTER_ATTRS =
# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+# <a href="http://doc.qt.io/qt-5/tqthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
QHP_SECT_FILTER_ATTRS =
# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
+# be used to specify the location of TQt's qhelpgenerator.
# If non-empty doxygen will try to run qhelpgenerator on the generated
# .qhp file.
@@ -993,7 +993,7 @@ TREEVIEW_WIDTH = 250
FORMULA_FONTSIZE = 10
# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP)
+# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or TQt help (GENERATE_QHP)
# there is already a search function so this one should typically
# be disabled.
diff --git a/acinclude.m4.in b/acinclude.m4.in
index 87f2463..0dd2272 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -245,7 +245,7 @@ AC_DEFUN([KDE_FIND_PATH],
AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
[
AC_MSG_ERROR([No TQt meta object compiler (tqmoc) found!
-Please check whether you installed Qt correctly.
+Please check whether you installed TQt correctly.
You need to have a running tqmoc binary.
configure tried to run $ac_cv_path_moc and the test didn't
succeed. If configure shouldn't have tried this one, set
@@ -256,8 +256,8 @@ configure.
AC_DEFUN([KDE_TQTMOC_ERROR_MESSAGE],
[
- AC_MSG_ERROR([No Trinity Qt meta object compiler (tmoc) found!
-Please check whether you installed the Trinity Qt Interface correctly.
+ AC_MSG_ERROR([No Trinity TQt meta object compiler (tmoc) found!
+Please check whether you installed the Trinity TQt Interface correctly.
You need to have a running tmoc binary.
configure tried to run $ac_cv_path_moc and the test didn't
succeed. If configure shouldn't have tried this one, set
@@ -311,36 +311,29 @@ 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_QT_MOC_UIC],
+AC_DEFUN([AC_PATH_TQT_MOC_UIC],
[
AC_REQUIRE([KDE_CHECK_PERL])
- qt_bindirs=""
- for dir in $kde_qt_dirs; do
- qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
+ tqt_bindirs=""
+ for dir in $kde_tqt_dirs; do
+ tqt_bindirs="$tqt_bindirs $dir/bin $dir/src/moc"
done
- qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
- if test ! "$ac_qt_bindir" = "NO"; then
- qt_bindirs="$ac_qt_bindir $qt_bindirs"
- fi
-
- if test "$kde_qtver" = "3"; then
- qt_bindirs="/usr/share/tqt3/bin /usr/share/qt3/bin $qt_bindirs"
+ tqt_bindirs="$tqt_bindirs /usr/bin /usr/X11R6/bin /usr/local/tqt/bin"
+ if test ! "$ac_tqt_bindir" = "NO"; then
+ tqt_bindirs="$ac_tqt_bindir $tqt_bindirs"
fi
- if test "$kde_qtver" = "4"; then
- qt_bindirs="/usr/share/qt4/bin $qt_bindirs"
+ if test "$kde_tqtver" = "3"; then
+ tqt_bindirs="/usr/share/tqt3/bin $tqt_bindirs"
fi
- KDE_FIND_PATH(tqmoc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
+ KDE_FIND_PATH(tqmoc, MOC, [$tqt_bindirs], [KDE_MOC_ERROR_MESSAGE])
if test -z "$UIC_NOT_NEEDED"; then
- if test $kde_qtver = 3; then
- KDE_FIND_PATH(uic-tqt, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
- fi
- if test $kde_qtver = 4; then
- KDE_FIND_PATH(uic-tqt, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
+ if test $kde_tqtver = 3; then
+ KDE_FIND_PATH(uic-tqt, UIC_PATH, [$tqt_bindirs], [UIC_PATH=""])
fi
if test -z "$UIC_PATH" ; then
KDE_UIC_ERROR_MESSAGE
@@ -348,19 +341,7 @@ AC_DEFUN([AC_PATH_QT_MOC_UIC],
else
UIC=$UIC_PATH
- if test $kde_qtver = 3; then
- KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no)
- KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no)
-
- if test x$ac_uic_supports_libpath = xyes; then
- UIC="$UIC -L \$(kde_widgetdir)"
- fi
- if test x$ac_uic_supports_nounload = xyes; then
- UIC="$UIC -nounload"
- fi
- fi
-
- if test $kde_qtver = 4; then
+ if test $kde_tqtver = 3; then
KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no)
KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no)
@@ -380,64 +361,13 @@ AC_DEFUN([AC_PATH_QT_MOC_UIC],
AC_SUBST(UIC)
UIC_TR="i18n"
- if test $kde_qtver = 3; then
- UIC_TR="tr2i18n"
- fi
- if test $kde_qtver = 4; then
+ if test $kde_tqtver = 3; then
UIC_TR="tr2i18n"
fi
AC_SUBST(UIC_TR)
])
-AC_DEFUN([KDE_1_CHECK_PATHS],
-[
- KDE_1_CHECK_PATH_HEADERS
-
- KDE_TEST_RPATH=
-
- if test -n "$USE_RPATH"; then
-
- if test -n "$kde_libraries"; then
- KDE_TEST_RPATH="-R $kde_libraries"
- fi
-
- if test -n "$qt_libraries"; then
- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
- fi
-
- if test -n "$x_libraries"; then
- KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
- fi
-
- KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
- fi
-
-AC_MSG_CHECKING([for TDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
- AC_MSG_RESULT(yes)
-else
- AC_MSG_ERROR([your system fails at linking a small TDE application!
-Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and tdelibs as you did use now.
-For more details about this problem, look at the end of config.log.])
-fi
-
-if eval `TDEDIR= ./conftest 2>&5`; then
- kde_result=done
-else
- kde_result=problems
-fi
-
-TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-kde_have_all_paths=yes
-
-KDE_SET_PATHS($kde_result)
-
-])
-
AC_DEFUN([KDE_SET_PATHS],
[
kde_cv_all_paths="kde_have_all_paths=\"yes\" \
@@ -519,11 +449,7 @@ if test "$1" = "default"; then
kde_servicetypesdir='\${datadir}/servicetypes'
fi
if test -z "$kde_moduledir"; then
- if test "$kde_qtver" = "2"; then
- kde_moduledir='\${libdir}/kde2'
- else
- kde_moduledir='\${libdir}/trinity'
- fi
+ kde_moduledir='\${libdir}/trinity'
fi
if test -z "$kde_styledir"; then
kde_styledir='\${libdir}/trinity/plugins/styles'
@@ -545,12 +471,7 @@ if test "$1" = "default"; then
else
- if test $kde_qtver = 1; then
- AC_MSG_RESULT([compiling])
- KDE_1_CHECK_PATHS
- else
- AC_MSG_ERROR([path checking not yet supported for TDE 2])
- fi
+ AC_MSG_ERROR([path checking not yet supported for TDE 2])
fi
])
@@ -624,16 +545,13 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
trinity14ornewer=1
- if test "$kde_qtver" = "3"; then
+ if test "$kde_tqtver" = "3"; then
if test "$KDECONFIG" != "compiled"; then
if test `$KDECONFIG --version | grep TDE | sed 's/TDE: R\(..\).*/\1/'` -lt 14; then
trinity14ornewer=
fi
fi
fi
- if test "$kde_qtver" = "4"; then
- trinity14ornewer=1
- fi
if test -n "$trinity14ornewer"; then
KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
@@ -745,14 +663,6 @@ AC_SUBST(kde_moduledir)
AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir)
-if test "$kde_qtver" = 1; then
- kde_minidir="$kde_icondir/mini"
-else
-# for TDE 1 - this breaks KDE2 apps using minidir, but
-# that's the plan ;-/
- kde_minidir="/dev/null"
-fi
-dnl AC_SUBST(kde_minidir)
dnl AC_SUBST(kde_cgidir)
dnl AC_SUBST(kde_toolbardir)
])
@@ -906,29 +816,29 @@ AC_REQUIRE([KDE_CHECK_LIB64])
AC_ARG_ENABLE(
embedded,
- AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]),
- kde_use_qt_emb=$enableval,
- kde_use_qt_emb=no
+ AC_HELP_STRING([--enable-embedded],[link to TQt-embedded, don't use X]),
+ kde_use_tqt_emb=$enableval,
+ kde_use_tqt_emb=no
)
AC_ARG_ENABLE(
- qtopia,
- AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]),
- kde_use_qt_emb_palm=$enableval,
- kde_use_qt_emb_palm=no
+ tqtopia,
+ AC_HELP_STRING([--enable-tqtopia],[link to TQt-embedded, link to the TQtopia Environment]),
+ kde_use_tqt_emb_palm=$enableval,
+ kde_use_tqt_emb_palm=no
)
AC_ARG_ENABLE(
mac,
- AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]),
- kde_use_qt_mac=$enableval,
- kde_use_qt_mac=no
+ AC_HELP_STRING([--enable-mac],[link to TQt/Mac (don't use X)]),
+ kde_use_tqt_mac=$enableval,
+ kde_use_tqt_mac=no
)
# used to disable x11-specific stuff on special platforms
-AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no")
+AM_CONDITIONAL(include_x11, test "$kde_use_tqt_emb" = "no" && test "$kde_use_tqt_mac" = "no")
-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
+if test "$kde_use_tqt_emb" = "no" && test "$kde_use_tqt_mac" = "no"; then
AC_MSG_CHECKING(for X)
@@ -1075,16 +985,16 @@ them either.])
fi
LIB_XEXT="-lXext"
-QTE_NORTTI=""
+TQTE_NORTTI=""
CFLAGS="$CFLAGS -I/usr/include/tqt"
CXXFLAGS="$CXXFLAGS -I/usr/include/tqt"
-elif test "$kde_use_qt_emb" = "yes"; then
- dnl We're using QT Embedded
+elif test "$kde_use_tqt_emb" = "yes"; then
+ dnl We're using TQT Embedded
CPPFLAGS=-DQWS
CXXFLAGS="$CXXFLAGS -fno-rtti"
- QTE_NORTTI="-fno-rtti -DQWS"
+ TQTE_NORTTI="-fno-rtti -DQWS"
X_PRE_LIBS=""
LIB_X11=""
LIB_XEXT=""
@@ -1094,11 +1004,11 @@ elif test "$kde_use_qt_emb" = "yes"; then
X_LDFLAGS=""
x_includes=""
x_libraries=""
-elif test "$kde_use_qt_mac" = "yes"; then
- dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
+elif test "$kde_use_tqt_mac" = "yes"; then
+ dnl We're using TQT/Mac (I use TQT_MAC so that qglobal.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"
+ CXXFLAGS="$CXXFLAGS -DTQT_MAC -no-cpp-precomp"
+ CFLAGS="$CFLAGS -DTQT_MAC -no-cpp-precomp"
X_PRE_LIBS=""
LIB_X11=""
LIB_XEXT=""
@@ -1117,27 +1027,20 @@ AC_SUBST(X_INCLUDES)
AC_SUBST(X_LDFLAGS)
AC_SUBST(x_includes)
AC_SUBST(x_libraries)
-AC_SUBST(QTE_NORTTI)
+AC_SUBST(TQTE_NORTTI)
AC_SUBST(LIB_XEXT)
])
-AC_DEFUN([KDE_PRINT_QT_PROGRAM],
+AC_DEFUN([KDE_PRINT_TQT_PROGRAM],
[
-AC_REQUIRE([KDE_USE_QT])
+AC_REQUIRE([KDE_USE_TQT])
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
EOF
-if test "$kde_qtver" = "4"; then
-cat >> conftest.$ac_ext <<EOF
-#include <Qt/qglobal.h>
-#include <Qt/qapplication.h>
-EOF
-fi
-
-if test "$kde_qtver" = "3"; then
-if $PKG_CONFIG --exists qt-mt ; then
+if test "$kde_tqtver" = "3"; then
+if $PKG_CONFIG --exists tqt-mt ; then
cat >> conftest.$ac_ext <<EOF
#include <tqt.h>
#include <qglobal.h>
@@ -1151,24 +1054,8 @@ EOF
fi
fi
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qevent.h>
-#include <qstring.h>
-#include <qstyle.h>
-EOF
-
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-#if TQT_VERSION < 210
-#error 1
-#endif
-EOF
-fi
-fi
-
-if test "$kde_qtver" = "3"; then
-if $PKG_CONFIG --exists qt-mt ; then
+if test "$kde_tqtver" = "3"; then
+if $PKG_CONFIG --exists tqt-mt ; then
cat >> conftest.$ac_ext <<EOF
#include <qcursor.h>
#include <qstylefactory.h>
@@ -1183,37 +1070,18 @@ EOF
fi
fi
-if test "$kde_qtver" = "4"; then
-cat >> conftest.$ac_ext <<EOF
-#include <Qt/qcursor.h>
-#include <Qt/qstylefactory.h>
-EOF
-fi
-
-echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
+echo "#if ! ($kde_tqt_verstring)" >> conftest.$ac_ext
cat >> conftest.$ac_ext <<EOF
#error 1
#endif
int main() {
EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
- QStringList *t = new QStringList();
- Q_UNUSED(t);
-EOF
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
- QString s;
- s.setLatin1("Elvis is alive", 14);
-EOF
-fi
-fi
-if test "$kde_qtver" = "3"; then
-if $PKG_CONFIG --exists qt-mt ; then
+if test "$kde_tqtver" = "3"; then
+if $PKG_CONFIG --exists tqt-mt ; then
cat >> conftest.$ac_ext <<EOF
(void)QStyleFactory::create(QString::null);
- QCursor c(Qt::WhatsThisCursor);
+ QCursor c(TQt::WhatsThisCursor);
EOF
else
cat >> conftest.$ac_ext <<EOF
@@ -1222,24 +1090,18 @@ cat >> conftest.$ac_ext <<EOF
EOF
fi
fi
-if test "$kde_qtver" = "4"; then
-cat >> conftest.$ac_ext <<EOF
- (void)QStyleFactory::create(QString::null);
- QCursor c(Qt::WhatsThisCursor);
-EOF
-fi
cat >> conftest.$ac_ext <<EOF
return 0;
}
EOF
])
-AC_DEFUN([KDE_USE_QT],
+AC_DEFUN([KDE_USE_TQT],
[
#if test -z "$1"; then
- # Current default Qt version: 3.3
- kde_qtver=3
- kde_qtsubver=3
+ # Current default TQt version: 3.3
+ kde_tqtver=3
+ kde_tqtsubver=3
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
@@ -1249,148 +1111,91 @@ AC_DEFUN([KDE_USE_QT],
#define TQT_VERSION_ONLY
#include <tqt.h>
#undef TQT_VERSION_ONLY
- #ifdef USE_QT4
+ #ifdef USE_TQT4
choke me
#endif
], ,
- kde_qtver=3,
- kde_qtver=4
+ kde_tqtver=3,
)
CXXFLAGS="$ac_cxxflags_safe"
AC_LANG_RESTORE
- if test "$kde_qtver" = "3"; then
+ if test "$kde_tqtver" = "3"; then
AC_MSG_RESULT(Detected TQt3...)
fi
- if test "$kde_qtver" = "4"; then
- AC_MSG_RESULT(Detected Qt4...)
- fi
#else
-# kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
+# kde_tqtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
# # following is the check if subversion isnt found in passed argument
-# if test "$kde_qtsubver" = "$1"; then
-# kde_qtsubver=1
+# if test "$kde_tqtsubver" = "$1"; then
+# kde_tqtsubver=1
# fi
-# kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
-# if test "$kde_qtver" = "1"; then
-# kde_qtsubver=42
+# kde_tqtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
+# if test "$kde_tqtver" = "1"; then
+# kde_tqtsubver=42
# fi
#fi
if test -z "$2"; then
- if test "$kde_qtver" = "2"; then
- if test $kde_qtsubver -gt 0; then
- kde_qt_minversion=">= Qt 2.2.2"
- else
- kde_qt_minversion=">= Qt 2.0.2"
- fi
- fi
- if test "$kde_qtver" = "3"; then
- if test $kde_qtsubver -gt 0; then
- if test $kde_qtsubver -gt 1; then
- if test $kde_qtsubver -gt 2; then
- kde_qt_minversion=">= Qt 3.3 and < 4.0"
+ if test "$kde_tqtver" = "3"; then
+ if test $kde_tqtsubver -gt 0; then
+ if test $kde_tqtsubver -gt 1; then
+ if test $kde_tqtsubver -gt 2; then
+ kde_tqt_minversion=">= TQt 3.3 and < 4.0"
else
- kde_qt_minversion=">= Qt 3.2 and < 4.0"
+ kde_tqt_minversion=">= TQt 3.2 and < 4.0"
fi
else
- kde_qt_minversion=">= Qt 3.1 (20021021) and < 4.0"
+ kde_tqt_minversion=">= TQt 3.1 (20021021) and < 4.0"
fi
else
- kde_qt_minversion=">= Qt 3.0 and < 4.0"
+ kde_tqt_minversion=">= TQt 3.0 and < 4.0"
fi
fi
- if test "$kde_qtver" = "4"; then
- if test $kde_qtsubver -gt 0; then
- if test $kde_qtsubver -gt 1; then
- if test $kde_qtsubver -gt 2; then
- kde_qt_minversion=">= Qt 4.3 and < 5.0"
- else
- kde_qt_minversion=">= Qt 4.2 and < 5.0"
- fi
- else
- kde_qt_minversion=">= Qt 4.1 and < 5.0"
- fi
- else
- kde_qt_minversion=">= Qt 4.0 and < 5.0"
- fi
- fi
- if test "$kde_qtver" = "1"; then
- kde_qt_minversion=">= 1.42 and < 2.0"
- fi
else
- kde_qt_minversion="$2"
+ kde_tqt_minversion="$2"
fi
if test -z "$3"; then
- if test $kde_qtver = 4; then
- if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="TQT_VERSION >= 0x04@VER@00 && TQT_VERSION < 0x050000"
- qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
- kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
- else
- kde_qt_verstring="TQT_VERSION >= 400 && TQT_VERSION < 0x050000"
- fi
- fi
- if test $kde_qtver = 3; then
- if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
- qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
- kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
- else
- kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
- fi
- fi
- if test $kde_qtver = 2; then
- if test $kde_qtsubver -gt 0; then
- kde_qt_verstring="TQT_VERSION >= 222"
+ if test $kde_tqtver = 3; then
+ if test $kde_tqtsubver -gt 0; then
+ kde_tqt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
+ tqtsubver=`echo "00$kde_tqtsubver" | sed -e 's,.*\(..\)$,\1,'`
+ kde_tqt_verstring=`echo $kde_tqt_verstring | sed -e "s,@VER@,$tqtsubver,"`
else
- kde_qt_verstring="TQT_VERSION >= 200"
+ kde_tqt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
fi
fi
- if test $kde_qtver = 1; then
- kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
- fi
else
- kde_qt_verstring="$3"
+ kde_tqt_verstring="$3"
fi
-if test $kde_qtver = 4; then
- kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
-fi
-if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/tqt3 /usr/lib/qt3 /usr/lib/qt /usr/share/tqt3 /usr/share/qt3 /usr/lib${tdelibsuff}/qt-3.3"
+if test $kde_tqtver = 3; then
+ kde_tqt_dirs="$TQTDIR /usr/lib/tqt3 /usr/share/tqt3"
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" != "no" ; then
- if $PKG_CONFIG --exists qt-mt ; then
- kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix qt-mt`"
+ if $PKG_CONFIG --exists tqt-mt ; then
+ kde_tqt_dirs="$kde_tqt_dirs `$PKG_CONFIG --variable=prefix tqt-mt`"
LIB_QUI="-lqui"
AC_SUBST(LIB_QUI)
else
if $PKG_CONFIG --exists tqt-mt ; then
- kde_qt_dirs="$kde_qt_dirs `$PKG_CONFIG --variable=prefix tqt-mt`"
+ kde_tqt_dirs="$kde_tqt_dirs `$PKG_CONFIG --variable=prefix tqt-mt`"
LIB_QUI="-ltqui"
AC_SUBST(LIB_QUI)
fi
fi
fi
fi
-if test $kde_qtver = 2; then
- kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-fi
-if test $kde_qtver = 1; then
- kde_qt_dirs="$QTDIR /usr/lib/qt"
-fi
])
-AC_DEFUN([KDE_CHECK_QT_DIRECT],
+AC_DEFUN([KDE_CHECK_TQT_DIRECT],
[
-AC_REQUIRE([KDE_USE_QT])
-AC_MSG_CHECKING([if Qt compiles without flags])
-AC_CACHE_VAL(kde_cv_qt_direct,
+AC_REQUIRE([KDE_USE_TQT])
+AC_MSG_CHECKING([if TQt compiles without flags])
+AC_CACHE_VAL(kde_cv_tqt_direct,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
@@ -1400,24 +1205,24 @@ ac_cxxflags_safe="$CXXFLAGS"
ac_ldflags_safe="$LDFLAGS"
ac_libs_safe="$LIBS"
-CXXFLAGS="$CXXFLAGS -I$qt_includes"
+CXXFLAGS="$CXXFLAGS -I$tqt_includes"
LDFLAGS="$LDFLAGS $X_LDFLAGS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
+if test "x$kde_use_tqt_emb" != "xyes" && test "x$kde_use_tqt_mac" != "xyes"; then
+LIBS="$LIBTQT -lXext -lX11 $LIBSOCKET"
else
-LIBS="$LIBQT $LIBSOCKET"
+LIBS="$LIBTQT $LIBSOCKET"
fi
LD_LIBRARY_PATH=
export LD_LIBRARY_PATH
LIBRARY_PATH=
export LIBRARY_PATH
-KDE_PRINT_QT_PROGRAM
+KDE_PRINT_TQT_PROGRAM
if AC_TRY_EVAL(ac_link) && test -s conftest; then
- kde_cv_qt_direct="yes"
+ kde_cv_tqt_direct="yes"
else
- kde_cv_qt_direct="no"
+ kde_cv_tqt_direct="no"
echo "configure: failed program was:" >&AC_FD_CC
cat conftest.$ac_ext >&AC_FD_CC
fi
@@ -1434,7 +1239,7 @@ export LIBRARY_PATH
AC_LANG_RESTORE
])
-if test "$kde_cv_qt_direct" = "yes"; then
+if test "$kde_cv_tqt_direct" = "yes"; then
AC_MSG_RESULT(yes)
$1
else
@@ -1444,108 +1249,98 @@ 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 Try to find the TQt headers and libraries.
+dnl $(TQT_LDFLAGS) will be -Ltqtliblocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Itqthdrlocation (if needed)
dnl ------------------------------------------------------------------------
dnl
-AC_DEFUN([AC_PATH_QT_1_3],
+AC_DEFUN([AC_PATH_TQT_1_3],
[
AC_REQUIRE([K_PATH_X])
-AC_REQUIRE([KDE_USE_QT])
+AC_REQUIRE([KDE_USE_TQT])
AC_REQUIRE([KDE_CHECK_LIB64])
dnl ------------------------------------------------------------------------
-dnl Add configure flag to enable linking to MT version of Qt library.
+dnl Add configure flag to enable linking to MT version of TQt library.
dnl ------------------------------------------------------------------------
AC_ARG_ENABLE(
mt,
- AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]),
- kde_use_qt_mt=$enableval,
+ AC_HELP_STRING([--disable-mt],[link to non-threaded TQt (deprecated)]),
+ kde_use_tqt_mt=$enableval,
[
- if test $kde_qtver = 3; then
- kde_use_qt_mt=yes
+ if test $kde_tqtver = 3; then
+ kde_use_tqt_mt=yes
else
- if test $kde_qtver = 4; then
- kde_use_qt_mt=yes
- else
- kde_use_qt_mt=no
- fi
+ kde_use_tqt_mt=no
fi
]
)
-USING_QT_MT=""
+USING_TQT_MT=""
dnl ------------------------------------------------------------------------
-dnl If we not get --disable-qt-mt then adjust some vars for the host.
+dnl If we not get --disable-tqt-mt then adjust some vars for the host.
dnl ------------------------------------------------------------------------
KDE_MT_LDFLAGS=
KDE_MT_LIBS=
-if test "x$kde_use_qt_mt" = "xyes"; then
+if test "x$kde_use_tqt_mt" = "xyes"; then
KDE_CHECK_THREADING
if test "x$kde_use_threading" = "xyes"; then
- CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
+ CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS"
KDE_MT_LDFLAGS="$USE_THREADS"
KDE_MT_LIBS="$LIBPTHREAD"
else
- kde_use_qt_mt=no
+ kde_use_tqt_mt=no
fi
fi
AC_SUBST(KDE_MT_LDFLAGS)
AC_SUBST(KDE_MT_LIBS)
-kde_qt_was_given=yes
+kde_tqt_was_given=yes
dnl ------------------------------------------------------------------------
-dnl If we haven't been told how to link to Qt, we work it out for ourselves.
+dnl If we haven't been told how to link to TQt, we work it out for ourselves.
dnl ------------------------------------------------------------------------
-if test -z "$LIBQT_GLOB"; then
- if test "$kde_qtver" = "4"; then
- LIBQT_GLOB="libQtCore.*"
- fi
- if test "$kde_qtver" = "3"; then
- if test "x$kde_use_qt_emb" = "xyes"; then
- LIBQT_GLOB="libqte.*"
+if test -z "$LIBTQT_GLOB"; then
+ if test "$kde_tqtver" = "3"; then
+ if test "x$kde_use_tqt_emb" = "xyes"; then
+ LIBTQT_GLOB="libtqte.*"
else
- if $PKG_CONFIG --exists qt-mt ; then
- LIBQT_GLOB="libqt.*"
+ if $PKG_CONFIG --exists tqt-mt ; then
+ LIBTQT_GLOB="libtqt.*"
else
- LIBQT_GLOB="libtqt.*"
+ LIBTQT_GLOB="libtqt.*"
fi
fi
fi
fi
dnl ------------------------------------------------------------
-dnl If we got --enable-embedded then adjust the Qt library name.
-dnl Also Qt4 uses a different library name
+dnl If we got --enable-embedded then adjust the TQt library name.
+dnl Also TQt4 uses a different library name
dnl ------------------------------------------------------------
-if test "$kde_qtver" = "4"; then
- qtlib="QtCore -lQtGui -lQtNetwork -ltqt"
-fi
-if test "$kde_qtver" = "3"; then
- if test "x$kde_use_qt_emb" = "xyes"; then
- qtlib="qte"
+if test "$kde_tqtver" = "3"; then
+ if test "x$kde_use_tqt_emb" = "xyes"; then
+ tqtlib="tqte"
else
- if $PKG_CONFIG --exists qt-mt ; then
- qtlib="qt"
+ if $PKG_CONFIG --exists tqt-mt ; then
+ tqtlib="tqt"
else
- qtlib="tqt"
+ tqtlib="tqt"
fi
fi
fi
-kde_int_qt="-l$qtlib"
+kde_int_tqt="-l$tqtlib"
if test -z "$LIBQPE"; then
dnl ------------------------------------------------------------
dnl If we got --enable-palmtop then add -lqpe to the link line
dnl ------------------------------------------------------------
- if test "x$kde_use_qt_emb" = "xyes"; then
- if test "x$kde_use_qt_emb_palm" = "xyes"; then
+ if test "x$kde_use_tqt_emb" = "xyes"; then
+ if test "x$kde_use_tqt_emb_palm" = "xyes"; then
LIB_QPE="-lqpe"
else
LIB_QPE=""
@@ -1556,148 +1351,130 @@ dnl ------------------------------------------------------------
fi
dnl ------------------------------------------------------------------------
-dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
+dnl If we got --enable-tqt-mt then adjust the TQt library name for the host.
dnl ------------------------------------------------------------------------
-if test "x$kde_use_qt_mt" = "xyes"; then
- if test $kde_qtver = 3; then
- LIBQT="-l$qtlib-mt"
- kde_int_qt="-l$qtlib-mt"
- LIBQT_GLOB="lib$qtlib-mt.*"
- else
- if test $kde_qtver = 4; then
- LIBQT="-l$qtlib"
- fi
+if test "x$kde_use_tqt_mt" = "xyes"; then
+ if test $kde_tqtver = 3; then
+ LIBTQT="-l$tqtlib-mt"
+ kde_int_tqt="-l$tqtlib-mt"
+ LIBTQT_GLOB="lib$tqtlib-mt.*"
fi
- USING_QT_MT="using -mt"
+ USING_TQT_MT="using -mt"
else
- LIBQT="-l$qtlib"
+ LIBTQT="-l$tqtlib"
fi
-if test $kde_qtver != 1; then
+if test $kde_tqtver != 1; then
AC_REQUIRE([AC_FIND_PNG])
AC_REQUIRE([AC_FIND_JPEG])
- LIBQT="$LIBQT $LIBPNG $LIBJPEG"
+ LIBTQT="$LIBTQT $LIBPNG $LIBJPEG"
fi
-if test $kde_qtver = 3; then
+if test $kde_tqtver = 3; then
AC_REQUIRE([KDE_CHECK_LIBDL])
- LIBQT="$LIBQT $LIBDL"
+ LIBTQT="$LIBTQT $LIBDL"
fi
-if test $kde_qtver = 4; then
- AC_REQUIRE([KDE_CHECK_LIBDL])
- LIBQT="$LIBQT $LIBDL"
-fi
+AC_MSG_CHECKING([for TQt])
-AC_MSG_CHECKING([for Qt])
-
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
+if test "x$kde_use_tqt_emb" != "xyes" && test "x$kde_use_tqt_mac" != "xyes"; then
+LIBTQT="$LIBTQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
fi
-ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-qt_libraries=""
-qt_includes=""
-AC_ARG_WITH(qt-dir,
- AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
- [ ac_qt_includes="$withval"/include
- ac_qt_libraries="$withval"/lib${tdelibsuff}
- ac_qt_bindir="$withval"/bin
+ac_tqt_includes=NO ac_tqt_libraries=NO ac_tqt_bindir=NO
+tqt_libraries=""
+tqt_includes=""
+AC_ARG_WITH(tqt-dir,
+ AC_HELP_STRING([--with-tqt-dir=DIR],[where the root of TQt is installed ]),
+ [ ac_tqt_includes="$withval"/include
+ ac_tqt_libraries="$withval"/lib${tdelibsuff}
+ ac_tqt_bindir="$withval"/bin
])
-AC_ARG_WITH(qt-includes,
- AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
+AC_ARG_WITH(tqt-includes,
+ AC_HELP_STRING([--with-tqt-includes=DIR],[where the TQt includes are. ]),
[
- ac_qt_includes="$withval"
+ ac_tqt_includes="$withval"
])
-kde_qt_libs_given=no
+kde_tqt_libs_given=no
-AC_ARG_WITH(qt-libraries,
- AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]),
- [ ac_qt_libraries="$withval"
- kde_qt_libs_given=yes
+AC_ARG_WITH(tqt-libraries,
+ AC_HELP_STRING([--with-tqt-libraries=DIR],[where the TQt library is installed.]),
+ [ ac_tqt_libraries="$withval"
+ kde_tqt_libs_given=yes
])
-AC_CACHE_VAL(ac_cv_have_qt,
-[#try to guess Qt locations
+AC_CACHE_VAL(ac_cv_have_tqt,
+[#try to guess TQt locations
-qt_incdirs=""
-for dir in $kde_qt_dirs; do
- qt_incdirs="$qt_incdirs $dir/include $dir"
+tqt_incdirs=""
+for dir in $kde_tqt_dirs; do
+ tqt_incdirs="$tqt_incdirs $dir/include $dir"
done
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" != "no" ; then
- if $PKG_CONFIG --exists qt-mt ; then
- qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir qt-mt`"
+ if $PKG_CONFIG --exists tqt-mt ; then
+ tqt_incdirs="$tqt_incdirs `$PKG_CONFIG --variable=includedir tqt-mt`"
else
if $PKG_CONFIG --exists tqt-mt ; then
- qt_incdirs="$qt_incdirs `$PKG_CONFIG --variable=includedir tqt-mt`"
+ tqt_incdirs="$tqt_incdirs `$PKG_CONFIG --variable=includedir tqt-mt`"
fi
fi
fi
-qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/tqt3 /usr/include/qt3 $x_includes"
-if test ! "$ac_qt_includes" = "NO"; then
- qt_incdirs="$ac_qt_includes $qt_incdirs"
+tqt_incdirs="$TQTINC $tqt_incdirs /usr/include/tqt3 /usr/include /usr/X11R6/include/X11/tqt /usr/X11R6/include/tqt $x_includes"
+if test ! "$ac_tqt_includes" = "NO"; then
+ tqt_incdirs="$ac_tqt_includes $tqt_incdirs"
fi
-if test "$kde_qtver" != "1"; then
- if test "$kde_qtver" = "4"; then
- kde_qt_header="Qt/qstyle.h"
- else
- kde_qt_header=qstyle.h
- kde_tqt_header=ntqstyle.h
- fi
-else
- kde_qt_header=qglobal.h
- kde_tqt_header=ntqglobal.h
-fi
+kde_tqt_header=qstyle.h
+kde_tqt_header=ntqstyle.h
-AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
-if test "$qt_incdir" = "NO"; then
- AC_FIND_FILE($kde_tqt_header, $qt_incdirs, qt_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_qt_includes="$qt_incdir"
+ac_tqt_includes="$tqt_incdir"
-qt_libdirs=""
-for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir/lib $dir"
+tqt_libdirs=""
+for dir in $kde_tqt_dirs; do
+ tqt_libdirs="$tqt_libdirs $dir/lib${tdelibsuff} $dir/lib $dir"
done
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" != "no" ; then
- if $PKG_CONFIG --exists qt-mt ; then
- qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir qt-mt`"
+ if $PKG_CONFIG --exists tqt-mt ; then
+ tqt_libdirs="$tqt_incdirs `$PKG_CONFIG --variable=libdir tqt-mt`"
else
if $PKG_CONFIG --exists tqt-mt ; then
- qt_libdirs="$qt_incdirs `$PKG_CONFIG --variable=libdir tqt-mt`"
+ tqt_libdirs="$tqt_incdirs `$PKG_CONFIG --variable=libdir tqt-mt`"
fi
fi
fi
-qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
-if test ! "$ac_qt_libraries" = "NO"; then
- qt_libdir=$ac_qt_libraries
+tqt_libdirs="$TQTLIB $tqt_libdirs /usr/X11R6/lib /usr/lib /usr/local/tqt/lib $x_libraries"
+if test ! "$ac_tqt_libraries" = "NO"; then
+ tqt_libdir=$ac_tqt_libraries
else
- qt_libdirs="$ac_qt_libraries $qt_libdirs"
- # if the Qt was given, the chance is too big that libqt.* doesn't exist
- qt_libdir=NONE
- for dir in $qt_libdirs; do
- try="ls -1 $dir/${LIBQT_GLOB}"
- if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
+ tqt_libdirs="$ac_tqt_libraries $tqt_libdirs"
+ # if the TQt was given, the chance is too big that libtqt.* doesn't exist
+ tqt_libdir=NONE
+ for dir in $tqt_libdirs; do
+ try="ls -1 $dir/${LIBTQT_GLOB}"
+ if test -n "`$try 2> /dev/null`"; then tqt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
done
fi
-for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
+for a in $tqt_libdir/lib`echo ${kde_int_tqt} | sed 's,^-l,,'`_incremental.*; do
if test -e "$a"; then
- LIBQT="$LIBQT ${kde_int_qt}_incremental"
+ LIBTQT="$LIBTQT ${kde_int_tqt}_incremental"
break
fi
done
-ac_qt_libraries="$qt_libdir"
+ac_tqt_libraries="$tqt_libdir"
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
@@ -1706,18 +1483,18 @@ ac_cxxflags_safe="$CXXFLAGS"
ac_ldflags_safe="$LDFLAGS"
ac_libs_safe="$LIBS"
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
+CXXFLAGS="$CXXFLAGS -I$tqt_incdir $all_includes"
+LDFLAGS="$LDFLAGS -L$tqt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
+LIBS="$LIBS $LIBTQT $KDE_MT_LIBS"
-KDE_PRINT_QT_PROGRAM
+KDE_PRINT_TQT_PROGRAM
if AC_TRY_EVAL(ac_link) && test -s conftest; then
rm -f conftest*
else
echo "configure: failed program was:" >&AC_FD_CC
cat conftest.$ac_ext >&AC_FD_CC
- ac_qt_libraries="NO"
+ ac_tqt_libraries="NO"
fi
rm -f conftest*
CXXFLAGS="$ac_cxxflags_safe"
@@ -1725,103 +1502,103 @@ LDFLAGS="$ac_ldflags_safe"
LIBS="$ac_libs_safe"
AC_LANG_RESTORE
-if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
- ac_cv_have_qt="have_qt=no"
- ac_qt_notfound=""
- missing_qt_mt=""
- if test "$ac_qt_includes" = NO; then
- if test "$ac_qt_libraries" = NO; then
- ac_qt_notfound="(headers and libraries)";
+if test "$ac_tqt_includes" = NO || test "$ac_tqt_libraries" = NO; then
+ ac_cv_have_tqt="have_tqt=no"
+ ac_tqt_notfound=""
+ missing_tqt_mt=""
+ if test "$ac_tqt_includes" = NO; then
+ if test "$ac_tqt_libraries" = NO; then
+ ac_tqt_notfound="(headers and libraries)";
else
- ac_qt_notfound="(headers)";
+ ac_tqt_notfound="(headers)";
fi
else
- if test "x$kde_use_qt_mt" = "xyes"; then
- missing_qt_mt="
-Make sure that you have compiled Qt with thread support!"
- ac_qt_notfound="(library $qtlib-mt)";
+ if test "x$kde_use_tqt_mt" = "xyes"; then
+ missing_tqt_mt="
+Make sure that you have compiled TQt with thread support!"
+ ac_tqt_notfound="(library $tqtlib-mt)";
else
- ac_qt_notfound="(library $qtlib)";
+ ac_tqt_notfound="(library $tqtlib)";
fi
fi
- AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
-For more details about this problem, look at the end of config.log.$missing_qt_mt])
+ AC_MSG_ERROR([TQt ($kde_tqt_minversion) $ac_tqt_notfound not found. Please check your installation!
+For more details about this problem, look at the end of config.log.$missing_tqt_mt])
else
- have_qt="yes"
+ have_tqt="yes"
fi
])
-eval "$ac_cv_have_qt"
+eval "$ac_cv_have_tqt"
-if test "$have_qt" != yes; then
- AC_MSG_RESULT([$have_qt]);
+if test "$have_tqt" != yes; then
+ AC_MSG_RESULT([$have_tqt]);
else
- ac_cv_have_qt="have_qt=yes \
- ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
- AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT])
+ ac_cv_have_tqt="have_tqt=yes \
+ ac_tqt_includes=$ac_tqt_includes ac_tqt_libraries=$ac_tqt_libraries"
+ AC_MSG_RESULT([libraries $ac_tqt_libraries, headers $ac_tqt_includes $USING_TQT_MT])
- qt_libraries="$ac_qt_libraries"
- qt_includes="$ac_qt_includes"
+ tqt_libraries="$ac_tqt_libraries"
+ tqt_includes="$ac_tqt_includes"
fi
-if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
- KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
+if test ! "$kde_tqt_libs_given" = "yes" && test ! "$kde_tqtver" = 3; then
+ KDE_CHECK_TQT_DIRECT(tqt_libraries= ,[])
fi
-AC_SUBST(qt_libraries)
-AC_SUBST(qt_includes)
+AC_SUBST(tqt_libraries)
+AC_SUBST(tqt_includes)
-if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+if test "$tqt_includes" = "$x_includes" || test -z "$tqt_includes"; then
+ TQT_INCLUDES=""
else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$tqt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
fi
-if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
- QT_LDFLAGS=""
+if test "$tqt_libraries" = "$x_libraries" || test -z "$tqt_libraries"; then
+ TQT_LDFLAGS=""
else
- QT_LDFLAGS="-L$qt_libraries"
- all_libraries="$QT_LDFLAGS $all_libraries"
+ TQT_LDFLAGS="-L$tqt_libraries"
+ all_libraries="$TQT_LDFLAGS $all_libraries"
fi
test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
-AC_SUBST(QT_INCLUDES)
-AC_SUBST(QT_LDFLAGS)
-AC_PATH_QT_MOC_UIC
+AC_SUBST(TQT_INCLUDES)
+AC_SUBST(TQT_LDFLAGS)
+AC_PATH_TQT_MOC_UIC
KDE_CHECK_TQT
-KDE_CHECK_QT_JPEG
+KDE_CHECK_TQT_JPEG
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) $(LIBTQT_LDFLAGS)'
+if test "x$kde_use_tqt_emb" != "xyes" && test "x$kde_use_tqt_mac" != "xyes"; then
+LIB_TQT="$kde_int_tqt $LIBJPEG_TQT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) $(LIBTQT_LDFLAGS)'
else
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) $(LIBTQT_LDFLAGS)'
+LIB_TQT="$kde_int_tqt $LIBJPEG_TQT "'$(LIBZ) $(LIBPNG) $(LIBTQT_LDFLAGS)'
fi
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
-for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
+test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS"
+for a in $tqt_libdir/lib`echo ${kde_int_tqt} | sed 's,^-l,,'`_incremental.*; do
if test -e "$a"; then
- LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
+ LIB_TQT="$LIB_TQT ${kde_int_tqt}_incremental"
break
fi
done
-AC_SUBST(LIB_QT)
+AC_SUBST(LIB_TQT)
AC_SUBST(LIB_QPE)
-AC_SUBST(kde_qtver)
+AC_SUBST(kde_tqtver)
])
-AC_DEFUN([AC_PATH_QT],
+AC_DEFUN([AC_PATH_TQT],
[
-AC_PATH_QT_1_3
+AC_PATH_TQT_1_3
])
AC_DEFUN([KDE_CHECK_UIC_PLUGINS],
[
-AC_REQUIRE([AC_PATH_QT_MOC_UIC])
+AC_REQUIRE([AC_PATH_TQT_MOC_UIC])
if test x$ac_uic_supports_libpath = xyes; then
@@ -1865,10 +1642,10 @@ if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([
you need to install tdelibs first.
-If you did install tdelibs, then the Qt version that is picked up by
+If you did install tdelibs, then the TQt version that is picked up by
this configure is not the same version you used to compile tdelibs.
-The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
-_same Qt version_, compiled with the _same compiler_ and the same Qt
+The TQt Plugin installed by tdelibs is *ONLY* loadable if it is the
+_same TQt version_, compiled with the _same compiler_ and the same TQt
configuration settings.
])
fi
@@ -1979,7 +1756,7 @@ dnl
AC_DEFUN([AC_BASE_PATH_KDE],
[
AC_REQUIRE([KDE_CHECK_STL])
-AC_REQUIRE([AC_PATH_QT])dnl
+AC_REQUIRE([AC_PATH_TQT])dnl
AC_REQUIRE([KDE_CHECK_LIB64])
AC_CHECK_RPATH
@@ -2002,17 +1779,12 @@ fi
AC_CACHE_VAL(ac_cv_have_kde,
[#try to guess kde locations
-if test "$kde_qtver" = 1; then
- kde_check_header="ksock.h"
- kde_check_lib="libtdecore.la"
-else
- kde_check_header="ksharedptr.h"
- kde_check_lib="libtdeio.la"
-fi
+kde_check_header="ksharedptr.h"
+kde_check_lib="libtdeio.la"
if test -z "$1"; then
-kde_incdirs="$kde_libs_prefix/include /opt/trinity/include/tde /opt/trinity/include/tde /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
+kde_incdirs="$kde_libs_prefix/include /opt/trinity/include/tde /opt/trinity/include/tde /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/trinity/include /opt/kde/include $x_includes $tqt_includes"
test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@@ -2095,17 +1867,17 @@ fi
AC_SUBST(kde_libraries)
AC_SUBST(kde_includes)
-if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" || test "$kde_includes" = "/usr/include"; then
+if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$tqt_includes" || test "$kde_includes" = "/usr/include"; then
KDE_INCLUDES=""
else
KDE_INCLUDES="-I$kde_includes"
all_includes="$KDE_INCLUDES $all_includes"
fi
-KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION"
+KDE_DEFAULT_CXXFLAGS="-DTQT_CLEAN_NAMESPACE -DTQT_NO_ASCII_CAST -DTQT_NO_STL -DTQT_NO_COMPAT -DTQT_NO_TRANSLATION"
KDE_LDFLAGS="-L$kde_libraries"
-if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then
+if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$tqt_libraries" ; then
all_libraries="$KDE_LDFLAGS $all_libraries"
fi
@@ -2184,84 +1956,29 @@ AC_MSG_RESULT($kde_use_extra_libs)
])
-AC_DEFUN([KDE_1_CHECK_PATH_HEADERS],
+AC_DEFUN([KDE_CHECK_KDETQTADDON],
[
- AC_MSG_CHECKING([for TDE headers installed])
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-cat > conftest.$ac_ext <<EOF
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-#include <stdio.h>
-#include "confdefs.h"
-#include <kapp.h>
-
-int main() {
- printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
- printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
- printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
- printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
- printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
- printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
- printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
- printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
- printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
- printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
- printf("kde_wallpaperdir=\\"%s\\"\n",
- TDEApplication::kde_wallpaperdir().data());
- printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
- printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
- printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
- printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
- printf("kde_moduledir=\\"/tmp/dummy\\"\n");
- printf("kde_styledir=\\"/tmp/dummy\\"\n");
- printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
- printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
- printf("xdg_menudir=\\"/tmp/dummy\\"\n");
- printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
- printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
- return 0;
- }
-EOF
-
- ac_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$all_includes $CPPFLAGS"
- if AC_TRY_EVAL(ac_compile); then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_ERROR([your system is not able to compile a small TDE application!
-Check, if you installed the TDE header files correctly.
-For more details about this problem, look at the end of config.log.])
- fi
- CPPFLAGS=$ac_save_CPPFLAGS
-
- AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_CHECK_KDEQTADDON],
-[
-AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
+AC_MSG_CHECKING(for kde-tqt-addon)
+AC_CACHE_VAL(kde_cv_have_kdetqtaddon,
[
kde_ldflags_safe="$LDFLAGS"
kde_libs_safe="$LIBS"
kde_cxxflags_safe="$CXXFLAGS"
- LIBS="-lkde-qt-addon $LIBQT $LIBS"
+ LIBS="-lkde-tqt-addon $LIBTQT $LIBS"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
-if test "$kde_qtver" = "3"; then
-if $PKG_CONFIG --exists qt-mt ; then
+if test "$kde_tqtver" = "3"; then
+if $PKG_CONFIG --exists tqt-mt ; then
AC_TRY_LINK([
#include <qdom.h>
],
[
QDomDocument doc;
],
- kde_cv_have_kdeqtaddon=yes,
- kde_cv_have_kdeqtaddon=no
+ kde_cv_have_kdetqtaddon=yes,
+ kde_cv_have_kdetqtaddon=no
)
else
AC_TRY_LINK([
@@ -2270,34 +1987,17 @@ else
[
TQDomDocument doc;
],
- kde_cv_have_kdeqtaddon=yes,
- kde_cv_have_kdeqtaddon=no
+ kde_cv_have_kdetqtaddon=yes,
+ kde_cv_have_kdetqtaddon=no
)
fi
fi
-if test "$kde_qtver" = "4"; then
- AC_TRY_LINK([
- #include <Qt/qdom.h>
- ],
- [
- QDomDocument doc;
- ],
- kde_cv_have_kdeqtaddon=yes,
- kde_cv_have_kdeqtaddon=no
- )
-
- LDFLAGS=$kde_ldflags_safe
- LIBS=$kde_libs_safe
- CXXFLAGS=$kde_cxxflags_safe
-])
-fi
-
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
+AC_MSG_RESULT($kde_cv_have_kdetqtaddon)
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
- AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
-It is a separate package (and CVS module) named kde-qt-addon.])
+if test "$kde_cv_have_kdetqtaddon" = "no"; then
+ AC_MSG_ERROR([Can't find libkde-tqt-addon. You need to install it first.
+It is a separate package (and CVS module) named kde-tqt-addon.])
fi
])
@@ -2307,33 +2007,7 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
AC_REQUIRE([KDE_CHECK_LIBDL])
AC_REQUIRE([K_PATH_X])
-if test $kde_qtver = 4; then
- case $host in
- *cygwin*) lib_kded="-ltdeinit_kded" ;;
- *) lib_kded="" ;;
- esac
- AC_SUBST(LIB_KDED, $lib_kded)
- AC_SUBST(LIB_TDECORE, "-ltdecore")
- AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_TDEIO, "-ltdeio")
- AC_SUBST(LIB_KJS, "-lkjs")
- AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_KAB, "-lkab")
- AC_SUBST(LIB_TDEABC, "-ltdeabc")
- AC_SUBST(LIB_TDEHTML, "-ltdehtml")
- AC_SUBST(LIB_TDESPELL, "-ltdespell")
- AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
- AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
- AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
- AC_SUBST(LIB_TDEPIM, "-ltdepim")
- AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
- AC_SUBST(LIB_TDENEWSTUFF, "-ltdenewstuff")
- AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
- AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
-# these are for backward compatibility
- AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
- AC_SUBST(LIB_TDEFILE, "-ltdeio")
-elif test $kde_qtver = 3; then
+if test $kde_tqtver = 3; then
case $host in
*cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;;
@@ -2359,24 +2033,6 @@ elif test $kde_qtver = 3; then
# these are for backward compatibility
AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_TDEFILE, "-ltdeio")
-elif test $kde_qtver = 2; then
- AC_SUBST(LIB_TDECORE, "-ltdecore")
- AC_SUBST(LIB_TDEUI, "-ltdeui")
- AC_SUBST(LIB_TDEIO, "-ltdeio")
- AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
- AC_SUBST(LIB_SMB, "-lsmb")
- AC_SUBST(LIB_TDEFILE, "-ltdefile")
- AC_SUBST(LIB_KAB, "-lkab")
- AC_SUBST(LIB_TDEHTML, "-ltdehtml")
- AC_SUBST(LIB_TDESPELL, "-ltdespell")
- AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
- AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-else
- AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
- AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
- AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
- AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
- AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])
@@ -2391,10 +2047,6 @@ AC_DEFUN([AC_PATH_KDE],
fi
],
[
- if test "$kde_qtver" = 1;
- then ac_use_path_checking=""
- else ac_use_path_checking="default"
- fi
]
)
@@ -2418,10 +2070,10 @@ LIBS="$LIBS $X_EXTRA_LIBS"
if test "$GXX" = "yes"; then
CXXFLAGS="$CXXFLAGS -pedantic-errors"
fi
-if test -z "$qt_includes"; then
+if test -z "$tqt_includes"; then
CXXFLAGS="$CXXFLAGS"
else
- CXXFLAGS="$CXXFLAGS -I$qt_includes"
+ CXXFLAGS="$CXXFLAGS -I$tqt_includes"
fi
AC_TRY_COMPILE([
$2
@@ -2739,7 +2391,7 @@ AC_DEFUN([AC_FIND_GIF],
[AC_MSG_CHECKING([for giflib])
AC_CACHE_VAL(ac_cv_lib_gif,
[ac_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
+if test "x$kde_use_tqt_emb" != "xyes" && test "x$kde_use_tqt_mac" != "xyes"; then
LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
else
LIBS="$all_libraries -lgif"
@@ -2865,10 +2517,10 @@ AC_CACHE_VAL(kde_cv_tqt,
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS $LIBQT -ltqt"
+LIBS="$all_libraries $USER_LDFLAGS $LIBTQT -ltqt"
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-if test "$kde_qtver" -gt "2"; then
+if test "$kde_tqtver" -gt "2"; then
AC_TRY_LINK(
[#include <tqtimer.h>],
[
@@ -2884,25 +2536,25 @@ AC_LANG_RESTORE
if eval "test ! \"`echo $kde_cv_tqt`\" = no"; then
AC_MSG_RESULT(no)
-dnl AC_MSG_ERROR([You are attempting to compile Trinity without the Trinity Qt Interface installed. Please install libtqtinterface-dev and try again!])
- AC_MSG_WARN([You are attempting to compile Trinity without the Trinity Qt Interface installed. Please install libtqtinterface-dev and try again!])
+dnl AC_MSG_ERROR([You are attempting to compile Trinity without the Trinity TQt Interface installed. Please install libtqtinterface-dev and try again!])
+ AC_MSG_WARN([You are attempting to compile Trinity without the Trinity TQt Interface installed. Please install libtqtinterface-dev and try again!])
TQTMOC="\$PATH=\$PATH:\$(srcdir)/ tmoc"
LIBTQT_LDFLAGS="-ltqt"
AC_SUBST(LIBTQT_LDFLAGS)
- qtlib="$qtlib $LIBTQT_LDFLAGS"
+ tqtlib="$tqtlib $LIBTQT_LDFLAGS"
else
AC_MSG_RESULT(yes)
LIBTQT_LDFLAGS="-ltqt"
AC_SUBST(LIBTQT_LDFLAGS)
dnl all_libraries="$all_libraries $LIBTQT_LDFLAGS"
- QT_LDFLAGS="$QT_LDFLAGS $LIBTQT_LDFLAGS"
- AC_SUBST(QT_LDFLAGS)
- qtlib="$qtlib $LIBTQT_LDFLAGS"
+ TQT_LDFLAGS="$TQT_LDFLAGS $LIBTQT_LDFLAGS"
+ AC_SUBST(TQT_LDFLAGS)
+ tqtlib="$tqtlib $LIBTQT_LDFLAGS"
LIBTQT_CXXFLAGS="-include tqt.h"
all_includes="$all_includes $LIBTQT_CXXFLAGS"
- QT_INCLUDES="$QT_INCLUDES $LIBTQT_CXXFLAGS"
+ TQT_INCLUDES="$TQT_INCLUDES $LIBTQT_CXXFLAGS"
- KDE_FIND_PATH(tmoc, TQTMOC, [$qt_bindirs], [KDE_TQTMOC_ERROR_MESSAGE])
+ KDE_FIND_PATH(tmoc, TQTMOC, [$tqt_bindirs], [KDE_TQTMOC_ERROR_MESSAGE])
AC_SUBST(TQTMOC)
KDE_FIND_PATH(dcopidl, TQTDCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
@@ -2920,39 +2572,29 @@ fi
])
-AC_DEFUN([KDE_CHECK_QT_JPEG],
+AC_DEFUN([KDE_CHECK_TQT_JPEG],
[
if test -n "$LIBJPEG"; then
-AC_MSG_CHECKING([if Qt needs $LIBJPEG])
-AC_CACHE_VAL(kde_cv_qt_jpeg,
+AC_MSG_CHECKING([if TQt needs $LIBJPEG])
+AC_CACHE_VAL(kde_cv_tqt_jpeg,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
+LIBS="$all_libraries $USER_LDFLAGS $LIBTQT"
LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-if test "$kde_qtver" = "4"; then
-AC_TRY_LINK(
-[#include <Qt/qapplication.h>],
- [
- int argc;
- char** argv;
- QApplication app(argc, argv);],
- eval "kde_cv_qt_jpeg=no",
- eval "kde_cv_qt_jpeg=yes")
-fi
-if test "$kde_qtver" = "3"; then
-if $PKG_CONFIG --exists qt-mt ; then
+if test "$kde_tqtver" = "3"; then
+if $PKG_CONFIG --exists tqt-mt ; then
AC_TRY_LINK(
[#include <qapplication.h>],
[
int argc;
char** argv;
QApplication app(argc, argv);],
- eval "kde_cv_qt_jpeg=no",
- eval "kde_cv_qt_jpeg=yes")
+ eval "kde_cv_tqt_jpeg=no",
+ eval "kde_cv_tqt_jpeg=yes")
else
AC_TRY_LINK(
[#include <tqapplication.h>],
@@ -2960,8 +2602,8 @@ AC_TRY_LINK(
int argc;
char** argv;
TQApplication app(argc, argv);],
- eval "kde_cv_qt_jpeg=no",
- eval "kde_cv_qt_jpeg=yes")
+ eval "kde_cv_tqt_jpeg=no",
+ eval "kde_cv_tqt_jpeg=yes")
fi
fi
LIBS="$ac_save_LIBS"
@@ -2970,12 +2612,12 @@ AC_LANG_RESTORE
fi
])
-if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
+if eval "test ! \"`echo $kde_cv_tqt_jpeg`\" = no"; then
AC_MSG_RESULT(yes)
- LIBJPEG_QT='$(LIBJPEG)'
+ LIBJPEG_TQT='$(LIBJPEG)'
else
AC_MSG_RESULT(no)
- LIBJPEG_QT=
+ LIBJPEG_TQT=
fi
])
@@ -3032,7 +2674,7 @@ AC_CACHE_VAL(kde_cv_libtiff_$1,
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
kde_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
+if test "x$kde_use_tqt_emb" != "xyes" && test "x$kde_use_tqt_mac" != "xyes"; then
LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
else
LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm"
@@ -3164,7 +2806,7 @@ AC_MSG_CHECKING([for libpng])
AC_CACHE_VAL(ac_cv_lib_png,
[
kde_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
+if test "x$kde_use_tqt_emb" != "xyes" && test "x$kde_use_tqt_mac" != "xyes"; then
LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
else
LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
@@ -3416,7 +3058,7 @@ AC_DEFUN([KDE_CHECK_FOR_OPT_NOINLINE_MATCH],
dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
[dnl
-if test "x$kde_use_qt_emb" != "xyes"; then
+if test "x$kde_use_tqt_emb" != "xyes"; then
AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath])
AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath])
else
@@ -3639,7 +3281,7 @@ AC_DEFUN([AC_CHECK_COMPILERS],
AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
if test "$CXX" = "KCC"; then
dnl unfortunately we currently cannot disable exception support in KCC
- dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
+ dnl because doing so is binary incompatible and TQt by default links with exceptions :-(
dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"])
dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS= )
@@ -3764,7 +3406,7 @@ AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
[
- AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
+ AC_BEFORE([AC_PATH_TQT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
AC_MSG_CHECKING([grepping for visibility push/pop in headers])
@@ -3800,7 +3442,7 @@ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
[kde_have_gcc_visibility=$enableval],
[kde_have_gcc_visibility=no])
- AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
+ AC_CACHE_CHECK([if TQt is patched for -fvisibility], kde_cv_val_tqt_gcc_visibility_patched,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
@@ -3808,8 +3450,8 @@ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
safe_CXXFLAGS=$CXXFLAGS
CXXFLAGS="$CXXFLAGS $all_includes"
-if test "$kde_qtver" = "3"; then
-if $PKG_CONFIG --exists qt-mt ; then
+if test "$kde_tqtver" = "3"; then
+if $PKG_CONFIG --exists tqt-mt ; then
AC_TRY_COMPILE(
[
#include <tqt.h>
@@ -3819,7 +3461,7 @@ if $PKG_CONFIG --exists qt-mt ; then
/* if Q_EXPORT is nonempty, this will break compilation */
#endif
], [/* elvis is alive */],
- kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+ kde_cv_val_tqt_gcc_visibility_patched=no, kde_cv_val_tqt_gcc_visibility_patched=yes)
else
AC_TRY_COMPILE(
[
@@ -3829,28 +3471,16 @@ else
/* if Q_EXPORT is nonempty, this will break compilation */
#endif
], [/* elvis is alive */],
- kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+ kde_cv_val_tqt_gcc_visibility_patched=no, kde_cv_val_tqt_gcc_visibility_patched=yes)
fi
fi
-if test "$kde_qtver" = "4"; then
-AC_TRY_COMPILE(
- [
-#include <Qt/qglobal.h>
-#if Q_EXPORT - 0 != 0
-/* if this compiles, then Q_EXPORT is undefined */
-/* if Q_EXPORT is nonempty, this will break compilation */
-#endif
- ], [/* elvis is alive */],
- kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
-fi
-
CXXFLAGS=$safe_CXXFLAGS
AC_LANG_RESTORE
]
)
- if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
+ if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_tqt_gcc_visibility_patched = "xyes"; then
CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
KDE_CHECK_VISIBILITY_GCC_BUG
HAVE_GCC_VISIBILITY=1
@@ -3970,8 +3600,8 @@ if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
KDE_RPATH="$KDE_RPATH -R \$(kde_libraries)"
fi
- if test -n "$qt_libraries"; then
- KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
+ if test -n "$tqt_libraries"; then
+ KDE_RPATH="$KDE_RPATH -R \$(tqt_libraries)"
fi
dnl $x_libraries is set to /usr/lib in case
if test -n "$X_LDFLAGS"; then
@@ -4259,7 +3889,7 @@ AC_DEFUN([AC_HAVE_XPM],
[
ac_save_ldflags="$LDFLAGS"
ac_save_cflags="$CFLAGS"
- if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
+ if test "x$kde_use_tqt_emb" != "xyes" && test "x$kde_use_tqt_mac" != "xyes"; then
LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
else
LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET"
@@ -4315,7 +3945,7 @@ AC_DEFUN([AC_HAVE_DPMS],
dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms".
AC_CACHE_VAL(ac_cv_have_dpms,
[
- if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then
+ if test "x$kde_use_tqt_emb" = "xyes" || test "x$kde_use_tqt_mac" = "xyes"; then
AC_MSG_RESULT(no)
ac_cv_have_dpms="no"
else
@@ -4405,8 +4035,8 @@ AC_DEFUN([AC_HAVE_GL],
AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]),
gl_test=$withval, gl_test="yes")
- if test "x$kde_use_qt_emb" = "xyes"; then
- # GL and Qt Embedded is a no-go for now.
+ if test "x$kde_use_tqt_emb" = "xyes"; then
+ # GL and TQt Embedded is a no-go for now.
ac_cv_have_gl=no
elif test "x$gl_test" = xno; then
ac_cv_have_gl=no
@@ -4421,7 +4051,7 @@ AC_DEFUN([AC_HAVE_GL],
ac_save_libs=$LIBS
LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
LIBS="$LIBS -L/usr/lib/mesa -lGL -lGLU"
- test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
+ test "x$kde_use_tqt_mac" != xyes && test "x$kde_use_tqt_emb" != xyes && LIBS="$LIBS -lX11"
LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
CXXFLAGS="$CFLAGS $X_INCLUDES"
test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
@@ -5040,10 +4670,10 @@ AC_DEFUN([KDE_CHECK_STL],
AC_LANG_CPLUSPLUS
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
- if test -z "$qt_includes"; then
+ if test -z "$tqt_includes"; then
CXXFLAGS="$CXXFLAGS"
else
- CXXFLAGS="$CXXFLAGS -I$qt_includes"
+ CXXFLAGS="$CXXFLAGS -I$tqt_includes"
fi
AC_MSG_CHECKING([if C++ programs can be compiled])
@@ -5086,10 +4716,10 @@ AC_LANG_CPLUSPLUS
ac_save_LIBS="$LIBS"
ac_save_CXXFLAGS="$CXXFLAGS"
-if test "$kde_qtver" = "3"; then
-LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-if $PKG_CONFIG --exists qt-mt ; then
+if test "$kde_tqtver" = "3"; then
+LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBTQT"
+CXXFLAGS="$CXXFLAGS -I$tqt_incdir $all_includes"
+if $PKG_CONFIG --exists tqt-mt ; then
AC_TRY_RUN(dnl
[
#include <qimageio.h>
@@ -5120,24 +4750,6 @@ int main() {
fi
fi
-if test "$kde_qtver" = "4"; then
-LIBS="$all_libraries -lpng -lz $LIBJPEG $LIBQT"
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-AC_TRY_RUN(dnl
-[
-#include <tqimageio.h>
-#include <tqstring.h>
-int main() {
- QString t = "hallo";
- t.fill('t');
- qInitImageIO();
-}
-],
- ac_cv_lib_qimgio=yes,
- ac_cv_lib_qimgio=no,
- ac_cv_lib_qimgio=no)
-fi
-
LIBS="$ac_save_LIBS"
CXXFLAGS="$ac_save_CXXFLAGS"
AC_LANG_RESTORE
@@ -5145,7 +4757,7 @@ AC_LANG_RESTORE
if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then
LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG"
AC_MSG_RESULT(yes)
- AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available])
+ AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the TQt extension qimgio available])
AC_SUBST(LIBQIMGIO)
else
AC_MSG_RESULT(not found)
@@ -5940,63 +5552,63 @@ fi
AC_SUBST(LEXLIB)
])
-AC_DEFUN([AC_PATH_QTOPIA],
+AC_DEFUN([AC_PATH_TQTOPIA],
[
dnl TODO: use AC_CACHE_VAL
if test -z "$1"; then
- qtopia_minver_maj=1
- qtopia_minver_min=5
- qtopia_minver_pat=0
+ tqtopia_minver_maj=1
+ tqtopia_minver_min=5
+ tqtopia_minver_pat=0
else
- qtopia_minver_maj=`echo "$1" | sed -e "s/^\(.*\)\..*\..*$/\1/"`
- qtopia_minver_min=`echo "$1" | sed -e "s/^.*\.\(.*\)\..*$/\1/"`
- qtopia_minver_pat=`echo "$1" | sed -e "s/^.*\..*\.\(.*\)$/\1/"`
+ tqtopia_minver_maj=`echo "$1" | sed -e "s/^\(.*\)\..*\..*$/\1/"`
+ tqtopia_minver_min=`echo "$1" | sed -e "s/^.*\.\(.*\)\..*$/\1/"`
+ tqtopia_minver_pat=`echo "$1" | sed -e "s/^.*\..*\.\(.*\)$/\1/"`
fi
- qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat"
- qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat"
+ tqtopia_minver="$tqtopia_minver_maj$tqtopia_minver_min$tqtopia_minver_pat"
+ tqtopia_minverstr="$tqtopia_minver_maj.$tqtopia_minver_min.$tqtopia_minver_pat"
- AC_REQUIRE([AC_PATH_QT])
+ AC_REQUIRE([AC_PATH_TQT])
- AC_MSG_CHECKING([for Qtopia])
+ AC_MSG_CHECKING([for TQtopia])
- LIB_QTOPIA="-lqpe"
- AC_SUBST(LIB_QTOPIA)
+ LIB_TQTOPIA="-lqpe"
+ AC_SUBST(LIB_TQTOPIA)
- kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
+ kde_tqtopia_dirs="$QPEDIR /opt/TQtopia"
- ac_qtopia_incdir=NO
+ ac_tqtopia_incdir=NO
- AC_ARG_WITH(qtopia-dir,
- AC_HELP_STRING([--with-qtopia-dir=DIR],[where the root of Qtopia is installed]),
- [ ac_qtopia_incdir="$withval"/include] )
+ AC_ARG_WITH(tqtopia-dir,
+ AC_HELP_STRING([--with-tqtopia-dir=DIR],[where the root of TQtopia is installed]),
+ [ ac_tqtopia_incdir="$withval"/include] )
- qtopia_incdirs=""
- for dir in $kde_qtopia_dirs; do
- qtopia_incdirs="$qtopia_incdirs $dir/include"
+ tqtopia_incdirs=""
+ for dir in $kde_tqtopia_dirs; do
+ tqtopia_incdirs="$tqtopia_incdirs $dir/include"
done
- if test ! "$ac_qtopia_incdir" = "NO"; then
- qtopia_incdirs="$ac_qtopia_incdir $qtopia_incdirs"
+ if test ! "$ac_tqtopia_incdir" = "NO"; then
+ tqtopia_incdirs="$ac_tqtopia_incdir $tqtopia_incdirs"
fi
- qtopia_incdir=""
- AC_FIND_FILE(qpe/qpeapplication.h, $qtopia_incdirs, qtopia_incdir)
- ac_qtopia_incdir="$qtopia_incdir"
+ tqtopia_incdir=""
+ AC_FIND_FILE(qpe/qpeapplication.h, $tqtopia_incdirs, tqtopia_incdir)
+ ac_tqtopia_incdir="$tqtopia_incdir"
- if test -z "$qtopia_incdir"; then
- AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.])
+ if test -z "$tqtopia_incdir"; then
+ AC_MSG_ERROR([Cannot find TQtopia headers. Please check your installation.])
fi
- qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`;
- qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`;
- qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`;
+ tqtopia_ver_maj=`cat $tqtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`;
+ tqtopia_ver_min=`cat $tqtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`;
+ tqtopia_ver_pat=`cat $tqtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`;
- qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat"
- qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat"
- if test "$qtopia_ver" -lt "$qtopia_minver"; then
- AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr
+ tqtopia_ver="$tqtopia_ver_maj$tqtopia_ver_min$tqtopia_ver_pat"
+ tqtopia_verstr="$tqtopia_ver_maj.$tqtopia_ver_min.$tqtopia_ver_pat"
+ if test "$tqtopia_ver" -lt "$tqtopia_minver"; then
+ AC_MSG_ERROR([found TQtopia version $tqtopia_verstr but version $tqtopia_minverstr
is required.])
fi
@@ -6007,9 +5619,9 @@ is required.])
ac_ldflags_safe="$LDFLAGS"
ac_libs_safe="$LIBS"
- CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
- LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
- LIBS="$LIBS $LIB_QTOPIA $LIBQT"
+ CXXFLAGS="$CXXFLAGS -I$tqtopia_incdir $all_includes"
+ LDFLAGS="$LDFLAGS $TQT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
+ LIBS="$LIBS $LIB_TQTOPIA $LIBTQT"
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
@@ -6027,7 +5639,7 @@ EOF
rm -f conftest*
else
rm -f conftest*
- AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at
+ AC_MSG_ERROR([Cannot link small TQtopia Application. For more details look at
the end of config.log])
fi
@@ -6037,25 +5649,25 @@ the end of config.log])
AC_LANG_RESTORE
- QTOPIA_INCLUDES="-I$qtopia_incdir"
- AC_SUBST(QTOPIA_INCLUDES)
+ TQTOPIA_INCLUDES="-I$tqtopia_incdir"
+ AC_SUBST(TQTOPIA_INCLUDES)
- AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir])
+ AC_MSG_RESULT([found version $tqtopia_verstr with headers at $tqtopia_incdir])
])
AC_DEFUN([KDE_INIT_DOXYGEN],
[
-AC_MSG_CHECKING([for Qt docs])
-kde_qtdir=
-if test "${with_qt_dir+set}" = set; then
- kde_qtdir="$with_qt_dir"
+AC_MSG_CHECKING([for TQt docs])
+kde_tqtdir=
+if test "${with_tqt_dir+set}" = set; then
+ kde_tqtdir="$with_tqt_dir"
fi
-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/tqt3/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/tqt3/doc /usr/lib/qt3/doc /usr/lib/tqt3/doc/html /usr/lib/qt3/doc/html /usr/doc/tqt3/html /usr/doc/qt3/html /usr/doc/tqt3 /usr/doc/qt3 /usr/share/doc/tqt3-doc /usr/share/doc/qt3-doc /usr/share/tqt3/doc/html /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-AC_MSG_RESULT($QTDOCDIR)
+AC_FIND_FILE(qsql.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_SUBST(QTDOCDIR)
+AC_SUBST(TQTDOCDIR)
KDE_FIND_PATH(dot, DOT, [], [])
if test -n "$DOT"; then
@@ -6073,7 +5685,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)
@@ -6781,20 +6393,20 @@ AC_DEFUN([AC_PDF_GENERATION], [
dnl Macro to check for KDChart include and library files
dnl Availability of KDChart defaults to 'no'
-AC_DEFUN([AC_QTDESIGNER_SUPPORT],
+AC_DEFUN([AC_TQTDESIGNER_SUPPORT],
[
-AC_MSG_CHECKING([if library for Qt-Designer widgets should be installed])
-AC_ARG_ENABLE(qtdesigner,
- AC_HELP_STRING([--enable-qtdesigner],[Install KMyMoney specific widget library for Qt-Designer (default=no)]),
+AC_MSG_CHECKING([if library for TQt-Designer widgets should be installed])
+AC_ARG_ENABLE(tqtdesigner,
+ AC_HELP_STRING([--enable-tqtdesigner],[Install KMyMoney specific widget library for TQt-Designer (default=no)]),
[
- enable_qtdesigner="$enableval"
- AC_MSG_RESULT($enable_qtdesigner)
+ enable_tqtdesigner="$enableval"
+ AC_MSG_RESULT($enable_tqtdesigner)
],
[
- enable_qtdesigner="no"
- AC_MSG_RESULT($enable_qtdesigner)
+ enable_tqtdesigner="no"
+ AC_MSG_RESULT($enable_tqtdesigner)
])
- AM_CONDITIONAL(INSTALL_QTDESIGNER_SUPPORT, test "$enable_qtdesigner" = "yes")
+ AM_CONDITIONAL(INSTALL_TQTDESIGNER_SUPPORT, test "$enable_tqtdesigner" = "yes")
])
# sqlite3.m4
# ----------
@@ -6803,7 +6415,7 @@ AC_ARG_ENABLE(qtdesigner,
#
# License: See file COPYING
#
-# Checks for the necessity to build our own qt-sqlite3 support library
+# Checks for the necessity to build our own tqt-sqlite3 support library
# and the presence of the sqlite3 development headers.
#
# Supports the following options:
@@ -6819,7 +6431,7 @@ AC_ARG_ENABLE(qtdesigner,
# The following variables are provided via AC_SUBST:
#
# SQLITE3 - contains the subdirectory to visit for compilation
-# LIBSQLITE3 - contains the full pathname for the Qt plugin driver
+# LIBSQLITE3 - contains the full pathname for the TQt plugin driver
AC_DEFUN([AC_SQLITE3], [
@@ -6832,27 +6444,27 @@ AC_DEFUN([AC_SQLITE3], [
if test ! $enable_sqlite3 = no; then
# determine name and path of sqlite3 plugin library
- qtlib=""
+ tqtlib=""
if test ! "lib${tdelibsuff}" = "lib"; then
- qtlib=".lib64"
+ 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
- qt_plugins_dir="`pkg-config --variable=pluginsdir qt-mt`"
+ if $PKG_CONFIG --exists tqt-mt ; then
+ tqt_plugins_dir="`pkg-config --variable=pluginsdir tqt-mt`"
else
if $PKG_CONFIG --exists tqt-mt ; then
- qt_plugins_dir="`pkg-config --variable=pluginsdir tqt-mt`"
+ tqt_plugins_dir="`pkg-config --variable=pluginsdir tqt-mt`"
fi
fi
fi
- if test "x$qt_plugins_dir" = "x"; then
- qt_plugins_dir=${QTDIR}/plugins
+ if test "x$tqt_plugins_dir" = "x"; then
+ tqt_plugins_dir=${TQTDIR}/plugins
fi
- LIBSQLITE3=${qt_plugins_dir}/sqldrivers/libqsqlite3${qtlib}.so
+ LIBSQLITE3=${tqt_plugins_dir}/sqldrivers/libqsqlite3${tqtlib}.so
# do the checks
if test $enable_sqlite3 = auto; then
@@ -6860,13 +6472,13 @@ AC_DEFUN([AC_SQLITE3], [
if test ! -e ${LIBSQLITE3}; then
result=no
else
- # add check for local qt-sqlite3 directory here
+ # add check for local tqt-sqlite3 directory here
result=yes
enable_sqlite3=no
# in case a previous run unpacked the SQLITE3 support stuff
# it is pretty sure that we have build the existing support
# if that's the case, we just enable it again
- if test -d qt-sqlite3-0.2; then
+ if test -d tqt-sqlite3-0.2; then
enable_sqlite3=auto
fi
fi
@@ -6888,23 +6500,23 @@ 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" ])
fi
if test $enable_sqlite3 = yes; then
- rm -rf qt-sqlite3-0.2
- gunzip -c `dirname -- ${0}`/23011-qt-sqlite3-0.2.tar.gz | tar -xf -
- cd qt-sqlite3-0.2
+ rm -rf tqt-sqlite3-0.2
+ gunzip -c `dirname -- ${0}`/23011-tqt-sqlite3-0.2.tar.gz | tar -xf -
+ cd tqt-sqlite3-0.2
${ac_qmake} QMAKE=${ac_qmake}
- SQLITE3=qt-sqlite3-0.2
+ SQLITE3=tqt-sqlite3-0.2
sed -i s/^install:.*$// Makefile
sed -i s/^uninstall:.*$// Makefile
# create the targets required for 'make distcheck' and 'make [un]install'
diff --git a/am_edit b/am_edit
index 6513778..1acfaa6 100644
--- a/am_edit
+++ b/am_edit
@@ -566,7 +566,7 @@ sub initialise ()
%kdeopts = ();
$kdeopts{"foreign"} = 0;
- $kdeopts{"qtonly"} = 0;
+ $kdeopts{"tqtonly"} = 0;
$kdeopts{"noautodist"} = 0;
$kdeopts{"foreign-libtool"} = $foreign_libtool;
$kdeopts{"nofinal"} = !$use_final; # default
@@ -1361,7 +1361,7 @@ sub tag_UIFILES ()
my $dep_lines = "$source.$cxxsuffix: $sourcedir$source.ui $source.h $source.moc\n";
$dep_lines .= "\trm -f $source.$cxxsuffix\n";
- if (!$kdeopts{"qtonly"}) {
+ if (!$kdeopts{"tqtonly"}) {
$dep_lines .= "\techo '#include <kdialog.h>' > $source.$cxxsuffix\n";
$dep_lines .= "\techo '#include <tdelocale.h>' >> $source.$cxxsuffix\n";
my ($mangled_source) = $source;
@@ -1375,7 +1375,7 @@ sub tag_UIFILES ()
$dep_lines .= "\tif test \"\$\$ret\" = 0; then echo '#include \"$source.moc\"' >> $source.$cxxsuffix; else rm -f $source.$cxxsuffix ; exit \$\$ret ; fi\n\n";
$dep_lines .= "$source.h: $sourcedir$source.ui\n";
$dep_lines .= "\trm -rf $source.h;\n";
- if (!$kdeopts{"qtonly"}) {
+ if (!$kdeopts{"tqtonly"}) {
$dep_lines .= "\t\$(UIC) $sourcedir$source.ui | \$(PERL) -pi -e \"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";
} else {
$dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n";
@@ -2301,7 +2301,7 @@ sub make_bcheck_target()
sub make_meta_classes ()
{
- return if ($kdeopts{"qtonly"});
+ return if ($kdeopts{"tqtonly"});
my $cppFile;
my $hFile;
diff --git a/configure.in.bot.end b/configure.in.bot.end
index 3c902f9..a3d9780 100644
--- a/configure.in.bot.end
+++ b/configure.in.bot.end
@@ -16,17 +16,17 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
fi
fi
-if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
+if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_tqt_gcc_visibility_patched = "xno"; then
echo ""
- echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
+ echo "Your GCC supports symbol visibility, but the patch for TQt supporting visibility"
echo "was not included. Therefore, GCC symbol visibility support remains disabled."
echo ""
- echo "For better performance, consider including the Qt visibility supporting patch"
+ echo "For better performance, consider including the TQt visibility supporting patch"
echo "located at:"
echo ""
echo "http://bugs.kde.org/show_bug.cgi?id=109386"
echo ""
- echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
+ echo "and recompile all of TQt and KDE. Note, this is entirely optional and"
echo "everything will continue to work just fine without it."
echo ""
fi
diff --git a/configure.in.min b/configure.in.min
index 9e52090..f14af0b 100644
--- a/configure.in.min
+++ b/configure.in.min
@@ -55,5 +55,5 @@ dnl for NLS support. Call them in this order!
dnl WITH_NLS is for the po files
AM_KDE_WITH_NLS
-dnl KDE_USE_QT
+dnl KDE_USE_TQT
AC_PATH_KDE
diff --git a/cvs.sh b/cvs.sh
index 0f8ce8d..7e0bbf2 100644
--- a/cvs.sh
+++ b/cvs.sh
@@ -225,7 +225,7 @@ touch stamp-h.in
configure_in()
{
rm -f configure.in configure.in.new
-kde_use_qt_param=
+kde_use_tqt_param=
test -f configure.files || { echo "need configure.files for configure.in"; exit 1; }
list=`fgrep -v "configure.in.bot" < configure.files | fgrep -v "configure.in.mid"`
: > configure.in.new
@@ -291,7 +291,7 @@ echo "AC_OUTPUT" >> configure.in.new
modulename=
if test -f configure.in.in; then
if head -n 2 configure.in.in | egrep "^#MIN_CONFIG\(.*\)$" > /dev/null; then
- kde_use_qt_param=`cat configure.in.in | sed -n -e "s/#MIN_CONFIG(\(.*\))/\1/p"`
+ kde_use_tqt_param=`cat configure.in.in | sed -n -e "s/#MIN_CONFIG(\(.*\))/\1/p"`
fi
if head -n 2 configure.in.in | egrep "^#MIN_CONFIG" > /dev/null; then
line=`grep "^AM_INIT_AUTOMAKE(" configure.in.in`
@@ -313,8 +313,8 @@ if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
modulename=`echo $modulename | sed -e "s#-$esc_VERSION##"`
fi
-if test -n "$kde_use_qt_param"; then
- sed -e "s#^dnl KDE_USE_QT#KDE_USE_QT($kde_use_qt_param)#" \
+if test -n "$kde_use_tqt_param"; then
+ sed -e "s#^dnl KDE_USE_TQT#KDE_USE_TQT($kde_use_tqt_param)#" \
configure.in.new > configure.in && mv configure.in configure.in.new
fi
sed -e "s#@MODULENAME@#$modulename#" configure.in.new |
diff --git a/debianrules b/debianrules
index b6426e9..e3ecd93 100755
--- a/debianrules
+++ b/debianrules
@@ -12,7 +12,7 @@ $sysconfdir = "/etc";
$kde_includedir = "$kde_prefix/include/tde";
$infodir = "$kde_prefix/share/info";
$mandir = "$kde_prefix/share/man";
-$qtdir = "/usr/share/tqt3";
+$tqtdir = "/usr/share/tqt3";
$kde_cgidir = "$kde_prefix/lib/cgi-bin";
$kde_confdir = "$sysconfdir/trinity";
@@ -31,13 +31,13 @@ if (@ARGV && $ARGV[0] eq 'echodirs') {
print STDOUT "export kde_includedir=$kde_includedir\n";
print STDOUT "export infodir=$infodir\n";
print STDOUT "export mandir=$mandir\n";
- print STDOUT "export qtdir=$qtdir\n";
+ print STDOUT "export tqtdir=$tqtdir\n";
print STDOUT "export kde_cgidir=$kde_cgidir\n";
print STDOUT "export kde_confdir=$kde_confdir\n";
print STDOUT "export kde_htmldir=$kde_htmldir\n";
- print STDOUT "configkde=$enable_debug --disable-rpath --prefix=\$(kde_prefix) --sysconfdir=\$(sysconfdir) --includedir=\$(kde_includedir) --infodir=\$(infodir) --mandir=\$(mandir) --with-qt-dir=\$(qtdir)\n";
+ print STDOUT "configkde=$enable_debug --disable-rpath --prefix=\$(kde_prefix) --sysconfdir=\$(sysconfdir) --includedir=\$(kde_includedir) --infodir=\$(infodir) --mandir=\$(mandir) --with-tqt-dir=\$(tqtdir)\n";
exit
}
diff --git a/doxygen.sh b/doxygen.sh
index 4b01c88..7fed793 100755
--- a/doxygen.sh
+++ b/doxygen.sh
@@ -82,33 +82,33 @@ fi
-### Sanity check and guess QTDOCDIR.
-if test -z "$QTDOCDIR" ; then
- if test -z "$QTDIR" ; then
- for i in /usr/X11R6/share/doc/qt/html
+### Sanity check and guess TQTDOCDIR.
+if test -z "$TQTDOCDIR" ; then
+ if test -z "$TQTDIR" ; then
+ for i in /usr/X11R6/share/doc/tqt/html
do
- QTDOCDIR="$i"
- test -d "$QTDOCDIR" && break
+ TQTDOCDIR="$i"
+ test -d "$TQTDOCDIR" && break
done
else
- for i in share/doc/qt/html doc/html
+ for i in share/doc/tqt/html doc/html
do
- QTDOCDIR="$QTDIR/$i"
- test -d "$QTDOCDIR" && break
+ TQTDOCDIR="$TQTDIR/$i"
+ test -d "$TQTDOCDIR" && break
done
fi
fi
-if test -z "$QTDOCDIR" || test ! -d "$QTDOCDIR" ; then
- if test -z "$QTDOCDIR" ; then
- echo "* QTDOCDIR could not be guessed."
+if test -z "$TQTDOCDIR" || test ! -d "$TQTDOCDIR" ; then
+ if test -z "$TQTDOCDIR" ; then
+ echo "* TQTDOCDIR could not be guessed."
else
- echo "* QTDOCDIR does not name a directory."
+ echo "* TQTDOCDIR does not name a directory."
fi
- if test -z "$QTDOCTAG" ; then
- echo "* QTDOCDIR set to \"\""
- QTDOCDIR=""
+ if test -z "$TQTDOCTAG" ; then
+ echo "* TQTDOCDIR set to \"\""
+ TQTDOCDIR=""
else
- echo "* But I'll use $QTDOCDIR anyway because of QTDOCTAG."
+ echo "* But I'll use $TQTDOCDIR anyway because of TQTDOCTAG."
fi
fi
@@ -562,7 +562,7 @@ apidox_subdir()
echo "TAGFILES = \\" >> "$subdir/Doxyfile"
## For now, don't support \ continued references lines
tags=`extract_line DOXYGEN_REFERENCES`
- for i in $tags qt ; do
+ for i in $tags tqt ; do
tagsubdir=`dirname $i` ; tag=`basename $i`
tagpath=""
not_found=""
@@ -609,15 +609,15 @@ apidox_subdir()
fi
fi
fi
- if test "$tag" = "qt" ; then
- if test -z "$QTDOCDIR" ; then
+ if test "$tag" = "tqt" ; then
+ if test -z "$TQTDOCDIR" ; then
echo " $file" >> "$subdir/Doxyfile"
else
if test -z "$file" ; then
- # Really no Qt tags
+ # Really no TQt tags
echo "" >> "$subdir/Doxyfile"
else
- echo " $file=$QTDOCDIR" >> "$subdir/Doxyfile"
+ echo " $file=$TQTDOCDIR" >> "$subdir/Doxyfile"
fi
fi
else
@@ -845,18 +845,18 @@ if test "x." = "x$top_builddir" ; then
create_installdox > installdox-slow
if test "x$recurse" = "x1" ; then
if test "x$module_name" = "xtdelibs" ; then
- if test -z "$QTDOCTAG" && test -d "$QTDOCDIR" && \
- test ! -f "qt/qt.tag" ; then
- # Special case: create a qt tag file.
- echo "*** Creating a tag file for the Qt library:"
- mkdir qt
- doxytag -t qt/qt.tag "$QTDOCDIR" > /dev/null 2>&1
+ if test -z "$TQTDOCTAG" && test -d "$TQTDOCDIR" && \
+ test ! -f "tqt/tqt.tag" ; then
+ # Special case: create a tqt tag file.
+ echo "*** Creating a tag file for the TQt library:"
+ mkdir tqt
+ doxytag -t tqt/tqt.tag "$TQTDOCDIR" > /dev/null 2>&1
fi
fi
- if test -n "$QTDOCTAG" && test -r "$QTDOCTAG" ; then
- echo "*** Copying tag file for the Qt library:"
- mkdir qt
- cp "$QTDOCTAG" qt/qt.tag
+ if test -n "$TQTDOCTAG" && test -r "$TQTDOCTAG" ; then
+ echo "*** Copying tag file for the TQt library:"
+ mkdir tqt
+ cp "$TQTDOCTAG" tqt/tqt.tag
fi
do_subdirs_re "."
@@ -875,8 +875,8 @@ fi
if test "YES" = "$cleanup" ; then
rm -f subdirs.in subdirs.later subdirs.sort subdirs.top Doxyfile.in
rm -f `find . -name Doxyfile`
- rm -f qt/qt.tag
- rmdir qt > /dev/null 2>&1
+ rm -f tqt/tqt.tag
+ rmdir tqt > /dev/null 2>&1
fi
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 04:58:20 +0000